From 60c17253ab5618e071bc51b0ce9df8053bda9ae3 Mon Sep 17 00:00:00 2001
From: Cesar Canassa <cesar.canassa@gmail.com>
Date: Mon, 3 Aug 2015 17:54:18 +0200
Subject: [PATCH 01/67] Add test to check if a 415 status is returned for
 unsupported media types

---
 tests/test_response.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/test_response.py b/tests/test_response.py
index 1dd5d5ea0..b53688e5c 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -5,6 +5,7 @@ from django.test import TestCase
 from django.utils import six
 
 from rest_framework import generics, routers, serializers, status, viewsets
+from rest_framework.parsers import JSONParser
 from rest_framework.renderers import (
     BaseRenderer, BrowsableAPIRenderer, JSONRenderer
 )
@@ -79,6 +80,14 @@ class MockViewSettingContentType(APIView):
         return Response(DUMMYCONTENT, status=DUMMYSTATUS, content_type='setbyview')
 
 
+class JSONView(APIView):
+    parser_classes = (JSONParser,)
+
+    def post(self, request, **kwargs):
+        assert request.data
+        return Response(DUMMYCONTENT)
+
+
 class HTMLView(APIView):
     renderer_classes = (BrowsableAPIRenderer, )
 
@@ -114,6 +123,7 @@ urlpatterns = [
     url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
     url(r'^html$', HTMLView.as_view()),
+    url(r'^json$', JSONView.as_view()),
     url(r'^html1$', HTMLView1.as_view()),
     url(r'^html_new_model$', HTMLNewModelView.as_view()),
     url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)),
@@ -203,6 +213,25 @@ class RendererIntegrationTests(TestCase):
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
 
+class UnsupportedMediaTypeTests(TestCase):
+    urls = 'tests.test_response'
+
+    def test_should_allow_posting_json(self):
+        response = self.client.post('/json', data='{"test": 123}', content_type='application/json')
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_should_not_allow_posting_xml(self):
+        response = self.client.post('/json', data='<test>123</test>', content_type='application/xml')
+
+        self.assertEqual(response.status_code, 415)
+
+    def test_should_not_allow_posting_a_form(self):
+        response = self.client.post('/json', data={'test': 123})
+
+        self.assertEqual(response.status_code, 415)
+
+
 class Issue122Tests(TestCase):
     """
     Tests that covers #122.

From 48540f180a34345a6278e527cd4e494826f1b8f2 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 27 Aug 2015 17:11:53 +0100
Subject: [PATCH 02/67] unittest compat fallback

---
 rest_framework/compat.py      |  8 ++++++++
 tests/test_atomic_requests.py | 10 +++++-----
 tests/test_filters.py         |  3 +--
 tests/test_permissions.py     |  3 +--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 2cff61088..164cf2003 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -67,6 +67,14 @@ except ImportError:
     from django.utils.datastructures import SortedDict as OrderedDict
 
 
+# unittest.SkipUnless only available in Python 2.7.
+try:
+    import unittest
+    unittest.skipUnless
+except (ImportError, AttributeError):
+    from django.test.utils import unittest
+
+
 # contrib.postgres only supported from 1.8 onwards.
 try:
     from django.contrib.postgres import fields as postgres_fields
diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index d0d088f52..8f6830663 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -5,9 +5,9 @@ from django.db import connection, connections, transaction
 from django.http import Http404
 from django.test import TestCase, TransactionTestCase
 from django.utils.decorators import method_decorator
-from django.utils.unittest import skipUnless
 
 from rest_framework import status
+from rest_framework.compat import unittest
 from rest_framework.exceptions import APIException
 from rest_framework.response import Response
 from rest_framework.test import APIRequestFactory
@@ -35,7 +35,7 @@ class APIExceptionView(APIView):
         raise APIException
 
 
-@skipUnless(connection.features.uses_savepoints,
+@unittest.skipUnless(connection.features.uses_savepoints,
             "'atomic' requires transactions and savepoints.")
 class DBTransactionTests(TestCase):
     def setUp(self):
@@ -55,7 +55,7 @@ class DBTransactionTests(TestCase):
         assert BasicModel.objects.count() == 1
 
 
-@skipUnless(connection.features.uses_savepoints,
+@unittest.skipUnless(connection.features.uses_savepoints,
             "'atomic' requires transactions and savepoints.")
 class DBTransactionErrorTests(TestCase):
     def setUp(self):
@@ -83,7 +83,7 @@ class DBTransactionErrorTests(TestCase):
         assert BasicModel.objects.count() == 1
 
 
-@skipUnless(connection.features.uses_savepoints,
+@unittest.skipUnless(connection.features.uses_savepoints,
             "'atomic' requires transactions and savepoints.")
 class DBTransactionAPIExceptionTests(TestCase):
     def setUp(self):
@@ -113,7 +113,7 @@ class DBTransactionAPIExceptionTests(TestCase):
         assert BasicModel.objects.count() == 0
 
 
-@skipUnless(connection.features.uses_savepoints,
+@unittest.skipUnless(connection.features.uses_savepoints,
             "'atomic' requires transactions and savepoints.")
 class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase):
     @property
diff --git a/tests/test_filters.py b/tests/test_filters.py
index 0610b0855..bce6e08fa 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -8,12 +8,11 @@ from django.core.urlresolvers import reverse
 from django.db import models
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.utils import unittest
 from django.utils.dateparse import parse_date
 from django.utils.six.moves import reload_module
 
 from rest_framework import filters, generics, serializers, status
-from rest_framework.compat import django_filters
+from rest_framework.compat import django_filters, unittest
 from rest_framework.test import APIRequestFactory
 
 from .models import BaseFilterableItem, BasicModel, FilterableItem
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index 398020002..ffc262a41 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -6,13 +6,12 @@ from django.contrib.auth.models import Group, Permission, User
 from django.core.urlresolvers import ResolverMatch
 from django.db import models
 from django.test import TestCase
-from django.utils import unittest
 
 from rest_framework import (
     HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers,
     status
 )
-from rest_framework.compat import get_model_name, guardian
+from rest_framework.compat import get_model_name, guardian, unittest
 from rest_framework.filters import DjangoObjectPermissionsFilter
 from rest_framework.routers import DefaultRouter
 from rest_framework.test import APIRequestFactory

From f691006f2c79b408b819c716fba0a1bc4ed71fc1 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 27 Aug 2015 17:16:19 +0100
Subject: [PATCH 03/67] Resolve generic fields import

---
 tests/test_relations_generic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py
index 962857365..340d4d1d1 100644
--- a/tests/test_relations_generic.py
+++ b/tests/test_relations_generic.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.contrib.contenttypes.generic import (
+from django.contrib.contenttypes.fields import (
     GenericForeignKey, GenericRelation
 )
 from django.contrib.contenttypes.models import ContentType

From 4f2769746773f0a796206f4fcf01f180bdaff640 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 27 Aug 2015 17:28:12 +0100
Subject: [PATCH 04/67] Fix get_model import

---
 rest_framework/compat.py           | 8 ++++++++
 rest_framework/utils/model_meta.py | 4 ++--
 tests/test_utils.py                | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 164cf2003..607778a9e 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -82,6 +82,14 @@ except ImportError:
     postgres_fields = None
 
 
+# Apps only exists from 1.7 onwards.
+try:
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    from django.db.models import get_model
+
+
 # django-filter is optional
 try:
     import django_filters
diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py
index 3bcd9049c..971864769 100644
--- a/rest_framework/utils/model_meta.py
+++ b/rest_framework/utils/model_meta.py
@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
 
-from rest_framework.compat import OrderedDict
+from rest_framework.compat import OrderedDict, get_model
 
 FieldInfo = namedtuple('FieldResult', [
     'pk',  # Model field instance
@@ -45,7 +45,7 @@ def _resolve_model(obj):
     """
     if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
         app_name, model_name = obj.split('.')
-        resolved_model = models.get_model(app_name, model_name)
+        resolved_model = get_model(app_name, model_name)
         if resolved_model is None:
             msg = "Django did not return a model for {0}.{1}"
             raise ImproperlyConfigured(msg.format(app_name, model_name))
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 062f78e11..4c9fd03c8 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -150,12 +150,12 @@ class ResolveModelWithPatchedDjangoTests(TestCase):
 
     def setUp(self):
         """Monkeypatch get_model."""
-        self.get_model = rest_framework.utils.model_meta.models.get_model
+        self.get_model = rest_framework.utils.model_meta.get_model
 
         def get_model(app_label, model_name):
             return None
 
-        rest_framework.utils.model_meta.models.get_model = get_model
+        rest_framework.utils.model_meta.get_model = get_model
 
     def tearDown(self):
         """Revert monkeypatching."""

From 654e0e45279b5023cea7574bda1ebd63dae96347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Thu, 27 Aug 2015 13:09:08 -0400
Subject: [PATCH 05/67] Update ModelSerializer fields behavior

---
 rest_framework/serializers.py  | 21 +++++++++++++++++++--
 tests/test_model_serializer.py | 15 +++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index c7d4405c5..acaf3bef7 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -12,6 +12,8 @@ response content is handled by parsers and renderers.
 """
 from __future__ import unicode_literals
 
+import warnings
+
 from django.db import models
 from django.db.models.fields import Field as DjangoModelField
 from django.db.models.fields import FieldDoesNotExist
@@ -51,6 +53,8 @@ LIST_SERIALIZER_KWARGS = (
     'instance', 'data', 'partial', 'context', 'allow_null'
 )
 
+ALL_FIELDS = '__all__'
+
 
 # BaseSerializer
 # --------------
@@ -943,13 +947,13 @@ class ModelSerializer(Serializer):
         fields = getattr(self.Meta, 'fields', None)
         exclude = getattr(self.Meta, 'exclude', None)
 
-        if fields and not isinstance(fields, (list, tuple)):
+        if fields and fields != ALL_FIELDS and not isinstance(fields, (list, tuple)):
             raise TypeError(
                 'The `fields` option must be a list or tuple. Got %s.' %
                 type(fields).__name__
             )
 
-        if exclude and not isinstance(exclude, (list, tuple)):
+        if exclude and exclude != ALL_FIELDS and not isinstance(exclude, (list, tuple)):
             raise TypeError(
                 'The `exclude` option must be a list or tuple. Got %s.' %
                 type(exclude).__name__
@@ -962,6 +966,19 @@ class ModelSerializer(Serializer):
             )
         )
 
+        if fields is None and exclude is None:
+            warnings.warn(
+                "Creating a ModelSerializer without either the 'fields' attribute "
+                "or the 'exclude' attribute will be prohibited. "
+                "The {serializer_class} serializer needs updating.".format(
+                    serializer_class=self.__class__.__name__
+                ),
+                PendingDeprecationWarning
+            )
+
+        if fields == ALL_FIELDS:
+            fields = None
+
         if fields is not None:
             # Ensure that all declared fields have also been included in the
             # `Meta.fields` option.
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 777b956c4..89557fa1d 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -321,6 +321,21 @@ class TestRegularFieldMappings(TestCase):
 
         ExampleSerializer()
 
+    def test_fields_and_exclude_behavior(self):
+        class ImplicitFieldsSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = RegularFieldsModel
+
+        class ExplicitFieldsSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = RegularFieldsModel
+                fields = '__all__'
+
+        implicit = ImplicitFieldsSerializer()
+        explicit = ExplicitFieldsSerializer()
+
+        assert implicit.data == explicit.data
+
 
 @pytest.mark.skipif(django.VERSION < (1, 8),
                     reason='DurationField is only available for django1.8+')

From e70da5ac6b563cf82e8bc86f4a2f7103efc297c8 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:03:08 +0100
Subject: [PATCH 06/67] Compat for GenericForeignKey, GenericRelation

---
 rest_framework/compat.py        | 10 ++++++++++
 tests/test_relations_generic.py |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 607778a9e..fa42f95ed 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -90,6 +90,16 @@ except ImportError:
     from django.db.models import get_model
 
 
+# Import path changes from 1.7 onwards.
+try:
+    from django.contrib.contenttypes.fields import (
+        GenericForeignKey, GenericRelation
+    )
+except ImportError:
+    from django.contrib.contenttypes.generic import (
+        GenericForeignKey, GenericRelation
+    )
+
 # django-filter is optional
 try:
     import django_filters
diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py
index 340d4d1d1..5cb2dfc05 100644
--- a/tests/test_relations_generic.py
+++ b/tests/test_relations_generic.py
@@ -1,14 +1,12 @@
 from __future__ import unicode_literals
 
-from django.contrib.contenttypes.fields import (
-    GenericForeignKey, GenericRelation
-)
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.test import TestCase
 from django.utils.encoding import python_2_unicode_compatible
 
 from rest_framework import serializers
+from rest_framework.compat import GenericForeignKey, GenericRelation
 
 
 @python_2_unicode_compatible

From 25c4c7f9fd3a5d789ec772f341fb5e036fe073dd Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:03:16 +0100
Subject: [PATCH 07/67] Pep8 fix

---
 tests/test_atomic_requests.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index 8f6830663..a97efb69c 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -35,8 +35,10 @@ class APIExceptionView(APIView):
         raise APIException
 
 
-@unittest.skipUnless(connection.features.uses_savepoints,
-            "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+    connection.features.uses_savepoints,
+    "'atomic' requires transactions and savepoints."
+)
 class DBTransactionTests(TestCase):
     def setUp(self):
         self.view = BasicView.as_view()
@@ -55,8 +57,10 @@ class DBTransactionTests(TestCase):
         assert BasicModel.objects.count() == 1
 
 
-@unittest.skipUnless(connection.features.uses_savepoints,
-            "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+    connection.features.uses_savepoints,
+    "'atomic' requires transactions and savepoints."
+)
 class DBTransactionErrorTests(TestCase):
     def setUp(self):
         self.view = ErrorView.as_view()
@@ -83,8 +87,10 @@ class DBTransactionErrorTests(TestCase):
         assert BasicModel.objects.count() == 1
 
 
-@unittest.skipUnless(connection.features.uses_savepoints,
-            "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+    connection.features.uses_savepoints,
+    "'atomic' requires transactions and savepoints."
+)
 class DBTransactionAPIExceptionTests(TestCase):
     def setUp(self):
         self.view = APIExceptionView.as_view()
@@ -113,8 +119,10 @@ class DBTransactionAPIExceptionTests(TestCase):
         assert BasicModel.objects.count() == 0
 
 
-@unittest.skipUnless(connection.features.uses_savepoints,
-            "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+    connection.features.uses_savepoints,
+    "'atomic' requires transactions and savepoints."
+)
 class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase):
     @property
     def urls(self):

From 24a2c3f5c3349ec941790240c1f372a6de723e1b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:19:18 +0100
Subject: [PATCH 08/67] Resolve unittest compat

---
 rest_framework/compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index fa42f95ed..a512af771 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -72,7 +72,7 @@ try:
     import unittest
     unittest.skipUnless
 except (ImportError, AttributeError):
-    from django.test.utils import unittest
+    from django.utils import unittest
 
 
 # contrib.postgres only supported from 1.8 onwards.

From a5ddd90df03fe04793e605d26d01f86391fa4771 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:27:49 +0100
Subject: [PATCH 09/67] Log in and log out require escape and mark_safe

---
 rest_framework/templatetags/rest_framework.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index 0069d9a5e..08acecef7 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -41,8 +41,9 @@ def optional_login(request):
     except NoReverseMatch:
         return ''
 
-    snippet = "<li><a href='{href}?next={next}'>Log in</a></li>".format(href=login_url, next=escape(request.path))
-    return snippet
+    snippet = "<li><a href='{href}?next={next}'>Log in</a></li>"
+    snippet = snippet.format(href=login_url, next=escape(request.path))
+    return mark_safe(snippet)
 
 
 @register.simple_tag
@@ -64,8 +65,8 @@ def optional_logout(request, user):
             <li><a href='{href}?next={next}'>Log out</a></li>
         </ul>
     </li>"""
-
-    return snippet.format(user=user, href=logout_url, next=escape(request.path))
+    snippet = snippet.format(user=escape(user), href=logout_url, next=escape(request.path))
+    return mark_safe(snippet)
 
 
 @register.simple_tag

From 6fa534f21475f4c9527b1181f8a427978ce1c085 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:44:49 +0100
Subject: [PATCH 10/67] Fix urlpatterns in test

---
 tests/test_atomic_requests.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index a97efb69c..f24c7e685 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -135,9 +135,8 @@ class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase):
                 BasicModel.objects.all()
                 raise Http404
 
-        return patterns(
-            '',
-            url(r'^$', NonAtomicAPIExceptionView.as_view())
+        return (
+            url(r'^$', NonAtomicAPIExceptionView.as_view()),
         )
 
     def setUp(self):

From 7560e8381f90c646bdfeaf1ee491482f39766f53 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 10:53:44 +0100
Subject: [PATCH 11/67] Drop unused patterns

---
 tests/test_atomic_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index f24c7e685..2d973cb8a 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.db import connection, connections, transaction
 from django.http import Http404
 from django.test import TestCase, TransactionTestCase

From b51c1ff0b0535a135ba018064c99a5995a9d8893 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 11:55:23 +0100
Subject: [PATCH 12/67] Django 1.9's test case HttpResponse.json() is not
 cachable.

---
 rest_framework/response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 3f038e3b5..0e97668eb 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -98,7 +98,7 @@ class Response(SimpleTemplateResponse):
         state = super(Response, self).__getstate__()
         for key in (
             'accepted_renderer', 'renderer_context', 'resolver_match',
-            'client', 'request', 'wsgi_request'
+            'client', 'request', 'json', 'wsgi_request'
         ):
             if key in state:
                 del state[key]

From 8db6367188d27a41a42bf36eef12774e7cc59354 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 12:08:32 +0100
Subject: [PATCH 13/67] Deal with 1.9's differing null behavior on reverse
 relationships and m2m

---
 rest_framework/utils/field_mapping.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index f2598974e..7805a2853 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -233,9 +233,11 @@ def get_relation_kwargs(field_name, relation_info):
             # No further keyword arguments are valid.
             return kwargs
 
-        if model_field.has_default() or model_field.blank or model_field.null:
+        null = model_field.null and not to_many
+
+        if model_field.has_default() or model_field.blank or null:
             kwargs['required'] = False
-        if model_field.null:
+        if null:
             kwargs['allow_null'] = True
         if model_field.validators:
             kwargs['validators'] = model_field.validators

From f3ef13ab59c1ae9504e830ea3f45210fab5e973d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 28 Aug 2015 08:05:20 -0400
Subject: [PATCH 14/67] Update to match docs on ModelForm fields

---
 docs/api-guide/serializers.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index abdb67afa..5138c6ce0 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -453,14 +453,31 @@ To do so, open the Django shell, using `python manage.py shell`, then import the
 
 ## Specifying which fields to include
 
-If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`.
+It is strongly recommended that you explicitly set all fields that should be edited in the serializer using the `fields` attribute. Failure to do so can easily lead to security problems when a serializer unexpectedly allows a user to set certain fields, especially when new fields are added to a model.
+
+The alternative approach would be to include all fields automatically, or blacklist only some. This fundamental approach is known to be much less secure and has led to serious exploits on major websites (e.g. [GitHub][github-vuln-blog]).
+
+There are, however, two shortcuts available for cases where you can guarantee these security concerns do not apply to you:
+
+1. Set the `fields` attribute to the special value `'__all__'` to indicate that all fields in the model should be used.
 
 For example:
 
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:
             model = Account
-            fields = ('id', 'account_name', 'users', 'created')
+            fields = '__all__'
+
+2. Set the exclude attribute of the ModelForm’s inner Meta class to a list of fields to be excluded from the form.
+
+For example:
+
+    class AccountSerializer(serializers.ModelSerializer):
+        class Meta:
+            model = Account
+            exclude = 'users'
+
+In the example above, if the `Account` model had 3 fields `account_name`, `users`, and `created`, this will result in the fields `account_name` and `created` to be serialized.
 
 The names in the `fields` option will normally map to model fields on the model class.
 
@@ -1035,6 +1052,7 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides a `G
 The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreSerializer` to support [django-hstore][django-hstore] `DictionaryField` model field and its `schema-mode` feature.
 
 [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion
+[github-vuln-blog]: https://github.com/blog/1068-public-key-security-vulnerability-and-mitigation
 [relations]: relations.md
 [model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/
 [encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/

From 1fe8e9a0bf37e045457aa91a19748ea1a6479a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 28 Aug 2015 08:11:07 -0400
Subject: [PATCH 15/67] Add note on deprecation path

---
 docs/api-guide/serializers.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 5138c6ce0..ed1ada92c 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -483,6 +483,12 @@ The names in the `fields` option will normally map to model fields on the model
 
 Alternatively names in the `fields` options can map to properties or methods which take no arguments that exist on the model class.
 
+---
+
+**Note**: Before version 3.3, the `'__all__'` shortcut did not exist, but omitting the fields attribute had the same effect. Omitting both fields and exclude is now deprecated, but will continue to work as before until version 3.5
+
+---
+
 ## Specifying nested serialization
 
 The default `ModelSerializer` uses primary keys for relationships, but you can also easily generate nested representations using the `depth` option:

From 78632849cf7d6599883674bbb6baec87dab4fefd Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Fri, 28 Aug 2015 13:29:57 +0100
Subject: [PATCH 16/67] Comment against model_field.null 1.98 behavior

---
 rest_framework/utils/field_mapping.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index 7805a2853..62e4dbc12 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -233,6 +233,9 @@ def get_relation_kwargs(field_name, relation_info):
             # No further keyword arguments are valid.
             return kwargs
 
+        # Currently required for 1.9 master behavior,
+        # may be able to remove this with 1.9 alpha.
+        # See https://code.djangoproject.com/ticket/25320
         null = model_field.null and not to_many
 
         if model_field.has_default() or model_field.blank or null:

From 9dd1b2516be3b1993219ad93e5802f5b8d25e324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Fri, 28 Aug 2015 09:51:11 -0400
Subject: [PATCH 17/67] Update ModelSerializer fields docs

---
 docs/api-guide/serializers.md | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index ed1ada92c..cefcfa097 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -432,6 +432,7 @@ Declaring a `ModelSerializer` looks like this:
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:
             model = Account
+            fields = ('id', 'account_name', 'users', 'created')
 
 By default, all the model fields on the class will be mapped to a corresponding serializer fields.
 
@@ -453,13 +454,16 @@ To do so, open the Django shell, using `python manage.py shell`, then import the
 
 ## Specifying which fields to include
 
-It is strongly recommended that you explicitly set all fields that should be edited in the serializer using the `fields` attribute. Failure to do so can easily lead to security problems when a serializer unexpectedly allows a user to set certain fields, especially when new fields are added to a model.
+If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`. It is strongly recommended that you explicitly set all fields that should be serialized using the `fields` attribute. This will make it less likely to result in unintentionally exposing data when your models change.
 
-The alternative approach would be to include all fields automatically, or blacklist only some. This fundamental approach is known to be much less secure and has led to serious exploits on major websites (e.g. [GitHub][github-vuln-blog]).
+For example:
 
-There are, however, two shortcuts available for cases where you can guarantee these security concerns do not apply to you:
+    class AccountSerializer(serializers.ModelSerializer):
+        class Meta:
+            model = Account
+            fields = ('id', 'account_name', 'users', 'created')
 
-1. Set the `fields` attribute to the special value `'__all__'` to indicate that all fields in the model should be used.
+You can also set the `fields` attribute to the special value `'__all__'` to indicate that all fields in the model should be used.
 
 For example:
 
@@ -468,27 +472,21 @@ For example:
             model = Account
             fields = '__all__'
 
-2. Set the exclude attribute of the ModelForm’s inner Meta class to a list of fields to be excluded from the form.
+You can set the `exclude` attribute of the to a list of fields to be excluded from the serializer.
 
 For example:
 
     class AccountSerializer(serializers.ModelSerializer):
         class Meta:
             model = Account
-            exclude = 'users'
+            exclude = ('users',)
 
 In the example above, if the `Account` model had 3 fields `account_name`, `users`, and `created`, this will result in the fields `account_name` and `created` to be serialized.
 
-The names in the `fields` option will normally map to model fields on the model class.
+The names in the `fields` and `exclude` attributes will normally map to model fields on the model class.
 
 Alternatively names in the `fields` options can map to properties or methods which take no arguments that exist on the model class.
 
----
-
-**Note**: Before version 3.3, the `'__all__'` shortcut did not exist, but omitting the fields attribute had the same effect. Omitting both fields and exclude is now deprecated, but will continue to work as before until version 3.5
-
----
-
 ## Specifying nested serialization
 
 The default `ModelSerializer` uses primary keys for relationships, but you can also easily generate nested representations using the `depth` option:
@@ -1058,7 +1056,6 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides a `G
 The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreSerializer` to support [django-hstore][django-hstore] `DictionaryField` model field and its `schema-mode` feature.
 
 [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion
-[github-vuln-blog]: https://github.com/blog/1068-public-key-security-vulnerability-and-mitigation
 [relations]: relations.md
 [model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/
 [encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/

From afd2a8f8f0186cfeb781c33922b27372f97f074b Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 3 Sep 2015 10:12:52 +0100
Subject: [PATCH 18/67] Adjust ModelField.null mappings now that Django-25320
 is resolved

---
 rest_framework/utils/field_mapping.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index 62e4dbc12..f2598974e 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -233,14 +233,9 @@ def get_relation_kwargs(field_name, relation_info):
             # No further keyword arguments are valid.
             return kwargs
 
-        # Currently required for 1.9 master behavior,
-        # may be able to remove this with 1.9 alpha.
-        # See https://code.djangoproject.com/ticket/25320
-        null = model_field.null and not to_many
-
-        if model_field.has_default() or model_field.blank or null:
+        if model_field.has_default() or model_field.blank or model_field.null:
             kwargs['required'] = False
-        if null:
+        if model_field.null:
             kwargs['allow_null'] = True
         if model_field.validators:
             kwargs['validators'] = model_field.validators

From 10da18b20b7feaa7a615d6cddbdabda7968ff98c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 3 Sep 2015 16:24:13 +0100
Subject: [PATCH 19/67] Access settings lazily, not at module import

---
 rest_framework/fields.py      | 114 ++++++++++++++++++++--------------
 rest_framework/serializers.py |   5 +-
 rest_framework/settings.py    |  12 +++-
 3 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 159784ea3..8b42690d7 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -9,6 +9,7 @@ import re
 import uuid
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.validators import RegexValidator, ip_address_validators
@@ -882,12 +883,11 @@ class DecimalField(Field):
     }
     MAX_STRING_LENGTH = 1000  # Guard against malicious string inputs.
 
-    coerce_to_string = api_settings.COERCE_DECIMAL_TO_STRING
-
     def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, **kwargs):
         self.max_digits = max_digits
         self.decimal_places = decimal_places
-        self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string
+        if coerce_to_string is not None:
+            self.coerce_to_string = coerce_to_string
 
         self.max_value = max_value
         self.min_value = min_value
@@ -967,12 +967,14 @@ class DecimalField(Field):
         return value
 
     def to_representation(self, value):
+        coerce_to_string = getattr(self, 'coerce_to_string', api_settings.COERCE_DECIMAL_TO_STRING)
+
         if not isinstance(value, decimal.Decimal):
             value = decimal.Decimal(six.text_type(value).strip())
 
         quantized = self.quantize(value)
 
-        if not self.coerce_to_string:
+        if not coerce_to_string:
             return quantized
         return '{0:f}'.format(quantized)
 
@@ -994,15 +996,15 @@ class DateTimeField(Field):
         'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'),
         'date': _('Expected a datetime but got a date.'),
     }
-    format = api_settings.DATETIME_FORMAT
-    input_formats = api_settings.DATETIME_INPUT_FORMATS
-    default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None
     datetime_parser = datetime.datetime.strptime
 
     def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs):
-        self.format = format if format is not empty else self.format
-        self.input_formats = input_formats if input_formats is not None else self.input_formats
-        self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone
+        if format is not empty:
+            self.format = format
+        if input_formats is not None:
+            self.input_formats = input_formats
+        if default_timezone is not None:
+            self.timezone = default_timezone
         super(DateTimeField, self).__init__(*args, **kwargs)
 
     def enforce_timezone(self, value):
@@ -1010,21 +1012,31 @@ class DateTimeField(Field):
         When `self.default_timezone` is `None`, always return naive datetimes.
         When `self.default_timezone` is not `None`, always return aware datetimes.
         """
-        if (self.default_timezone is not None) and not timezone.is_aware(value):
-            return timezone.make_aware(value, self.default_timezone)
-        elif (self.default_timezone is None) and timezone.is_aware(value):
+        field_timezone = getattr(self, 'timezone', self.default_timezone())
+
+        if (field_timezone is not None) and not timezone.is_aware(value):
+            return timezone.make_aware(value, field_timezone)
+        elif (field_timezone is None) and timezone.is_aware(value):
             return timezone.make_naive(value, timezone.UTC())
         return value
 
+    def default_timezone(self):
+        try:
+            return timezone.get_default_timezone() if settings.USE_TZ else None
+        except ImproperlyConfigured:
+            return None
+
     def to_internal_value(self, value):
+        input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS)
+
         if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime):
             self.fail('date')
 
         if isinstance(value, datetime.datetime):
             return self.enforce_timezone(value)
 
-        for format in self.input_formats:
-            if format.lower() == ISO_8601:
+        for input_format in input_formats:
+            if input_format.lower() == ISO_8601:
                 try:
                     parsed = parse_datetime(value)
                 except (ValueError, TypeError):
@@ -1034,25 +1046,27 @@ class DateTimeField(Field):
                         return self.enforce_timezone(parsed)
             else:
                 try:
-                    parsed = self.datetime_parser(value, format)
+                    parsed = self.datetime_parser(value, input_format)
                 except (ValueError, TypeError):
                     pass
                 else:
                     return self.enforce_timezone(parsed)
 
-        humanized_format = humanize_datetime.datetime_formats(self.input_formats)
+        humanized_format = humanize_datetime.datetime_formats(input_formats)
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
-        if self.format is None:
+        output_format = getattr(self, 'format', api_settings.DATETIME_FORMAT)
+
+        if output_format is None:
             return value
 
-        if self.format.lower() == ISO_8601:
+        if output_format.lower() == ISO_8601:
             value = value.isoformat()
             if value.endswith('+00:00'):
                 value = value[:-6] + 'Z'
             return value
-        return value.strftime(self.format)
+        return value.strftime(output_format)
 
 
 class DateField(Field):
@@ -1060,24 +1074,26 @@ class DateField(Field):
         'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'),
         'datetime': _('Expected a date but got a datetime.'),
     }
-    format = api_settings.DATE_FORMAT
-    input_formats = api_settings.DATE_INPUT_FORMATS
     datetime_parser = datetime.datetime.strptime
 
     def __init__(self, format=empty, input_formats=None, *args, **kwargs):
-        self.format = format if format is not empty else self.format
-        self.input_formats = input_formats if input_formats is not None else self.input_formats
+        if format is not empty:
+            self.format = format
+        if input_formats is not None:
+            self.input_formats = input_formats
         super(DateField, self).__init__(*args, **kwargs)
 
     def to_internal_value(self, value):
+        input_formats = getattr(self, 'input_formats', api_settings.DATE_INPUT_FORMATS)
+
         if isinstance(value, datetime.datetime):
             self.fail('datetime')
 
         if isinstance(value, datetime.date):
             return value
 
-        for format in self.input_formats:
-            if format.lower() == ISO_8601:
+        for input_format in input_formats:
+            if input_format.lower() == ISO_8601:
                 try:
                     parsed = parse_date(value)
                 except (ValueError, TypeError):
@@ -1087,20 +1103,22 @@ class DateField(Field):
                         return parsed
             else:
                 try:
-                    parsed = self.datetime_parser(value, format)
+                    parsed = self.datetime_parser(value, input_format)
                 except (ValueError, TypeError):
                     pass
                 else:
                     return parsed.date()
 
-        humanized_format = humanize_datetime.date_formats(self.input_formats)
+        humanized_format = humanize_datetime.date_formats(input_formats)
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
+        output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
+
         if not value:
             return None
 
-        if self.format is None:
+        if output_format is None:
             return value
 
         # Applying a `DateField` to a datetime value is almost always
@@ -1112,33 +1130,35 @@ class DateField(Field):
             'read-only field and deal with timezone issues explicitly.'
         )
 
-        if self.format.lower() == ISO_8601:
+        if output_format.lower() == ISO_8601:
             if (isinstance(value, str)):
                 value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
             return value.isoformat()
 
-        return value.strftime(self.format)
+        return value.strftime(output_format)
 
 
 class TimeField(Field):
     default_error_messages = {
         'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'),
     }
-    format = api_settings.TIME_FORMAT
-    input_formats = api_settings.TIME_INPUT_FORMATS
     datetime_parser = datetime.datetime.strptime
 
     def __init__(self, format=empty, input_formats=None, *args, **kwargs):
-        self.format = format if format is not empty else self.format
-        self.input_formats = input_formats if input_formats is not None else self.input_formats
+        if format is not empty:
+            self.format = format
+        if input_formats is not None:
+            self.input_formats = input_formats
         super(TimeField, self).__init__(*args, **kwargs)
 
     def to_internal_value(self, value):
+        input_formats = getattr(self, 'input_formats', api_settings.TIME_INPUT_FORMATS)
+
         if isinstance(value, datetime.time):
             return value
 
-        for format in self.input_formats:
-            if format.lower() == ISO_8601:
+        for input_format in input_formats:
+            if input_format.lower() == ISO_8601:
                 try:
                     parsed = parse_time(value)
                 except (ValueError, TypeError):
@@ -1148,17 +1168,19 @@ class TimeField(Field):
                         return parsed
             else:
                 try:
-                    parsed = self.datetime_parser(value, format)
+                    parsed = self.datetime_parser(value, input_format)
                 except (ValueError, TypeError):
                     pass
                 else:
                     return parsed.time()
 
-        humanized_format = humanize_datetime.time_formats(self.input_formats)
+        humanized_format = humanize_datetime.time_formats(input_formats)
         self.fail('invalid', format=humanized_format)
 
     def to_representation(self, value):
-        if self.format is None:
+        output_format = getattr(self, 'format', api_settings.TIME_FORMAT)
+
+        if output_format is None:
             return value
 
         # Applying a `TimeField` to a datetime value is almost always
@@ -1170,9 +1192,9 @@ class TimeField(Field):
             'read-only field and deal with timezone issues explicitly.'
         )
 
-        if self.format.lower() == ISO_8601:
+        if output_format.lower() == ISO_8601:
             return value.isoformat()
-        return value.strftime(self.format)
+        return value.strftime(output_format)
 
 
 class DurationField(Field):
@@ -1316,12 +1338,12 @@ class FileField(Field):
         'empty': _('The submitted file is empty.'),
         'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'),
     }
-    use_url = api_settings.UPLOADED_FILES_USE_URL
 
     def __init__(self, *args, **kwargs):
         self.max_length = kwargs.pop('max_length', None)
         self.allow_empty_file = kwargs.pop('allow_empty_file', False)
-        self.use_url = kwargs.pop('use_url', self.use_url)
+        if 'use_url' in kwargs:
+            self.use_url = kwargs.pop('use_url')
         super(FileField, self).__init__(*args, **kwargs)
 
     def to_internal_value(self, data):
@@ -1342,10 +1364,12 @@ class FileField(Field):
         return data
 
     def to_representation(self, value):
+        use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
+
         if not value:
             return None
 
-        if self.use_url:
+        if use_url:
             if not getattr(value, 'url', None):
                 # If the file has not been saved it may not have a URL.
                 return None
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index c7d4405c5..8ba1f3c40 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -786,7 +786,7 @@ class ModelSerializer(Serializer):
     # you'll also need to ensure you update the `create` method on any generic
     # views, to correctly handle the 'Location' response header for
     # "HTTP 201 Created" responses.
-    url_field_name = api_settings.URL_FIELD_NAME
+    url_field_name = None
 
     # Default `create` and `update` behavior...
     def create(self, validated_data):
@@ -869,6 +869,9 @@ class ModelSerializer(Serializer):
         Return the dict of field names -> field instances that should be
         used for `self.fields` when instantiating the serializer.
         """
+        if self.url_field_name is None:
+            self.url_field_name = api_settings.URL_FIELD_NAME
+
         assert hasattr(self, 'Meta'), (
             'Class {serializer_class} missing "Meta" attribute'.format(
                 serializer_class=self.__class__.__name__
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index e20e51287..bc3868715 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -26,7 +26,6 @@ from django.utils import six
 from rest_framework import ISO_8601
 from rest_framework.compat import importlib
 
-USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
 
 DEFAULTS = {
     # Base API policies
@@ -188,10 +187,17 @@ class APISettings(object):
     and return the class, rather than the string literal.
     """
     def __init__(self, user_settings=None, defaults=None, import_strings=None):
-        self.user_settings = user_settings or {}
+        if user_settings:
+            self._user_settings = user_settings
         self.defaults = defaults or DEFAULTS
         self.import_strings = import_strings or IMPORT_STRINGS
 
+    @property
+    def user_settings(self):
+        if not hasattr(self, '_user_settings'):
+            self._user_settings = getattr(settings, 'REST_FRAMEWORK', {})
+        return self._user_settings
+
     def __getattr__(self, attr):
         if attr not in self.defaults.keys():
             raise AttributeError("Invalid API setting: '%s'" % attr)
@@ -212,7 +218,7 @@ class APISettings(object):
         return val
 
 
-api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS)
+api_settings = APISettings(None, DEFAULTS, IMPORT_STRINGS)
 
 
 def reload_api_settings(*args, **kwargs):

From 8b7ebb9d2ca6dd3dba4e021ae750166dd7fe5ecd Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 3 Sep 2015 16:29:13 +0100
Subject: [PATCH 20/67] Fixed import sorting

---
 rest_framework/fields.py   | 3 +--
 rest_framework/settings.py | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 8b42690d7..e780c5114 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -9,9 +9,8 @@ import re
 import uuid
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ValidationError as DjangoValidationError
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.core.validators import RegexValidator, ip_address_validators
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index bc3868715..c09472e9d 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -26,7 +26,6 @@ from django.utils import six
 from rest_framework import ISO_8601
 from rest_framework.compat import importlib
 
-
 DEFAULTS = {
     # Base API policies
     'DEFAULT_RENDERER_CLASSES': (

From f9e53091c1defb0971f941a529b5c813060952b7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 3 Sep 2015 16:40:12 +0100
Subject: [PATCH 21/67] Drop handling of ImproperlyConfigured

---
 rest_framework/fields.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index e780c5114..065051b54 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -10,7 +10,7 @@ import uuid
 
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.validators import RegexValidator, ip_address_validators
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
@@ -1020,10 +1020,7 @@ class DateTimeField(Field):
         return value
 
     def default_timezone(self):
-        try:
-            return timezone.get_default_timezone() if settings.USE_TZ else None
-        except ImproperlyConfigured:
-            return None
+        return timezone.get_default_timezone() if settings.USE_TZ else None
 
     def to_internal_value(self, value):
         input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS)

From 566812ac0b577f79801ec67f86f064cf39ebee01 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 17 Sep 2015 15:17:29 +0100
Subject: [PATCH 22/67] Remove method and content overriding

---
 rest_framework/renderers.py                   | 38 +++----
 rest_framework/request.py                     | 98 +------------------
 rest_framework/settings.py                    |  3 -
 .../static/rest_framework/js/ajax-form.js     | 97 ++++++++++++++++++
 .../static/rest_framework/js/csrf.js          | 47 +++++++++
 .../rest_framework/js/jquery-1.11.3.min.js    |  5 +
 .../templates/rest_framework/base.html        | 29 +++---
 .../rest_framework/raw_data_form.html         |  1 -
 tests/test_request.py                         | 73 --------------
 tests/test_views.py                           | 30 ------
 10 files changed, 180 insertions(+), 241 deletions(-)
 create mode 100644 rest_framework/static/rest_framework/js/ajax-form.js
 create mode 100644 rest_framework/static/rest_framework/js/csrf.js
 create mode 100644 rest_framework/static/rest_framework/js/jquery-1.11.3.min.js

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index fb0dfcbd8..a450be848 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -420,9 +420,6 @@ class BrowsableAPIRenderer(BaseRenderer):
         if method not in view.allowed_methods:
             return  # Not a valid method
 
-        if not api_settings.FORM_METHOD_OVERRIDE:
-            return  # Cannot use form overloading
-
         try:
             view.check_permissions(request)
             if obj is not None:
@@ -530,13 +527,6 @@ class BrowsableAPIRenderer(BaseRenderer):
             instance = None
 
         with override_method(view, request, method) as request:
-            # If we're not using content overloading there's no point in
-            # supplying a generic form, as the view won't treat the form's
-            # value as the content of the request.
-            if not (api_settings.FORM_CONTENT_OVERRIDE and
-                    api_settings.FORM_CONTENTTYPE_OVERRIDE):
-                return None
-
             # Check permissions
             if not self.show_form_for_method(view, method, request, instance):
                 return
@@ -564,28 +554,22 @@ class BrowsableAPIRenderer(BaseRenderer):
 
             # Generate a generic form that includes a content type field,
             # and a content field.
-            content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE
-            content_field = api_settings.FORM_CONTENT_OVERRIDE
-
             media_types = [parser.media_type for parser in view.parser_classes]
             choices = [(media_type, media_type) for media_type in media_types]
             initial = media_types[0]
 
-            # NB. http://jacobian.org/writing/dynamic-form-generation/
             class GenericContentForm(forms.Form):
-                def __init__(self):
-                    super(GenericContentForm, self).__init__()
-
-                    self.fields[content_type_field] = forms.ChoiceField(
-                        label='Media type',
-                        choices=choices,
-                        initial=initial
-                    )
-                    self.fields[content_field] = forms.CharField(
-                        label='Content',
-                        widget=forms.Textarea,
-                        initial=content
-                    )
+                _content_type = forms.ChoiceField(
+                    label='Media type',
+                    choices=choices,
+                    initial=initial,
+                    widget=forms.Select(attrs={'data-override': 'content-type'})
+                )
+                _content = forms.CharField(
+                    label='Content',
+                    widget=forms.Textarea(attrs={'data-override': 'content'}),
+                    initial=content
+                )
 
             return GenericContentForm()
 
diff --git a/rest_framework/request.py b/rest_framework/request.py
index 7b583485b..98a70eb3a 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -129,11 +129,6 @@ class Request(object):
         - authentication_classes(list/tuple). The authentications used to try
           authenticating the request's user.
     """
-
-    _METHOD_PARAM = api_settings.FORM_METHOD_OVERRIDE
-    _CONTENT_PARAM = api_settings.FORM_CONTENT_OVERRIDE
-    _CONTENTTYPE_PARAM = api_settings.FORM_CONTENTTYPE_OVERRIDE
-
     def __init__(self, request, parsers=None, authenticators=None,
                  negotiator=None, parser_context=None):
         self._request = request
@@ -162,30 +157,10 @@ class Request(object):
     def _default_negotiator(self):
         return api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS()
 
-    @property
-    def method(self):
-        """
-        Returns the HTTP method.
-
-        This allows the `method` to be overridden by using a hidden `form`
-        field on a form POST request.
-        """
-        if not _hasattr(self, '_method'):
-            self._load_method_and_content_type()
-        return self._method
-
     @property
     def content_type(self):
-        """
-        Returns the content type header.
-
-        This should be used instead of `request.META.get('HTTP_CONTENT_TYPE')`,
-        as it allows the content type to be overridden by using a hidden form
-        field on a form POST request.
-        """
-        if not _hasattr(self, '_content_type'):
-            self._load_method_and_content_type()
-        return self._content_type
+        meta = self._request.META
+        return meta.get('CONTENT_TYPE', meta.get('HTTP_CONTENT_TYPE', ''))
 
     @property
     def stream(self):
@@ -265,9 +240,6 @@ class Request(object):
         """
         Parses the request content into `self.data`.
         """
-        if not _hasattr(self, '_content_type'):
-            self._load_method_and_content_type()
-
         if not _hasattr(self, '_data'):
             self._data, self._files = self._parse()
             if self._files:
@@ -276,32 +248,14 @@ class Request(object):
             else:
                 self._full_data = self._data
 
-    def _load_method_and_content_type(self):
-        """
-        Sets the method and content_type, and then check if they've
-        been overridden.
-        """
-        self._content_type = self.META.get('HTTP_CONTENT_TYPE',
-                                           self.META.get('CONTENT_TYPE', ''))
-
-        self._perform_form_overloading()
-
-        if not _hasattr(self, '_method'):
-            self._method = self._request.method
-
-            # Allow X-HTTP-METHOD-OVERRIDE header
-            if 'HTTP_X_HTTP_METHOD_OVERRIDE' in self.META:
-                self._method = self.META['HTTP_X_HTTP_METHOD_OVERRIDE'].upper()
-
     def _load_stream(self):
         """
         Return the content body of the request, as a stream.
         """
+        meta = self._request.META
         try:
             content_length = int(
-                self.META.get(
-                    'CONTENT_LENGTH', self.META.get('HTTP_CONTENT_LENGTH')
-                )
+                meta.get('CONTENT_LENGTH', meta.get('HTTP_CONTENT_LENGTH', 0))
             )
         except (ValueError, TypeError):
             content_length = 0
@@ -313,50 +267,6 @@ class Request(object):
         else:
             self._stream = six.BytesIO(self.raw_post_data)
 
-    def _perform_form_overloading(self):
-        """
-        If this is a form POST request, then we need to check if the method and
-        content/content_type have been overridden by setting them in hidden
-        form fields or not.
-        """
-
-        USE_FORM_OVERLOADING = (
-            self._METHOD_PARAM or
-            (self._CONTENT_PARAM and self._CONTENTTYPE_PARAM)
-        )
-
-        # We only need to use form overloading on form POST requests.
-        if (
-            self._request.method != 'POST' or
-            not USE_FORM_OVERLOADING or
-            not is_form_media_type(self._content_type)
-        ):
-            return
-
-        # At this point we're committed to parsing the request as form data.
-        self._data = self._request.POST
-        self._files = self._request.FILES
-        self._full_data = self._data.copy()
-        self._full_data.update(self._files)
-
-        # Method overloading - change the method and remove the param from the content.
-        if (
-            self._METHOD_PARAM and
-            self._METHOD_PARAM in self._data
-        ):
-            self._method = self._data[self._METHOD_PARAM].upper()
-
-        # Content overloading - modify the content type, and force re-parse.
-        if (
-            self._CONTENT_PARAM and
-            self._CONTENTTYPE_PARAM and
-            self._CONTENT_PARAM in self._data and
-            self._CONTENTTYPE_PARAM in self._data
-        ):
-            self._content_type = self._data[self._CONTENTTYPE_PARAM]
-            self._stream = six.BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding']))
-            self._data, self._files, self._full_data = (Empty, Empty, Empty)
-
     def _parse(self):
         """
         Parse the request content, returning a two-tuple of (data, files)
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index e20e51287..ec58d3ab6 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -94,9 +94,6 @@ DEFAULTS = {
     'TEST_REQUEST_DEFAULT_FORMAT': 'multipart',
 
     # Browser enhancements
-    'FORM_METHOD_OVERRIDE': '_method',
-    'FORM_CONTENT_OVERRIDE': '_content',
-    'FORM_CONTENTTYPE_OVERRIDE': '_content_type',
     'URL_ACCEPT_OVERRIDE': 'accept',
     'URL_FORMAT_OVERRIDE': 'format',
 
diff --git a/rest_framework/static/rest_framework/js/ajax-form.js b/rest_framework/static/rest_framework/js/ajax-form.js
new file mode 100644
index 000000000..db07fd8fb
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/ajax-form.js
@@ -0,0 +1,97 @@
+function replaceDocument(docString) {
+    var doc = document.open("text/html");
+    doc.write(docString);
+    doc.close();
+}
+
+
+function doAjaxSubmit(e) {
+    var form = $(this);
+    var btn = $(this.clk);
+    var method = btn.data('method') || form.data('method') || form.attr('method') || 'GET';
+    method = method.toUpperCase()
+    if (method === 'GET') {
+        // GET requests can always use standard form submits.
+        return;
+    }
+
+    var contentType =
+        form.find('input[data-override="content-type"]').val() ||
+        form.find('select[data-override="content-type"] option:selected').text();
+    if (method === 'POST' && !contentType) {
+        // POST requests can use standard form submits, unless we have
+        // overridden the content type.
+        return;
+    }
+
+    // At this point we need to make an AJAX form submission.
+    e.preventDefault();
+
+    var url = form.attr('action');
+    var data;
+    if (contentType) {
+        data = form.find('[data-override="content"]').val() || ''
+    } else {
+        contentType = form.attr('enctype') || form.attr('encoding')
+        if (contentType === 'multipart/form-data') {
+            if (!window.FormData) {
+                alert('Your browser does not support AJAX multipart form submissions');
+                return;
+            }
+            // Use the FormData API and allow the content type to be set automatically,
+            // so it includes the boundary string.
+            // See https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects
+            contentType = false;
+            data = new FormData(form[0]);
+        } else {
+            contentType = 'application/x-www-form-urlencoded; charset=UTF-8'
+            data = form.serialize();
+        }
+    }
+
+    var ret = $.ajax({
+        url: url,
+        method: method,
+        data: data,
+        contentType: contentType,
+        processData: false,
+        headers: {'Accept': 'text/html; q=1.0, */*'},
+    });
+    ret.always(function(data, textStatus, jqXHR) {
+        if (textStatus != 'success') {
+            jqXHR = data;
+        }
+        var responseContentType = jqXHR.getResponseHeader("content-type") || "";
+        if (responseContentType.toLowerCase().indexOf('text/html') === 0) {
+            replaceDocument(jqXHR.responseText);
+            try {
+                // Modify the location and scroll to top, as if after page load.
+                history.replaceState({}, '', url);
+                scroll(0,0);
+            } catch(err) {
+                // History API not supported, so redirect.
+                window.location = url;
+            }
+        } else {
+            // Not HTML content. We can't open this directly, so redirect.
+            window.location = url;
+        }
+    });
+    return ret;
+}
+
+
+function captureSubmittingElement(e) {
+    var target = e.target;
+    var form = this;
+    form.clk = target;
+}
+
+
+$.fn.ajaxForm = function() {
+    var options = {}
+    return this
+        .unbind('submit.form-plugin  click.form-plugin')
+        .bind('submit.form-plugin', options, doAjaxSubmit)
+        .bind('click.form-plugin', options, captureSubmittingElement);
+};
diff --git a/rest_framework/static/rest_framework/js/csrf.js b/rest_framework/static/rest_framework/js/csrf.js
new file mode 100644
index 000000000..4e8da0de5
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/csrf.js
@@ -0,0 +1,47 @@
+function getCookie(name) {
+    var cookieValue = null;
+    if (document.cookie && document.cookie != '') {
+        var cookies = document.cookie.split(';');
+        for (var i = 0; i < cookies.length; i++) {
+            var cookie = jQuery.trim(cookies[i]);
+            // Does this cookie string begin with the name we want?
+            if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                break;
+            }
+        }
+    }
+    return cookieValue;
+}
+
+function csrfSafeMethod(method) {
+    // these HTTP methods do not require CSRF protection
+    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+}
+
+function sameOrigin(url) {
+    // test that a given url is a same-origin URL
+    // url could be relative or scheme relative or absolute
+    var host = document.location.host; // host + port
+    var protocol = document.location.protocol;
+    var sr_origin = '//' + host;
+    var origin = protocol + sr_origin;
+    // Allow absolute or scheme relative URLs to same origin
+    return (url == origin || url.slice(0, origin.length + 1) == origin + '/') ||
+        (url == sr_origin || url.slice(0, sr_origin.length + 1) == sr_origin + '/') ||
+        // or any other URL that isn't scheme relative or absolute i.e relative.
+        !(/^(\/\/|http:|https:).*/.test(url));
+}
+
+var csrftoken = getCookie('csrftoken');
+
+$.ajaxSetup({
+    beforeSend: function(xhr, settings) {
+        if (!csrfSafeMethod(settings.type) && sameOrigin(settings.url)) {
+            // Send the token to same-origin, relative URLs only.
+            // Send the token only if the method warrants CSRF protection
+            // Using the CSRFToken value acquired earlier
+            xhr.setRequestHeader("X-CSRFToken", csrftoken);
+        }
+    }
+});
diff --git a/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js b/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js
new file mode 100644
index 000000000..0f60b7bd0
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},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(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={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:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
+return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.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(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,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",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index abbc75952..8d21487ee 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -94,17 +94,13 @@
         {% endif %}
 
         {% if options_form %}
-          <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="OPTIONS" />
+          <form class="button-form" action="{{ request.get_full_path }}" data-method="OPTIONS">
             <button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
           </form>
         {% endif %}
 
         {% if delete_form %}
-          <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
+          <form class="button-form" action="{{ request.get_full_path }}" data-method="DELETE">
             <button class="btn btn-danger js-tooltip" title="Make a DELETE request on the {{ name }} resource">DELETE</button>
           </form>
         {% endif %}
@@ -168,7 +164,7 @@
                     </div>
                   {% endif %}
 
-                  <div {% if post_form %}class="tab-pane"{% endif %} id="post-generic-content-form">
+                  <div {% if raw_data_post_form %}class="tab-pane"{% endif %} id="post-generic-content-form">
                     {% with form=raw_data_post_form %}
                       <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
                         <fieldset>
@@ -200,11 +196,11 @@
                 <div class="well tab-content">
                   {% if put_form %}
                     <div class="tab-pane" id="put-object-form">
-                      <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
+                      <form action="{{ request.get_full_path }}" data-method="PUT" enctype="multipart/form-data" class="form-horizontal" novalidate>
                         <fieldset>
                           {{ put_form }}
                           <div class="form-actions">
-                            <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                            <button class="btn btn-primary js-tooltip" title="Make a PUT request on the {{ name }} resource">PUT</button>
                           </div>
                         </fieldset>
                       </form>
@@ -213,15 +209,15 @@
 
                   <div {% if put_form %}class="tab-pane"{% endif %} id="put-generic-content-form">
                     {% with form=raw_data_put_or_patch_form %}
-                      <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal">
+                      <form action="{{ request.get_full_path }}" data-method="PUT" class="form-horizontal">
                         <fieldset>
                           {% include "rest_framework/raw_data_form.html" %}
                           <div class="form-actions">
                             {% if raw_data_put_form %}
-                              <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" title="Make a PUT request on the {{ name }} resource">PUT</button>
+                              <button class="btn btn-primary js-tooltip" title="Make a PUT request on the {{ name }} resource">PUT</button>
                             {% endif %}
                             {% if raw_data_patch_form %}
-                              <button class="btn btn-primary js-tooltip" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
+                            <button data-method="PATCH" class="btn btn-primary js-tooltip" title="Make a PATCH request on the {{ name }} resource">PATCH</button>
                               {% endif %}
                           </div>
                         </fieldset>
@@ -237,10 +233,17 @@
   </div><!-- ./wrapper -->
 
   {% block script %}
-    <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
+    <script src="{% static "rest_framework/js/jquery-1.11.3.min.js" %}"></script>
+    <script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
+    <script src="{% static "rest_framework/js/csrf.js" %}"></script>
     <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
     <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
     <script src="{% static "rest_framework/js/default.js" %}"></script>
+    <script>
+        $(document).ready(function() {
+            $('form').ajaxForm();
+        });
+    </script>
   {% endblock %}
 </body>
 {% endblock %}
diff --git a/rest_framework/templates/rest_framework/raw_data_form.html b/rest_framework/templates/rest_framework/raw_data_form.html
index 2aa0beecd..ebf6fa706 100644
--- a/rest_framework/templates/rest_framework/raw_data_form.html
+++ b/rest_framework/templates/rest_framework/raw_data_form.html
@@ -1,5 +1,4 @@
 {% load rest_framework %}
-{% csrf_token %}
 {{ form.non_field_errors }}
 {% for field in form %}
   <div class="form-group">
diff --git a/tests/test_request.py b/tests/test_request.py
index f4b381aeb..c328460f3 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -43,36 +43,6 @@ class PlainTextParser(BaseParser):
         return stream.read()
 
 
-class TestMethodOverloading(TestCase):
-    def test_method(self):
-        """
-        Request methods should be same as underlying request.
-        """
-        request = Request(factory.get('/'))
-        self.assertEqual(request.method, 'GET')
-        request = Request(factory.post('/'))
-        self.assertEqual(request.method, 'POST')
-
-    def test_overloaded_method(self):
-        """
-        POST requests can be overloaded to another method by setting a
-        reserved form field
-        """
-        request = Request(factory.post('/', {api_settings.FORM_METHOD_OVERRIDE: 'DELETE'}))
-        self.assertEqual(request.method, 'DELETE')
-
-    def test_x_http_method_override_header(self):
-        """
-        POST requests can also be overloaded to another method by setting
-        the X-HTTP-Method-Override header.
-        """
-        request = Request(factory.post('/', {'foo': 'bar'}, HTTP_X_HTTP_METHOD_OVERRIDE='DELETE'))
-        self.assertEqual(request.method, 'DELETE')
-
-        request = Request(factory.get('/', {'foo': 'bar'}, HTTP_X_HTTP_METHOD_OVERRIDE='DELETE'))
-        self.assertEqual(request.method, 'DELETE')
-
-
 class TestContentParsing(TestCase):
     def test_standard_behaviour_determines_no_content_GET(self):
         """
@@ -137,49 +107,6 @@ class TestContentParsing(TestCase):
         request.parsers = (PlainTextParser(), )
         self.assertEqual(request.data, content)
 
-    def test_overloaded_behaviour_allows_content_tunnelling(self):
-        """
-        Ensure request.data returns content for overloaded POST request.
-        """
-        json_data = {'foobar': 'qwerty'}
-        content = json.dumps(json_data)
-        content_type = 'application/json'
-        form_data = {
-            api_settings.FORM_CONTENT_OVERRIDE: content,
-            api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
-        }
-        request = Request(factory.post('/', form_data))
-        request.parsers = (JSONParser(), )
-        self.assertEqual(request.data, json_data)
-
-    def test_form_POST_unicode(self):
-        """
-        JSON POST via default web interface with unicode data
-        """
-        # Note: environ and other variables here have simplified content compared to real Request
-        CONTENT = b'_content_type=application%2Fjson&_content=%7B%22request%22%3A+4%2C+%22firm%22%3A+1%2C+%22text%22%3A+%22%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%21%22%7D'
-        environ = {
-            'REQUEST_METHOD': 'POST',
-            'CONTENT_TYPE': 'application/x-www-form-urlencoded',
-            'CONTENT_LENGTH': len(CONTENT),
-            'wsgi.input': BytesIO(CONTENT),
-        }
-        wsgi_request = WSGIRequest(environ=environ)
-        wsgi_request._load_post_and_files()
-        parsers = (JSONParser(), FormParser(), MultiPartParser())
-        parser_context = {
-            'encoding': 'utf-8',
-            'kwargs': {},
-            'args': (),
-        }
-        request = Request(wsgi_request, parsers=parsers, parser_context=parser_context)
-        method = request.method
-        self.assertEqual(method, 'POST')
-        self.assertEqual(request._content_type, 'application/json')
-        self.assertEqual(request._stream.getvalue(), b'{"request": 4, "firm": 1, "text": "\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xb5\xd1\x82!"}')
-        self.assertEqual(request._data, Empty)
-        self.assertEqual(request._files, Empty)
-
 
 class MockView(APIView):
     authentication_classes = (SessionAuthentication,)
diff --git a/tests/test_views.py b/tests/test_views.py
index cbe1939eb..05c499481 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -74,21 +74,6 @@ class ClassBasedViewIntegrationTests(TestCase):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(sanitise_json_error(response.data), expected)
 
-    def test_400_parse_error_tunneled_content(self):
-        content = 'f00bar'
-        content_type = 'application/json'
-        form_data = {
-            api_settings.FORM_CONTENT_OVERRIDE: content,
-            api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
-        }
-        request = factory.post('/', form_data)
-        response = self.view(request)
-        expected = {
-            'detail': JSON_ERROR
-        }
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(sanitise_json_error(response.data), expected)
-
 
 class FunctionBasedViewIntegrationTests(TestCase):
     def setUp(self):
@@ -103,21 +88,6 @@ class FunctionBasedViewIntegrationTests(TestCase):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(sanitise_json_error(response.data), expected)
 
-    def test_400_parse_error_tunneled_content(self):
-        content = 'f00bar'
-        content_type = 'application/json'
-        form_data = {
-            api_settings.FORM_CONTENT_OVERRIDE: content,
-            api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
-        }
-        request = factory.post('/', form_data)
-        response = self.view(request)
-        expected = {
-            'detail': JSON_ERROR
-        }
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(sanitise_json_error(response.data), expected)
-
 
 class TestCustomExceptionHandler(TestCase):
     def setUp(self):

From 7df11078ee2f2de53fbe280c82f6b08802e89490 Mon Sep 17 00:00:00 2001
From: Yiyo <yiyocx@users.noreply.github.com>
Date: Thu, 17 Sep 2015 10:30:22 -0500
Subject: [PATCH 23/67] Improved Serializer relations docs

---
 docs/api-guide/relations.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index fd53acbc8..4b77fa3a5 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -255,7 +255,7 @@ For example, the following serializer:
     class TrackSerializer(serializers.ModelSerializer):
         class Meta:
             model = Track
-            fields = ('order', 'title')
+            fields = ('order', 'title', 'duration')
 
     class AlbumSerializer(serializers.ModelSerializer):
         tracks = TrackSerializer(many=True, read_only=True)
@@ -293,7 +293,7 @@ Be default nested serializers are read-only. If you want to to support write-ope
     class TrackSerializer(serializers.ModelSerializer):
         class Meta:
             model = Track
-            fields = ('order', 'title')
+            fields = ('order', 'title', 'duration')
 
     class AlbumSerializer(serializers.ModelSerializer):
         tracks = TrackSerializer(many=True)
@@ -405,13 +405,15 @@ In this case we'd need to override `HyperlinkedRelatedField` to get the behavior
         def get_url(self, obj, view_name, request, format):
             url_kwargs = {
                 'organization_slug': obj.organization.slug,
-                'customer_pk': obj.pk
            }
+                'customer_pk': obj.pk
+            }
             return reverse(view_name, url_kwargs, request=request, format=format)
 
         def get_object(self, view_name, view_args, view_kwargs):
             lookup_kwargs = {
                'organization__slug': view_kwargs['organization_slug'],
-               'pk': view_kwargs['customer_pk']
            }
+               'pk': view_kwargs['customer_pk']
+            }
             return self.get_queryset().get(**lookup_kwargs)
 
 Note that if you wanted to use this style together with the generic views then you'd also need to override `.get_object` on the view in order to get the correct lookup behavior.

From 4b4130e8b248b127451a3481c07a7134cf024ad7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 17 Sep 2015 16:34:03 +0100
Subject: [PATCH 24/67] Fix request cloning, so method becomes set

---
 rest_framework/request.py | 3 +--
 tests/test_request.py     | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 98a70eb3a..76bf496ce 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -86,7 +86,7 @@ def clone_request(request, method):
     ret._full_data = request._full_data
     ret._content_type = request._content_type
     ret._stream = request._stream
-    ret._method = method
+    ret.method = method
     if hasattr(request, '_user'):
         ret._user = request._user
     if hasattr(request, '_auth'):
@@ -139,7 +139,6 @@ class Request(object):
         self._data = Empty
         self._files = Empty
         self._full_data = Empty
-        self._method = Empty
         self._content_type = Empty
         self._stream = Empty
 
diff --git a/tests/test_request.py b/tests/test_request.py
index c328460f3..49f99a832 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -3,27 +3,22 @@ Tests for content parsing, and form-overloaded content parsing.
 """
 from __future__ import unicode_literals
 
-import json
-from io import BytesIO
-
 import django
 import pytest
 from django.conf.urls import url
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.models import User
 from django.contrib.sessions.middleware import SessionMiddleware
-from django.core.handlers.wsgi import WSGIRequest
 from django.test import TestCase
 from django.utils import six
 
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.parsers import (
-    BaseParser, FormParser, JSONParser, MultiPartParser
+    BaseParser, FormParser, MultiPartParser
 )
-from rest_framework.request import Empty, Request
+from rest_framework.request import Request
 from rest_framework.response import Response
-from rest_framework.settings import api_settings
 from rest_framework.test import APIClient, APIRequestFactory
 from rest_framework.views import APIView
 

From b8ebe298448282cb97251e2955844f15016e7196 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 17 Sep 2015 16:40:47 +0100
Subject: [PATCH 25/67] Import sorting

---
 tests/test_request.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/test_request.py b/tests/test_request.py
index 49f99a832..a2bd4cade 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -14,9 +14,7 @@ from django.utils import six
 
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
-from rest_framework.parsers import (
-    BaseParser, FormParser, MultiPartParser
-)
+from rest_framework.parsers import BaseParser, FormParser, MultiPartParser
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.test import APIClient, APIRequestFactory

From eec1156f630ef45456bafb092d136670f8017463 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 17 Sep 2015 16:53:28 +0100
Subject: [PATCH 26/67] AJAX forms in admin interface

---
 .../rest_framework/js/jquery-1.8.1-min.js     |  2 --
 .../templates/rest_framework/admin.html       | 21 ++++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100644 rest_framework/static/rest_framework/js/jquery-1.8.1-min.js

diff --git a/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js b/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js
deleted file mode 100644
index 3b8d15d06..000000000
--- a/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.1 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.1",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,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(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call(" ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,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%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},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(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n=(p._data(this,"events")||{})[c.type]||[],o=n.delegateCount,q=[].slice.call(arguments),r=!c.exclusive&&!c.namespace,s=p.event.special[c.type]||{},t=[];q[0]=c,c.delegateTarget=this;if(s.preDispatch&&s.preDispatch.call(this,c)===!1)return;if(o&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<o;d++)k=n[d],l=k.selector,h[l]===b&&(h[l]=p(l,this).index(f)>=0),h[l]&&j.push(k);j.length&&t.push({elem:f,matches:j})}n.length>o&&t.push({elem:this,matches:n.slice(o)});for(d=0;d<t.length&&!c.isPropagationStopped();d++){i=t[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){k=i.matches[e];if(r||!c.namespace&&!k.namespace||c.namespace_re&&c.namespace_re.test(k.namespace))c.data=k.data,c.handleObj=k,g=((p.event.special[k.origType]||{}).handle||k.handler).apply(i.elem,q),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return s.postDispatch&&s.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.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(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function $(a,b,c,d){c=c||[],b=b||q;var e,f,g,j,k=b.nodeType;if(k!==1&&k!==9)return[];if(!a||typeof a!="string")return c;g=h(b);if(!g&&!d)if(e=L.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&i(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return u.apply(c,t.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&X&&b.getElementsByClassName)return u.apply(c,t.call(b.getElementsByClassName(j),0)),c}return bk(a,b,c,d,g)}function _(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function ba(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bb(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bc(a,b,c,d){var e,g,h,i,j,k,l,m,n,p,r=!c&&b!==q,s=(r?"<s>":"")+a.replace(H,"$1<s>"),u=y[o][s];if(u)return d?0:t.call(u,0);j=a,k=[],m=0,n=f.preFilter,p=f.filter;while(j){if(!e||(g=I.exec(j)))g&&(j=j.slice(g[0].length),h.selector=l),k.push(h=[]),l="",r&&(j=" "+j);e=!1;if(g=J.exec(j))l+=g[0],j=j.slice(g[0].length),e=h.push({part:g.pop().replace(H," "),string:g[0],captures:g});for(i in p)(g=S[i].exec(j))&&(!n[i]||(g=n[i](g,b,c)))&&(l+=g[0],j=j.slice(g[0].length),e=h.push({part:i,string:g.shift(),captures:g}));if(!e)break}return l&&(h.selector=l),d?j.length:j?$.error(a):t.call(y(s,k),0)}function bd(a,b,e,f){var g=b.dir,h=s++;return a||(a=function(a){return a===e}),b.first?function(b){while(b=b[g])if(b.nodeType===1)return a(b)&&b}:f?function(b){while(b=b[g])if(b.nodeType===1&&a(b))return b}:function(b){var e,f=h+"."+c,i=f+"."+d;while(b=b[g])if(b.nodeType===1){if((e=b[o])===i)return b.sizset;if(typeof e=="string"&&e.indexOf(f)===0){if(b.sizset)return b}else{b[o]=i;if(a(b))return b.sizset=!0,b;b.sizset=!1}}}}function be(a,b){return a?function(c){var d=b(c);return d&&a(d===!0?c:d)}:b}function bf(a,b,c){var d,e,g=0;for(;d=a[g];g++)f.relative[d.part]?e=bd(e,f.relative[d.part],b,c):e=be(e,f.filter[d.part].apply(null,d.captures.concat(b,c)));return e}function bg(a){return function(b){var c,d=0;for(;c=a[d];d++)if(c(b))return!0;return!1}}function bh(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)$(a,b[e],c,d)}function bi(a,b,c,d,e,g){var h,i=f.setFilters[b.toLowerCase()];return i||$.error(b),(a||!(h=e))&&bh(a||"*",d,h=[],e),h.length>0?i(h,c,g):[]}function bj(a,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s=0,t=a.length,v=S.POS,w=new RegExp("^"+v.source+"(?!"+A+")","i"),x=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(n[a]=b)};for(;s<t;s++){f=a[s],g="",m=e;for(h=0,i=f.length;h<i;h++){j=f[h],k=j.string;if(j.part==="PSEUDO"){v.exec(""),l=0;while(n=v.exec(k)){o=!0,p=v.lastIndex=n.index+n[0].length;if(p>l){g+=k.slice(l,n.index),l=p,q=[c],J.test(g)&&(m&&(q=m),m=e);if(r=O.test(g))g=g.slice(0,-5).replace(J,"$&*"),l++;n.length>1&&n[0].replace(w,x),m=bi(g,n[1],n[2],q,m,r)}g=""}}o||(g+=k),o=!1}g?J.test(g)?bh(g,m||[c],d,e):$(g,c,d,e?e.concat(m):m):u.apply(d,m)}return t===1?d:$.uniqueSort(d)}function bk(a,b,e,g,h){a=a.replace(H,"$1");var i,k,l,m,n,o,p,q,r,s,v=bc(a,b,h),w=b.nodeType;if(S.POS.test(a))return bj(v,b,e,g);if(g)i=t.call(g,0);else if(v.length===1){if((o=t.call(v[0],0)).length>2&&(p=o[0]).part==="ID"&&w===9&&!h&&f.relative[o[1].part]){b=f.find.ID(p.captures[0].replace(R,""),b,h)[0];if(!b)return e;a=a.slice(o.shift().string.length)}r=(v=N.exec(o[0].string))&&!v.index&&b.parentNode||b,q="";for(n=o.length-1;n>=0;n--){p=o[n],s=p.part,q=p.string+q;if(f.relative[s])break;if(f.order.test(s)){i=f.find[s](p.captures[0].replace(R,""),r,h);if(i==null)continue;a=a.slice(0,a.length-q.length)+q.replace(S[s],""),a||u.apply(e,t.call(i,0));break}}}if(a){k=j(a,b,h),c=k.dirruns++,i==null&&(i=f.find.TAG("*",N.test(a)&&b.parentNode||b));for(n=0;m=i[n];n++)d=k.runs++,k(m)&&e.push(m)}return e}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=a.document,r=q.documentElement,s=0,t=[].slice,u=[].push,v=function(a,b){return a[o]=b||!0,a},w=function(){var a={},b=[];return v(function(c,d){return b.push(c)>f.cacheLength&&delete a[b.shift()],a[c]=d},a)},x=w(),y=w(),z=w(),A="[\\x20\\t\\r\\n\\f]",B="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",C=B.replace("w","w#"),D="([*^$|!~]?=)",E="\\["+A+"*("+B+")"+A+"*(?:"+D+A+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+C+")|)|)"+A+"*\\]",F=":("+B+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+E+")|[^:]|\\\\.)*|.*))\\)|)",G=":(nth|eq|gt|lt|first|last|even|odd)(?:\\(((?:-\\d)?\\d*)\\)|)(?=[^-]|$)",H=new RegExp("^"+A+"+|((?:^|[^\\\\])(?:\\\\.)*)"+A+"+$","g"),I=new RegExp("^"+A+"*,"+A+"*"),J=new RegExp("^"+A+"*([\\x20\\t\\r\\n\\f>+~])"+A+"*"),K=new RegExp(F),L=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,M=/^:not/,N=/[\x20\t\r\n\f]*[+~]/,O=/:not\($/,P=/h\d/i,Q=/input|select|textarea|button/i,R=/\\(?!\\)/g,S={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),NAME:new RegExp("^\\[name=['\"]?("+B+")['\"]?\\]"),TAG:new RegExp("^("+B.replace("w","w*")+")"),ATTR:new RegExp("^"+E),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+A+"*(even|odd|(([+-]|)(\\d*)n|)"+A+"*(?:([+-]|)"+A+"*(\\d+)|))"+A+"*\\)|)","i"),POS:new RegExp(G,"ig"),needsContext:new RegExp("^"+A+"*[>+~]|"+G,"i")},T=function(a){var b=q.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},U=T(function(a){return a.appendChild(q.createComment("")),!a.getElementsByTagName("*").length}),V=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),W=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),X=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),Y=T(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",r.insertBefore(a,r.firstChild);var b=q.getElementsByName&&q.getElementsByName(o).length===2+q.getElementsByName(o+0).length;return e=!q.getElementById(o),r.removeChild(a),b});try{t.call(r.childNodes,0)[0].nodeType}catch(Z){t=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}$.matches=function(a,b){return $(a,null,null,b)},$.matchesSelector=function(a,b){return $(b,null,null,[a]).length>0},g=$.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=g(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=g(b);return c},h=$.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},i=$.contains=r.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:r.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},$.attr=function(a,b){var c,d=h(a);return d||(b=b.toLowerCase()),f.attrHandle[b]?f.attrHandle[b](a):W||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},f=$.selectors={cacheLength:50,createPseudo:v,match:S,order:new RegExp("ID|TAG"+(Y?"|NAME":"")+(X?"|CLASS":"")),attrHandle:V?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:e?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:U?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(R,""),a[3]=(a[4]||a[5]||"").replace(R,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||$.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&$.error(a[0]),a},PSEUDO:function(a,b,c){var d,e;if(S.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(d=a[4])K.test(d)&&(e=bc(d,b,c,!0))&&(e=d.indexOf(")",d.length-e)-d.length)&&(d=d.slice(0,e),a[0]=a[0].slice(0,e)),a[2]=d;return a.slice(0,3)}},filter:{ID:e?function(a){return a=a.replace(R,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(R,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(R,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=x[o][a];return b||(b=x(a,new RegExp("(^|"+A+")"+a+"("+A+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=$.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return $.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=s++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[o]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[o]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e,g=f.pseudos[a]||f.pseudos[a.toLowerCase()];return g||$.error("unsupported pseudo: "+a),g[o]?g(b,c,d):g.length>1?(e=[a,a,"",b],function(a){return g(a,0,e)}):g}},pseudos:{not:v(function(a,b,c){var d=j(a.replace(H,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!f.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:v(function(a){return function(b){return(b.textContent||b.innerText||g(b)).indexOf(a)>-1}}),has:v(function(a){return function(b){return $(a,b).length>0}}),header:function(a){return P.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:_("radio"),checkbox:_("checkbox"),file:_("file"),password:_("password"),image:_("image"),submit:ba("submit"),reset:ba("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return Q.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}},k=r.compareDocumentPosition?function(a,b){return a===b?(l=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return l=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bb(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bb(e[j],f[j]);return j===c?bb(a,f[j],-1):bb(e[j],b,1)},[0,0].sort(k),m=!l,$.uniqueSort=function(a){var b,c=1;l=m,a.sort(k);if(l)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},$.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},j=$.compile=function(a,b,c){var d,e,f,g=z[o][a];if(g&&g.context===b)return g;d=bc(a,b,c);for(e=0,f=d.length;e<f;e++)d[e]=bf(d[e],b,c);return g=z(a,bg(d)),g.context=b,g.runs=g.dirruns=0,g},q.querySelectorAll&&function(){var a,b=bk,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=r.matchesSelector||r.mozMatchesSelector||r.webkitMatchesSelector||r.oMatchesSelector||r.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+A+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+A+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bk=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return u.apply(f,t.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j,k,l,m=d.getAttribute("id"),n=m||o,p=N.test(a)&&d.parentNode||d;m?n=n.replace(c,"\\$&"):d.setAttribute("id",n),j=bc(a,d,h),n="[id='"+n+"']";for(k=0,l=j.length;k<l;k++)j[k]=n+j[k].selector;try{return u.apply(f,t.call(p.querySelectorAll(j.join(",")),0)),f}catch(i){}finally{m||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push(S.PSEUDO.source,S.POS.source,"!=")}catch(c){}}),f=new RegExp(f.join("|")),$.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!h(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=g.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return $(c,null,null,[b]).length>0})}(),f.setFilters.nth=f.setFilters.eq,f.filters=f.pseudos,$.attr=p.attr,p.find=$,p.expr=$.selectors,p.expr[":"]=p.expr.pseudos,p.unique=$.uniqueSort,p.text=$.getText,p.isXMLDoc=$.isXML,p.contains=$.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={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,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{cj=f.href}catch(cy){cj=e.createElement("a"),cj.href="",cj=cj.href}ck=ct.exec(cj.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:cj,isLocal:cn.test(ck[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,ck[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==ck[1]&&i[2]==ck[2]&&(i[3]||(i[1]==="http:"?80:443))==(ck[3]||(ck[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cQ.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=da(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html
index 7db06e07c..e1751b21c 100644
--- a/rest_framework/templates/rest_framework/admin.html
+++ b/rest_framework/templates/rest_framework/admin.html
@@ -104,9 +104,7 @@
                 {% endif %}
 
                 {% if delete_form %}
-                    <form class="button-form" action="{{ request.get_full_path }}" method="POST">
-                        {% csrf_token %}
-                        <input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
+                    <form class="button-form" action="{{ request.get_full_path }}" data-method="DELETE">
                         <button class="btn btn-danger">
                             <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete
                         </button>
@@ -180,7 +178,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="myModalLabel">Edit</h4>
       </div>
-      <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
+      <form action="{{ request.get_full_path }}" data-method="PUT" enctype="multipart/form-data" class="form-horizontal" novalidate>
         <div class="modal-body">
           <fieldset>
             {{ put_form }}
@@ -188,7 +186,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <button name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" type="submit" class="btn btn-primary">Save</button>
+          <button type="submit" class="btn btn-primary">Save</button>
         </div>
       </form>
     </div>
@@ -204,7 +202,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="myModalLabel">{{ error_title }}</h4>
       </div>
-      <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
+      <form action="{{ request.get_full_path }}" data-method="{{ request.method }}" enctype="multipart/form-data" class="form-horizontal" novalidate>
         <div class="modal-body">
           <fieldset>
             {{ error_form }}
@@ -212,7 +210,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <button name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="{{ request.method }}" type="submit" class="btn btn-primary">Save</button>
+          <button type="submit" class="btn btn-primary">Save</button>
         </div>
       </form>
     </div>
@@ -221,10 +219,17 @@
 {% endif %}
 
         {% block script %}
-            <script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
+            <script src="{% static "rest_framework/js/jquery-1.11.3-min.js" %}"></script>
+            <script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
+            <script src="{% static "rest_framework/js/csrf.js" %}"></script>
             <script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
             <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
             <script src="{% static "rest_framework/js/default.js" %}"></script>
+            <script>
+                $(document).ready(function() {
+                    $('form').ajaxForm();
+                });
+            </script>
         {% endblock %}
     </body>
     {% endblock %}

From cb42b995fa01aa3add2bd3da34d61723bc163fdc Mon Sep 17 00:00:00 2001
From: Christopher Adams <christopher.r.adams@gmail.com>
Date: Sun, 13 Sep 2015 01:08:05 -0400
Subject: [PATCH 27/67] Proof of bug #2761

- When not submitting key for list fields or multiple choice, partial
  serialization should result in empty state (key not there), not an
  empty list.
---
 tests/test_serializer_lists.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py
index e9234d8f7..607ddba04 100644
--- a/tests/test_serializer_lists.py
+++ b/tests/test_serializer_lists.py
@@ -289,3 +289,32 @@ class TestListSerializerClass:
         serializer = TestSerializer(data=[], many=True)
         assert not serializer.is_valid()
         assert serializer.errors == {'non_field_errors': ['Non field error']}
+
+
+class TestSerializerPartialUsage:
+    """
+    When not submitting key for list fields or multiple choice, partial
+    serialization should result in an empty state (key not there), not
+    an empty list.
+
+    Regression test for Github issue #2761.
+    """
+    def test_partial_listfield(self):
+        class ListSerializer(serializers.Serializer):
+            listdata = serializers.ListField()
+        serializer = ListSerializer(data=MultiValueDict(), partial=True)
+        result = serializer.to_internal_value(data={})
+        assert "listdata" not in result
+        assert serializer.is_valid()
+        assert serializer.validated_data == {}
+        assert serializer.errors == {}
+
+    def test_partial_multiplechoice(self):
+        class MultipleChoiceSerializer(serializers.Serializer):
+            multiplechoice = serializers.MultipleChoiceField(choices=[1, 2, 3])
+        serializer = MultipleChoiceSerializer(data=MultiValueDict(), partial=True)
+        result = serializer.to_internal_value(data={})
+        assert "multiplechoice" not in result
+        assert serializer.is_valid()
+        assert serializer.validated_data == {}
+        assert serializer.errors == {}

From 9ccfc940775787638848304021744797d837b87a Mon Sep 17 00:00:00 2001
From: Christopher Adams <christopher.r.adams@gmail.com>
Date: Sun, 13 Sep 2015 01:09:56 -0400
Subject: [PATCH 28/67] Fixed #2761 - ListField truncation on HTTP PATCH

- Checked ``partial`` state when getting value in appropriate field
  classes; return ``empty`` immediately if key not submitted.
---
 rest_framework/fields.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 159784ea3..967e461fe 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1262,14 +1262,13 @@ class MultipleChoiceField(ChoiceField):
         super(MultipleChoiceField, self).__init__(*args, **kwargs)
 
     def get_value(self, dictionary):
+        if self.field_name not in dictionary:
+            if getattr(self.root, 'partial', False):
+                return empty
         # We override the default field access in order to support
         # lists in HTML forms.
         if html.is_html_input(dictionary):
-            ret = dictionary.getlist(self.field_name)
-            if getattr(self.root, 'partial', False) and not ret:
-                ret = empty
-            return ret
-
+            return dictionary.getlist(self.field_name)
         return dictionary.get(self.field_name, empty)
 
     def to_internal_value(self, data):
@@ -1416,6 +1415,9 @@ class ListField(Field):
         self.child.bind(field_name='', parent=self)
 
     def get_value(self, dictionary):
+        if self.field_name not in dictionary:
+            if getattr(self.root, 'partial', False):
+                return empty
         # We override the default field access in order to support
         # lists in HTML forms.
         if html.is_html_input(dictionary):

From df26614e85d0c2c5350a84027b77bb3948d78c38 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Sun, 20 Sep 2015 21:59:47 +0200
Subject: [PATCH 29/67] Translation update.

---
 .../locale/en_US/LC_MESSAGES/django.po        | 153 +++++++++++-------
 1 file changed, 94 insertions(+), 59 deletions(-)

diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po
index 3bde67f2c..846e5366a 100644
--- a/rest_framework/locale/en_US/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,207 +108,236 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -327,18 +358,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -358,6 +393,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""

From d85e7b9ccca02edea19efcc95b5c8ff0d2fa4b30 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Sun, 20 Sep 2015 22:03:52 +0200
Subject: [PATCH 30/67] Update Release notes for 3.2.4.

---
 docs/topics/release-notes.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 68803a5b1..59a8040ae 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,16 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 3.2.x series
 
+### 3.2.4
+
+**Date**: [21th September 2015][3.2.4-milestone].
+
+* Don't error on missing `ViewSet.search_fields` attribute.([#3324][gh3324], [#3323][gh3323])
+* Fix `allow_empty` not working on serializers with `many=True`. ([#3361][gh3361], [#3364][gh3364])
+* Let `DurationField` accepts integers. ([#3359][gh3359])
+* Multi-level dictionaries not supported in multipart requests. ([#3314][gh3314])
+
+
 ### 3.2.3
 
 **Date**: [24th August 2015][3.2.3-milestone].
@@ -299,6 +309,7 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [3.2.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.1+Release%22
 [3.2.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.2+Release%22
 [3.2.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.3+Release%22
+[3.2.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.4+Release%22
 
 <!-- 3.0.1 -->
 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -513,6 +524,10 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh3318]: https://github.com/tomchristie/django-rest-framework/issues/3318
 [gh3321]: https://github.com/tomchristie/django-rest-framework/issues/3321
 
-
-
-
+<!-- 3.2.4 -->
+[gh3314]: https://github.com/tomchristie/django-rest-framework/issues/@3314
+[gh3323]: https://github.com/tomchristie/django-rest-framework/issues/@3323
+[gh3324]: https://github.com/tomchristie/django-rest-framework/issues/@3324
+[gh3359]: https://github.com/tomchristie/django-rest-framework/issues/@3359
+[gh3361]: https://github.com/tomchristie/django-rest-framework/issues/@3361
+[gh3364]: https://github.com/tomchristie/django-rest-framework/issues/@3364

From d0510438b284ba3aec26290880c0366f08c900e2 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Sun, 20 Sep 2015 22:04:25 +0200
Subject: [PATCH 31/67] Bump version to 3.2.4.

---
 rest_framework/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index add4fc8ed..b7bb1e3e7 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.2.3'
+__version__ = '3.2.4'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2015 Tom Christie'

From 089b8af4c11addc46f711ffbfb888416755b9984 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Mon, 21 Sep 2015 08:07:56 +0200
Subject: [PATCH 32/67] Update the translations.

---
 .../locale/ar/LC_MESSAGES/django.mo           | Bin 4888 -> 4888 bytes
 .../locale/ar/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/be/LC_MESSAGES/django.mo           | Bin 655 -> 655 bytes
 .../locale/be/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/ca/LC_MESSAGES/django.mo           | Bin 0 -> 9749 bytes
 .../locale/ca/LC_MESSAGES/django.po           | 400 ++++++++++++++++++
 .../locale/ca_ES/LC_MESSAGES/django.mo        | Bin 0 -> 528 bytes
 .../locale/ca_ES/LC_MESSAGES/django.po        | 400 ++++++++++++++++++
 .../locale/cs/LC_MESSAGES/django.mo           | Bin 9140 -> 9140 bytes
 .../locale/cs/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/da/LC_MESSAGES/django.mo           | Bin 8905 -> 8905 bytes
 .../locale/da/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/de/LC_MESSAGES/django.mo           | Bin 9544 -> 9544 bytes
 .../locale/de/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/en/LC_MESSAGES/django.mo           | Bin 9406 -> 9476 bytes
 .../locale/en/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/en_CA/LC_MESSAGES/django.mo        | Bin 529 -> 529 bytes
 .../locale/en_CA/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/en_US/LC_MESSAGES/django.mo        | Bin 378 -> 378 bytes
 .../locale/es/LC_MESSAGES/django.mo           | Bin 9844 -> 10127 bytes
 .../locale/es/LC_MESSAGES/django.po           | 163 ++++---
 .../locale/et/LC_MESSAGES/django.mo           | Bin 8836 -> 8836 bytes
 .../locale/et/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/fr/LC_MESSAGES/django.mo           | Bin 9389 -> 10193 bytes
 .../locale/fr/LC_MESSAGES/django.po           | 169 +++++---
 .../locale/fr_CA/LC_MESSAGES/django.mo        | Bin 527 -> 527 bytes
 .../locale/fr_CA/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/gl/LC_MESSAGES/django.mo           | Bin 515 -> 515 bytes
 .../locale/gl/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/gl_ES/LC_MESSAGES/django.mo        | Bin 669 -> 669 bytes
 .../locale/gl_ES/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/hu/LC_MESSAGES/django.mo           | Bin 9228 -> 9228 bytes
 .../locale/hu/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/id/LC_MESSAGES/django.mo           | Bin 510 -> 510 bytes
 .../locale/id/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/it/LC_MESSAGES/django.mo           | Bin 9512 -> 9512 bytes
 .../locale/it/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/ja/LC_MESSAGES/django.mo           | Bin 0 -> 11341 bytes
 .../locale/ja/LC_MESSAGES/django.po           | 400 ++++++++++++++++++
 .../locale/ko_KR/LC_MESSAGES/django.mo        | Bin 10148 -> 10148 bytes
 .../locale/ko_KR/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/mk/LC_MESSAGES/django.mo           | Bin 10744 -> 10744 bytes
 .../locale/mk/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/nb/LC_MESSAGES/django.mo           | Bin 524 -> 524 bytes
 .../locale/nb/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/nl/LC_MESSAGES/django.mo           | Bin 9267 -> 9267 bytes
 .../locale/nl/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/pl/LC_MESSAGES/django.mo           | Bin 9602 -> 9602 bytes
 .../locale/pl/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/pt/LC_MESSAGES/django.mo           | Bin 517 -> 517 bytes
 .../locale/pt/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/pt_BR/LC_MESSAGES/django.mo        | Bin 9204 -> 9974 bytes
 .../locale/pt_BR/LC_MESSAGES/django.po        | 231 +++++-----
 .../locale/pt_PT/LC_MESSAGES/django.mo        | Bin 534 -> 534 bytes
 .../locale/pt_PT/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/ru/LC_MESSAGES/django.mo           | Bin 11487 -> 11487 bytes
 .../locale/ru/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/sk/LC_MESSAGES/django.mo           | Bin 9524 -> 9524 bytes
 .../locale/sk/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/sv/LC_MESSAGES/django.mo           | Bin 9519 -> 9519 bytes
 .../locale/sv/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/tr/LC_MESSAGES/django.mo           | Bin 9211 -> 9211 bytes
 .../locale/tr/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/tr_TR/LC_MESSAGES/django.mo        | Bin 522 -> 522 bytes
 .../locale/tr_TR/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/uk/LC_MESSAGES/django.mo           | Bin 590 -> 590 bytes
 .../locale/uk/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/vi/LC_MESSAGES/django.mo           | Bin 510 -> 510 bytes
 .../locale/vi/LC_MESSAGES/django.po           | 157 ++++---
 .../locale/zh_CN/LC_MESSAGES/django.mo        | Bin 9261 -> 9261 bytes
 .../locale/zh_CN/LC_MESSAGES/django.po        | 157 ++++---
 .../locale/zh_TW/LC_MESSAGES/django.mo        | Bin 0 -> 522 bytes
 .../locale/zh_TW/LC_MESSAGES/django.po        | 400 ++++++++++++++++++
 73 files changed, 4719 insertions(+), 1997 deletions(-)
 create mode 100644 rest_framework/locale/ca/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/ca/LC_MESSAGES/django.po
 create mode 100644 rest_framework/locale/ca_ES/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/ca_ES/LC_MESSAGES/django.po
 create mode 100644 rest_framework/locale/ja/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/ja/LC_MESSAGES/django.po
 create mode 100644 rest_framework/locale/zh_TW/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/zh_TW/LC_MESSAGES/django.po

diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo
index 4111cf0e670b7afe3b543b57a6098acf32a8a05d..1d1fa1cb92b0e65ea0edbd2bb53e0f2b0dbbc97e 100644
GIT binary patch
delta 78
zcmbQCHbZU09u8hhT_ZyULjx;QQ*8sI$tO9axxgX@7FMQalizWOD?}ugWu_J>_!p(*
b7nW8k*i__0SPnUvdHH3TiJMh9KXU>AiuD;V

delta 78
zcmbQCHbZU09u8g$T>~=(Lt`r=Lu~`Y$tO9axga7&K#|GsIK&k~GV*g1ixr$RiZY8!
WGE)_7O7e3ZfH)Z{uvwM!GbaFos2Jq{

diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.po b/rest_framework/locale/ar/LC_MESSAGES/django.po
index 3b7df4337..58197d962 100644
--- a/rest_framework/locale/ar/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ar/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "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"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "اسم المستخدم/كلمة السر غير صحيحين."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "المستخدم غير مفعل او تم حذفه."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -87,11 +87,12 @@ msgstr "لم يتم تزويد بيانات الدخول."
 msgid "You do not have permission to perform this action."
 msgstr "ليس لديك صلاحية للقيام بهذا الإجراء."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "غير موجود."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -107,209 +109,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "هذا الحقل مطلوب."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" ليس قيمة منطقية."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "لا يمكن لهذا الحقل ان يكون فارغاً."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "تأكد ان الحقل {min_length} محرف على الاقل."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "عليك ان تدخل بريد إلكتروني صالح."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "هذه القيمة لا تطابق النمط المطلوب."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "الرجاء إدخال رابط إلكتروني صالح."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "الرجاء إدخال رقم صحيح صالح."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "تأكد ان القيمة أقل أو تساوي {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "الرجاء إدخال رقم صالح."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "لم يتم إرسال أي ملف."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "الملف الذي تم إرساله فارغ."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "معرف العنصر \"{pk_value}\" غير صالح -  العنصر غير موجود."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "قيمة غير صالحة."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -361,6 +396,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/be/LC_MESSAGES/django.mo b/rest_framework/locale/be/LC_MESSAGES/django.mo
index a844185f0d95b181b820b615b7e3d1e28d47f409..97fb40795c07fa3a3aafb02fc28e5ef648de5b8d 100644
GIT binary patch
delta 93
zcmeBY?Pr}Znb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^|4e2C0N%eIZ2$lO

delta 93
zcmeBY?Pr}Znb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHKOlAZC)x;hm

diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po
index 0ba69266e..77295d606 100644
--- a/rest_framework/locale/be/LC_MESSAGES/django.po
+++ b/rest_framework/locale/be/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Belarusian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a3fe77afbb163115a952e77ae972bd7cdbfdf38d
GIT binary patch
literal 9749
zcmb`MTWlQHdB?|>G$|cBjomouCCw3Yp=4>7lxo=yW!bVRI#Mjksze%2FCY$ghr1)q
z&aCDll4XSeZGi%PP9E}*MnH`uMq${ofjlIEk#x}{E%I2PEsS2!J`_j`H10!zwm{q8
z|D4&~S&A#mbp{yzcjjE?JKz2L_;>f;{l$Q5mHU^uzjJ30Tm^sgJ^bM^?+t<j-~rHp
zOW-HLHux*xAA%nNUjnuMPr+XT{~m0B{|z1i54|r4o(7)>p8>yA;Xi<%;d$<7gWwdH
zg3p7mf{%jloe6>y;FI99;4Zib{s7eYo%aO6IdBpDIQR$P{otQ~qUVk3{hJm3FR1-K
z{{A314z7bb&lf@M`)%+s@ISyO!TEbRGnj%+@OAJ$@E<|VdkZ`WKEzA$=@R%5Sb}<g
z16%<A9BhLB1)c>DeIN)<f;q^m;2YpCg5Ry4-vo7@AA>r_eLv^%FsS!uK%FxNC5O+0
zbKoC=4}#wZ4fwa<1K|IFcZ2tTFbH5>@L_NsoCUSdMNsQP@WbHmfD7OkK*{INK+$n8
zlQsSjsOP6a$$K4q1l$EBm)EN2AA>sA0f^AN$3X+W0P6cYp!DJ;@G$tV;8E}+KOY32
z13wG?0{CKuZ-B>m{%i1ucLc#bAM$kkCB%P%_iup)d=MgqkAj~9UjQ}!c~Ja%5!Ckv
zpy>WL@U!5jQ0DXCRq!16T~OoqLWJ-%sCm1f<oA8>)8O44at(X}d=&fw_^aTLz*SI(
zKLV_Q;@j_n(vz=%(u=>S@IS#*JRf9|>?8uEN3Vh>z`p^P!4G{DT?2muJO#c2J`Vl_
zMASipLu%d=puYS2p!ED3pw9hQU<17CW1gQ!LFscF)VeQ&I@dpes9^9>69oJW8law6
zK<)QiAS4IB2eM`G6;R)Mqk8_A3TF=Za~uL;NpKMq9X${h2VVm30$&4Xz;A-$%lAN?
z=O>`}amTD*e+GP#=N2e={V@n@f`11^&j&CPeg=m@J)Z}4p39)*_#!Ady$NdF11N{)
zFMvANB~a(s0VVIRf{%l5fzqcYlYSjs1GWFFpw9IpP<;Jo@DA`U?rGPrF~D}g`?;67
zF%{=SPJx))=sHvV(*C+ck8I>3_c?CSiTXM_1>8BMGf(M(3m5Ek2bbzD(U00Xz8wPP
z2k+z7btkvz7jJb*7Lx1Fa6iE<UcHCga7(`*=9V4n5`V<o;U)Rv9vz>hGrC~6vv=9B
z^i487$t_vS-$(|!<jd-pbVT}xxd*7YyKn)c>mhzEaj$US!~G!lv)qUwxWN4!_i66;
zamyYhGue->MQ-VsF8SsM+%NAhgW26E>6gXzSrg?ZNeg4mH5*55vyrB8Xp`pj8Le&_
zwZdCW=-Z-e#<SSB3~&C>+S=LE&EP4MhuO6-GhvpcnMqr%GRwlY20T4cQiL7GAu|iF
zmeIsuQua1(8Y_!#m=saV7Ezj*77O%f<J@e8S?CVi&(dpATc24<%ed{{<;>4FcMPlD
zm%_X-PqkWMzcAg<w!^F$oVG=1x|WTyH0hYlH0#--Y1Z=4qzU(?7W3c-auX$a!O}&u
z>)%}WTNF|6U2jun{&??>n&l)fVM)=og-GY8bsRFi)W1&5ZqIJ7x5HM{v+;UAwyiL~
zZmMVFpPRvL?-O;RLhBvEA5)}-jc<R0tuETR?w60Y*$82;P7#g?OVOL!wrJ006e4Ny
zi^HPgh<CRaCF^mRbc*hE6xL?8RfJhSZC#S?<;&ZzWrnS!&1ZY5`zjp0d8IiRp=pq}
zTa6u>q{Eq!%%GEn=wT+QB?g<pDr^iR{c*gtO<5X;dA{E|2pX@`-a~INo5y8m*0j<j
zkMbfy=~41HEX1ZG#+x5M$^`q!TSy@nMcth~Cg}KB-|Xy#YY%G}e8kvxo7p$bS-W^n
zwAYt~JsZWf`P=;vF}0zwEqmN33)689OpmfHHkh2_3~qAX<eaD_UtzNy9WN@vUOw8k
z*y)F+@|Np*xIR0vHij>^x$0~JhcbvacB+qR2IE=!TGNcq0&7fOWC-C14yqMK*I>df
zhqj)sTP*EgkvA>F=?fW_^S61_8oE2PRCApQ5f%0Ej^>4rJZwS^<h<zF<n7jb!cE>C
z`CD|Vuy}yHFP|df_uJ!qI^n^`j(a$rc#)^sXtmf;;~6?KlI@X^OdZplEXSWkXTvOx
zk}IZR#v%~U@$s$h{u80@ZDu^TaajUyr&xw~7;d94<IVcEBkdBbduzHrOStG^8N4E1
z43CKfnRcZz(^-g2Z@qJoUI~+tDBqTilhaq-;^{JrDp}Qi=8)2Nw$oneyVc`kmt+TW
zp!0p3=UZt;#2$XfDRk`-2c&q9M$P)LJv%)8c*%H<#HKuD-wnFBX?=Cy!K-D6pXd`T
zdLeGA8LZe?;T>aCf<oHBtFY*%Z6wANevtgQ6f2I?EhQZ*B|alcT5;J%`olBM8k?|Y
zcv9R9QrnE;&}<PE@^YgW;dfbHy>@}6<?Lxgkq=^sXVnDn#0Uy`7^8q%l!W{#NKWw9
z&7e}ut%zK0S6+Ty`&~b|>-b7+-J`J=w0rJYOg<IqGZ+1F9eG7JON%1b>r2i@d51$-
zN=<CD4!m3?KD!`Hh;!(^NH)+DJ9_pC*$0s%f`?EI$yzWvww%3npK`2pjA@#sZrHlw
zBER!R3Q*2rqX<d|B$vJWIF1rV!(PAG(cmaI;Kw+{tiA8q9Vb7yyb;^v%EY4DU{c2M
z<d_b|s_IZs<EWaI{|VO}4^Ry~{6CiU@Smt}ozC0(+)ijw+NsN`As5zaXRC9|tCWmw
z$^@rEV-4!bfx43q*(=jSU8yow-+eB;me>u91YM8Qj_lv*^e|G?!$&h%BjN4$(@gmT
z78_ZwE;3Xes`#!wMy9;hk5j8;!$&95V077dUFNGhX=zF~g&k$5AqGVP<&+d}r0L3e
ztc#vyUmx~+1e6WDZ(+d+-XJGZ<vIu!<VK=|Y?K(U)oqN}nf~YaTsw8UcP(SYtf5tM
zex9W9u$t|(I)%d*vQ#0cakkxf-uu5rbNaGPI;pw1d}-Be%8}t(ugqKw#hJ!R-ig|c
zr^`;>SWOqr%!TJx8>9lR-e{agSr^T*g`>wC3!iQrJ8F(DEFM38c;VQ>0uvh-!)uXz
z#Le>-9$P&A$l(R9nRDdcjn&L1d2EX`TQo1&YZ1J7E^DV(%N_IhHjZAuP7#kO)NHer
z_MTu_(kWqQV>PtBMYDuIz#7fLZc+3X=jXS!wwi@DjW)w=t(b4SQ#MF5i^k}bjidX&
zpJy+({d~*LADUS?yRtmy*U{#}%o6rSA=y|ZQCKuZxLwRs{zS<MS2^IYPOhy!(|Bw=
zPqb`?Sz}pQ5}s+%Jhl-Pqhl<ZmYul}Q^>`QXOLRHXp+8r%ugOWL20FtlLr%X;G{Wv
z=)_DgF4>dR3|`7{E52GE+^84hqd{xZek&ThZmtb(klfjQC%GV4&Cmqz{S~i<pHQ7X
zns8~ZYYnE=E(fm^BEXmJWEx@YD*33L;$4=#C#9f_wlynBdmB_}un#eNa;8oi4*Tr0
z<qG%q92v8!_?C4if;z0FpC%CoL+*H<IOix!J5&R{lIKhD+(ZG784-)H683>FP!JpG
zvnd8IiAvcHMH+$Gr|H=FS`o!j@!OGxA;N`sN=Y{nfsO0>YAaW1{1mo3N8*b7+xVw<
zPaE9n6ZqvYvPL&DJt+^oxK(NInR<(5!%BYevPybHJ1pgI`L#Xud$rhZU@CHQrY~Pu
zbr<LXIeud&y*|{7WRxJvB#hqR<s|C)Q`C!in+<MMMSOiV3Zt|5<rC*072>s(2osHU
z1Z_seHkwrbI<5tG-W%N5h5*OIoA)pW#SlbSE9NVDurNHj-%t_2QPaU$nAAjgAWGfI
zN`Bh9FkzqinpzcqHYsGJmHAawytk}jF^@S(YB7-o4@ogU_*O5>Qhs$xJUE5?@W+OY
zwo_N34L6lNSW5CN9DL2Ho~N$&W&Oz4j4AMwm2giT9PWgKo$Zz5sh8%$oVcdU&>Jfc
zgV(&dXQ7JvYQR_id#5{toVJ8qwYEEzVvB>@EK(qy{06F7MEx=+rFVVPQ753bfrXb8
zcj)Qd;APiCxczNz<?P1(2pOz8D#ovxW`Y8^e5B5siT1!P)^a|tm+d)8_QJE%cRAyl
zq2_7VDxeT_!KG==QQ)>*!@#?2ERMK~Rx9{z;<($I;2kRohgUw|M`#AOzh|F@gZ5M`
z#uK0$Hi9ivHozC*?__J^XhHjGf>L_Gu7!Z#ug*fBSHupV2{3ggtD`VgPwJh8Goy~e
za3`wv6_*RQ=VT5eDH59ZoxEiGzWabmv0%!qb925Gpw_nUFJSiMeS;eva>&s!EV?_r
z&v4<{$%*w&L%jb7e3QWU#z%{r2A(Sxs}hG(uGhMU-%}Rib$#!EW5`*Lgxngr=Fw+l
z3AF~t=sm5U+AiM7j`kTUi(feuiqh>8qn}rTm(kctcEq${4#1b5cOH8@-=)!m*GC`4
z6UJ4qVbptIm6GkrS;{_~9QPSxhf&vI-(flqgB$b{$fKN_q>_p0b&aZU+uPVDg9%m!
zUoWs3gkS4LxVmBRb<XAzy7nCBjZ^(Apw^9u_VyxNiWMd#<Om1V^s#Yo_BCuoSgdnz
z9L3gHSEZ${jC7Wy+>`;OaYUF6{-+X*m0IW8uR$@X?9@Snmz6^#VaKf>=XtV!xgxs$
z5iJxYRee$B<J~Zj!y=y;D)hC(%_xZ=!;4;-i4uN{k-i)ac>RCOhh<co>|}38L+W1%
zsfY^xX{8{A9$r>@Gx$~#wKyRzrtKV!W2rn2N6H7UCz@RG)-0txRkC48GCSGg5K&4*
zOWG@u%Vn!vrIHXw9^9bisbkbrAtit5MjXMWR1524mF0<BNRRS@q6kv=nWD^ve#hk4
zIH_@Gl$Mdqp!Bpj<bKrY7`8obV`WT<u88{%m%%BU?7Wk8Ls~`=e1Z?KPzvgqV0}Yv
zScS+>d2UV2s)8xokSz9NrC~^mrbmWDaIJ+*Vp)!j>wo-oa(sBzPwCL98A2zd3@_WP
z!G9xVKzm{yuFIuzgI7>HwJWD}LO1~p6S@Mjsbx$bMO1=73!|X1F-+*>btkotg}y``
z&AsV`JS^NPo%QpBLX7Og`C^PGcij(t*1Km&)|-+<Gt4(ws-g2Z43cd0j4nvZ`B6AJ
T6)M?KVC%{Uyfg7y<=+1REE~*0

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.po b/rest_framework/locale/ca/LC_MESSAGES/django.po
new file mode 100644
index 000000000..4d7cf9c20
--- /dev/null
+++ b/rest_framework/locale/ca/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr "Header Basic invàlid. No hi ha disponibles les credencials."
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr "Header Basic invàlid. Les credencials no poden contenir espais."
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64."
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr "Usuari/Contrasenya incorrectes."
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr "Usuari inactiu o esborrat."
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr "Token header invàlid. No s'han indicat les credencials."
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr "Token header invàlid. El token no ha de contenir espais."
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr "Token header invàlid. El token no pot contenir caràcters invàlids."
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr "Token invàlid."
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Compte d'usuari desactivat."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "No es possible loguejar-se amb les credencials introduïdes."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "S'ha d'incloure \"username\" i \"password\"."
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr "S'ha produït un error en el servidor."
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr "Request amb format incorrecte."
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr "Credencials d'autenticació incorrectes."
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr "Credencials d'autenticació no disponibles."
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr "No té permisos per realitzar aquesta acció."
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr "No trobat."
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr "Mètode \"{method}\" no permès."
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr "No s'ha pogut satisfer l'Accept header de la petició."
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr "Media type \"{media_type}\" no suportat."
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr "La petició ha estat limitada pel número màxim de peticions definit."
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr "Aquest camp és obligatori."
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr "Aquest camp no pot ser nul."
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr "\"{input}\" no és un booleà."
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr "Aquest camp no pot estar en blanc."
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr "Aquest camp no pot tenir més de {max_length} caràcters."
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr "Aquest camp ha de tenir un mínim de {min_length} caràcters."
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr "Introdueixi una adreça de correu vàlida."
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr "Aquest valor no compleix el patró requerit."
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr "Introdueix un \"slug\" vàlid consistent en lletres, números, guions o guions baixos."
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr "Introdueixi una URL vàlida."
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr "\"{value}\" no és un UUID vàlid."
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introdueixi una adreça IPv4 o IPv6 vàlida."
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr "Es requereix un nombre enter vàlid."
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr "Aquest valor ha de ser menor o igual a {max_value}."
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr "Aquest valor ha de ser més gran o igual a {min_value}."
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr "Valor del text massa gran."
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr "Es requereix un nombre vàlid."
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr "No pot haver-hi més de {max_digits} dígits en total."
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr "No pot haver-hi més de {max_decimal_places} decimals."
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr "No pot haver-hi més de {max_whole_digits} dígits abans del punt decimal."
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr "El Datetime té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr "S'espera un Datetime però s'ha rebut un Date."
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr "El Date té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr "S'espera un Date però s'ha rebut un Datetime."
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr "El Time té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr "La durada té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr "\"{input}\" no és una opció vàlida."
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr "S'espera una llista d'ítems però s'ha rebut el tipus \"{input_type}\"."
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr "Aquesta selecció no pot estar buida."
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr "\"{input}\" no és un path vàlid."
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr "No s'ha enviat cap fitxer."
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr "Les dades enviades no són un fitxer. Comproveu l'encoding type del formulari."
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr "No s'ha pogut determinar el nom del fitxer."
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr "El fitxer enviat està buit."
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr "El nom del fitxer ha de tenir com a màxim {max_length} caràcters (en té {length})."
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "Envieu una imatge vàlida. El fitxer enviat no és una imatge o és una imatge corrompuda."
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr "Aquesta llista no pot estar buida."
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr "S'espera un diccionari però s'ha rebut el tipus \"{input_type}\"."
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr "Pàgina invàlida \"{page_number}\": {message}."
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr "Cursor invàlid."
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr "PK invàlida \"{pk_value}\" - l'objecte no existeix."
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr "Tipus incorrecte. S'espera el valor d'una PK, s'ha rebut {data_type}."
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr "Hyperlink invàlid - Cap match d'URL."
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr "Hyperlink invàlid - Match d'URL incorrecta."
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr "Hyperlink invàlid - L'objecte no existeix."
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr "Tipus incorrecte. S'espera una URL, s'ha rebut {data_type}."
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr "L'objecte amb {slug_name}={value} no existeix."
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr "Valor invàlid."
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr "Dades invàlides. S'espera un diccionari però s'ha rebut {datatype}."
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr "Cap"
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr "Cap opció seleccionada."
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr "Aquest camp ha de ser únic."
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr "Aquests camps {field_names} han de constituir un conjunt únic."
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr "Aquest camp ha de ser únic per a la data \"{date_field}\"."
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr "Aquest camp ha de ser únic per al mes \"{date_field}\"."
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"."
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr "Versió invàlida al header \"Accept\"."
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr "Versió invàlida a la URL."
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr "Versió invàlida al hostname."
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr "Versió invàlida al paràmetre de consulta."
+
+#: views.py:88
+msgid "Permission denied."
+msgstr "Permís denegat."
diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2aa79c8fb909f5c7dbd84a7d88f041ea148eb4d9
GIT binary patch
literal 528
zcmZutO-lnY5LNWFN6#Kc@X(^u%@!&(wIa3^1dF9z#hZ+~=^EW8Yc~Dxhxpe#`dgf>
zP!Brr$Rv3)Z{B?E?S5==Y%}&5hm0M@F{6q$<C8y6`K&mb7&-f*5|7s@-YZvXYb5kv
z$Yd7AgGmfiM>Dmw?ll;z!a9$`GSewu&a)C@D<K%&#@KU;JeOjhypqrqQ47T>HY13H
zY_*O=QwS#FSS@rV@s}ssvUPGKID#80J;shqnUl9p!UHX|a&YTX`!;`vvz7hHE^=+`
zLQ^BLvvV#p*_<+kv7(uT9(l^iKy6ZxHg%{ydtb;fTrQUlUp3cLwW=z^bnO<MV%d#b
zjQ)QQx#wCYOz3ei3G2b|dN}x9UDOak&l;}`dw4H+8D6b?SmZoJ2a;!UrSjdo_zK&<
zylR}OayT%FO|{7+w4b!!IFhi|3P$<dQI1#E%}NQTSYOL-vjabAw`Sm=3sJojY<&Y9
C7@vm#

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po
new file mode 100644
index 000000000..711ba24f9
--- /dev/null
+++ b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr ""
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr ""
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr ""
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr ""
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:88
+msgid "Permission denied."
+msgstr ""
diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo
index ad9e6967663bf50085cff918de9dab995efad968..cc186d881f1e10c3a529ac73b7d8ca5af39b64af 100644
GIT binary patch
delta 96
zcmdnuzQuh*qA;(eu92aFp@EgDskVX9<UC<%N3e*2g_Wt9wgC`u`6L#X=!O&}<`w58
rmgE;%DMTceWu_J>_!p(*7nW8k*i__0SPnUvdHH3TiJMOezv2e~NfIAt

delta 96
zcmdnuzQuh*qA;(8u7R0?p|O>bp|*kH<UC<%M~H|KSj51<fXgSbxI{OkC^4@%C$S{I
m$Vwq3BR@B>Siw1?D6_aEGgZN+BtO>yh?AiLn@<V9;s*df$sZg5

diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po
index e959c00ea..320c034a2 100644
--- a/rest_framework/locale/cs/LC_MESSAGES/django.po
+++ b/rest_framework/locale/cs/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Czech (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Chybná hlavička. Přihlašovací údaje by neměly obsahovat mezery."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Chybná hlavička. Přihlašovací údaje nebyly správně zakódovány pomocí base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Chybné uživatelské jméno nebo heslo."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Uživatelský účet je neaktivní nebo byl smazán."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Chybná hlavička tokenu. Přihlašovací údaje by neměly obsahovat mezery."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Chybný token."
 
@@ -88,11 +88,12 @@ msgstr "Nebyly zadány přihlašovací údaje."
 msgid "You do not have permission to perform this action."
 msgstr "K této akci nemáte oprávnění."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Nenalezeno."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metoda \"{method}\" není povolena."
 
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Nelze vyhovět požadavku v hlavičce Accept."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Nepodporovaný media type \"{media_type}\" v požadavku."
 
@@ -108,209 +110,238 @@ msgstr "Nepodporovaný media type \"{media_type}\" v požadavku."
 msgid "Request was throttled."
 msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Toto pole je vyžadováno."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Toto pole nesmí být prázdné (null)."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" nelze použít jako typ boolean."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Toto pole nesmí být prázdné."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Vložte platnou e-mailovou adresu."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Vložte platnou \"zkrácenou formu\" obsahující pouze malá písmena, čísla, spojovník nebo podtržítko."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Vložte platný odkaz."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" není platné UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Je vyžadováno celé číslo."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Zkontrolujte, že hodnota je větší nebo rovna {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Řetězec je příliš dlouhý."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Je vyžadováno číslo."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Zkontrolujte, že číslo neobsahuje více než {max_digits} čislic."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Zkontrolujte, že číslo nemá více než {max_decimal_places} desetinných míst."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Zkontrolujte, že číslo neobsahuje více než {max_whole_digits} čislic před desetinnou čárkou."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Chybný formát data a času. Použijte jeden z těchto formátů: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Bylo zadáno pouze datum bez času."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Chybný formát data. Použijte jeden z těchto formátů: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Bylo zadáno datum a čas, místo samotného data."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Chybný formát času. Použijte jeden z těchto formátů: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" není platnou možností."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Byl očekáván seznam položek ale nalezen \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Nebyl zaslán žádný soubor."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Zaslaná data neobsahují soubor. Zkontrolujte typ kódování ve formuláři."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Nebylo možné zjistit jméno souboru."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Zaslaný soubor je prázdný."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Zajistěte, aby jméno souboru obsahovalo maximálně {max_length} znaků (teď má {length} znaků)."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Chybné čislo stránky \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Chybný kurzor."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Chybný typ. Byl přijat typ {data_type} místo hodnoty primárního klíče."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Chybný odkaz - nebyla nalezena žádní shoda."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Chybný odkaz - byla nalezena neplatná shoda."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Chybný odkaz - objekt neexistuje."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Chybný typ. Byl přijat typ {data_type} místo očekávaného odkazu."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt s {slug_name}={value} neexistuje."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Chybná hodnota."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Chybná data. Byl přijat typ {datatype} místo očekávaného slovníku."
 
@@ -331,18 +362,22 @@ msgid "This field must be unique."
 msgstr "Tato položka musí být unikátní."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Položka {field_names} musí tvořit unikátní množinu."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Tato položka musí být pro datum \"{date_field}\" unikátní."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Tato položka musí být pro měsíc \"{date_field}\" unikátní."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní."
 
@@ -362,6 +397,6 @@ msgstr "Chybné číslo verze v hostname."
 msgid "Invalid version in query parameter."
 msgstr "Chybné čislo verze v URL parametru."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo
index 45cae55513a99e4df137939adb1448244259f797..a8eb68ece8ba1b373bc1a5056d552c1e11aedfa1 100644
GIT binary patch
delta 118
zcmX@<deU{nRpCraT_ZyULjx;QQ*8qy0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(XhF
zIs*$UQ!{M?AmH*zEH2RvDN4*M&PgoEFS1gING!`tEmH6=O35!QtyHk7$cL~Tax(Ms
N%Q6!;+lh4Z0RT=9C9wbi

delta 118
zcmX@<deU{nRpCqvT>~=(Lt`r=Lu~^?0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(Xgy
zIwP<;1E4ye#Nra&kfOxA;+({i{30ubkc|A?#9{^KjH1lqlFU>Eo09xo2Ov&{3T(C$
H>E;6fM1&<~

diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po
index ab9e37d2e..6b37ac313 100644
--- a/rest_framework/locale/da/LC_MESSAGES/django.po
+++ b/rest_framework/locale/da/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Danish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ugyldig basic header. Ingen legitimation angivet."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Ugyldigt brugernavn/kodeord."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Inaktiv eller slettet bruger."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Ugyldig token header."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Ugyldigt token."
 
@@ -87,11 +87,12 @@ msgstr "Legitimation til autentificering blev ikke angivet."
 msgid "You do not have permission to perform this action."
 msgstr "Du har ikke lov til at udføre denne handling."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Ikke fundet."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metoden \"{method}\" er ikke tilladt."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kunne ikke efterkomme forespørgslens Accept header."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
 
@@ -107,209 +109,238 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
 msgid "Request was throttled."
 msgstr "Forespørgslen blev neddroslet."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Dette felt er påkrævet."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Dette felt må ikke være null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" er ikke en tilladt boolsk værdi."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Dette felt må ikke være tomt."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Tjek at dette felt ikke indeholder flere end {max_length} tegn."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Tjek at dette felt indeholder mindst {min_length} tegn."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Angiv en gyldig e-mailadresse."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Denne værdi passer ikke med det påkrævede mønster."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Indtast en gyldig \"slug\", bestående af bogstaver, tal, bund- og bindestreger."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Indtast en gyldig URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" er ikke et gyldigt UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Et gyldigt heltal er påkrævet."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Tjek at værdien er mindre end eller lig med {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Tjek at værdien er større end eller lig med {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Strengværdien er for stor."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Et gyldigt tal er påkrævet."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Tjek at der ikke er flere end {max_digits} cifre i alt."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Tjek at der ikke er flere end {max_decimal_places} cifre efter kommaet."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Tjek at der ikke er flere end {max_whole_digits} cifre før kommaet."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datotid har et forkert format. Brug i stedet et af disse formater: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Forventede en datotid, men fik en dato."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Dato har et forkert format. Brug i stedet et af disse formater: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Forventede en dato men fik en datotid."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Klokkeslæt har forkert format. Brug i stedet et af disse formater: {format}. "
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" er ikke et gyldigt valg."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Ingen medsendt fil."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Det medsendte data var ikke en fil. Tjek typen af indkodning på formularen."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Filnavnet kunne ikke afgøres."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Den medsendte fil er tom."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Sørg for at filnavnet er højst {max_length} langt (det er {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Medsend et gyldigt billede. Den medsendte fil var enten ikke et billede eller billedfilen var ødelagt."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ugyldig side \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Ugyldig cursor"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Ugyldig type. Forventet værdi er primærnøgle, fik {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Ugyldigt hyperlink - intet URL match."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Ugyldigt hyperlink - forkert URL match."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ugyldigt hyperlink - objektet findes ikke."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Forkert type. Forventede en URL-streng, fik {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Object med {slug_name}={value} findes ikke."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Ugyldig værdi."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Dette felt skal være unikt."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Felterne {field_names} skal udgøre et unikt sæt."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Dette felt skal være unikt for \"{date_field}\"-måneden."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Dette felt skal være unikt for \"{date_field}\"-året."
 
@@ -361,6 +396,6 @@ msgstr "Ugyldig version i hostname."
 msgid "Invalid version in query parameter."
 msgstr "Ugyldig version i forespørgselsparameteren."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Adgang nægtet."
diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo
index b16b04d0ba319781c06a5f6c3ff0d5b6d6e96385..0def3e0c53acd717cb45b9f6525f7557d5e3f8e1 100644
GIT binary patch
delta 78
zcmX@%b;4_djtH-%u92aFp@EgDskVX9WJ?igF0hD!g_Wt<<Tw#=g^0wm%+w+U|Du%q
a!qQ3wn~Ho0%ONK-FTX4^ar0D>%>n>s(HM>Z

delta 78
zcmX@%b;4_djtH-Xu7R0?p|O>bp|*kHWJ?igE{KQ`P-JqPh`2&XMt*K$v4V3(QD$*T
WW~zcsNq(*a5GO+gHcu7VEC2vrgcw5r

diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po
index ef6e16232..4b5863f41 100644
--- a/rest_framework/locale/de/LC_MESSAGES/django.po
+++ b/rest_framework/locale/de/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: German (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Ungültiger Benutzername/Passwort"
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Benutzer inaktiv oder gelöscht."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Ungültiger token header. Keine Zugangsdaten angegeben."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Ungültiges Token"
 
@@ -90,11 +90,12 @@ msgstr "Anmeldedaten fehlen."
 msgid "You do not have permission to perform this action."
 msgstr "Sie sind nicht berechtigt, diese Aktion durchzuführen."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Nicht gefunden."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Methode \"{method}\" nicht erlaubt."
 
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
 
@@ -110,209 +112,238 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
 msgid "Request was throttled."
 msgstr "Die Anfrage wurde gedrosselt."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Dieses Feld ist erforderlich."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Dieses Feld darf nicht Null sein."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" ist kein gültiger Wahrheitswert."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Stelle sicher, dass dieses Feld nicht mehr als {max_length} Zeichen lang ist."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Gib eine gültige E-Mail Adresse an."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Gib ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Gib eine gültige URL ein."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" ist keine gültige UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Eine gültige Ganzzahl ist erforderlich."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Stelle sicher, dass dieser Wert kleiner oder gleich {max_value} ist."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Stelle sicher, dass dieser Wert größer oder gleich {min_value} ist."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Zeichenkette zu lang."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Eine gültige Zahl ist erforderlich."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Stelle sicher, dass es insgesamt nicht mehr als {max_digits} Ziffern lang ist."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Stelle sicher, dass es nicht mehr als {max_decimal_places} Nachkommastellen lang ist."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Stelle sicher, dass es nicht mehr als {max_whole_digits} Stellen vor dem Komma lang ist."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datums- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Laufzeit hat das falsche Format. Benutze stattdessen eines dieser  Formate {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" ist keine gültige Option."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Erwarte eine Liste von Elementen, erhielt aber den Typ \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Es wurde keine Datei übermittelt."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Die übermittelten Daten stellen keine Datei dar. Prüfe den Kodierungstyp im Formular."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Der Dateiname konnte nicht ermittelt werden."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Die übermittelte Datei ist leer."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Stelle sicher, dass dieser Dateiname höchstens {max_length} Zeichen lang ist (er hat {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Lade ein gültiges Bild hoch. Die hochgeladene Datei ist entweder kein Bild oder ein beschädigtes Bild."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ungültige Seite \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Ungültiger Zeiger"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Ungültiger Hyperlink - entspricht keiner URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Ungültiger Hyperlink - URL stimmt nicht überein."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ungültiger Hyperlink - Objekt existiert nicht."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt mit {slug_name}={value} existiert nicht."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Ungültiger Wert."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten."
 
@@ -333,18 +364,22 @@ msgid "This field must be unique."
 msgstr "Dieses Feld muss eindeutig sein."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Datums eindeutig sein."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Monats eindeutig sein."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein."
 
@@ -364,6 +399,6 @@ msgstr "Ungültige Version im Hostname."
 msgid "Invalid version in query parameter."
 msgstr "Ungültige Version im Anfrageparameter."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo
index 0d32113656c4a0f0d1f92b9479f19666778e1d5b..a76764b2217853da1d4900e087c05c4ea25d8c47 100644
GIT binary patch
delta 1871
zcmaLYUuc_E7{~D^Tbs0rvwvnxUETK9>HO2BzNw~v($&^>bFOX7x^ANr6vB)y&?PKM
ztK#N+u?<miQ-TadMZ`Ho5TO@R#BQP&6Jb*s>MkaN>_R3uy%7Y_?=N}r(nFto&U@Z}
z&pGEwy1f19g!f~6!>dNyP25a;vBK;i&NcEub3<lbm_P?-@HVXAI(!{Fa0zw)x7dll
zVH_h(W}9#j$MA7{0N=0c*)=-b80c>{8$}QI;92a)SlDa`GdPJaVhX=Uoo|nrP2mJ?
zz?0aHpP&*t?~h;gZMm-gyn8Tdo>`HOW^@Ym;ID81gR9I&a0JKE!yfz`ug5=7*9ADZ
z15>D#+J|@HF@O9cbUD6+Js55=+m3@c%=_&K9nRTjxCX!WkFTO;^cQL->ssp$p~h!X
zGd+abiW8{&Kg8SdOS}<(M+ckQ%vR%_*nq?6v5GcE=Wa}+9(Wja<I5Ps)9B(E)K*<X
zB{aarI=>rrd;qogFJK?OhuWgc{&AGIE5Rw$bx*8j{T(_-7*GQ5qKf1qc4O=Y3J=F|
zFV5plc)|A<?B#f6)a+b<m!h`dAF_9_i|n+uW2hC{k1E#ZPzk>sWBrxMrwqjL5^ll}
zS1FNuQPujS?=ory8p&c5)3^tZV?SO&73*52If;8Qg{M&Gf5Iv3;HBEaoJWV%vFA}4
zz2To&^1X~hj0ZTG#9`Eo%BTmwh68vJRjjMl){8ZbDz;ZpwRIMC-33&!HnAL9DK9}s
z)jESZ@hobuPop021FBj>>v=g&qaJtynT);VA1|S1bPmbIe)Vm3>f;+x6P-XFX^$ZH
zdv=J9s`VtYZFUCvv+wwz4D3%-wMIx+#oCIhl}^+HCsFr3itL`vqbBeYYO9t}2?cMd
zpWlEw9>Pw2|7Yp+F;GG6(FgwV&!`!$VOs2hCDFlYR01U&!*@`{dIeRiZMW8obsQ-N
zd(-!0RIz@80bEH~HP;yPcG6+c_~EHlo2Et9c0a*a?Z2jdP*YYr2vwNgI76ffRj!uc
zK|(D>Xit@;T8P+8@XK0j8~G%|6_%;~-Pjo&t&i4LSz8n&Mym1P`oM5C9gKCUep>u%
zm}~7vQ4<;@w9@xgj|I1F-9qmnB0^|iRPL(SX+q1pm1rXL4@b+oi%?UQx7K<T$zogR
zcymXwlyfTkvjyjweZ~1g<*<{l<PMa3dKNQIv7s7?KAazn_a>Z#n@T3T-CoxX@5sb=
z<`(khe6bMUlC9)YPOqCt#@*U=?m#Np*X`26Q`vGQzN?fil;^UQVkza!W*73gl9MSt
eRy;WWw6poCV!byymoF3-^4Z1n(WBx2Pv~DQn9^qe

delta 1767
zcmXxkUr1DG7{~D^(J^%`n{vlpE6-?u{W}_^J30BU(#+Z|#ofRPu_D15bPTpFI5)vU
zfkcxRU07XoBT-b+O@&mT{kyG*%8D+dh=L8a*y{W9oPFt;&wJi;=FIcF?~_Mb$2Yhy
zf~mvC=pg13H&V>{u`7)ahLdg<#xOeAgo|+(F2tjlhoh+P-^P4=iDmc&OL6&3vqtR1
z^?1tDwO34<Sy-B3R*!M)#7kI>>6vD$u?{!lA&lZ3)cuq!vo?%k5&n%qJda9f++Tm@
z`wjKJq94pwnrpU`i7FaKz4$uT;3urZifpRJIF{oW&cfHI=RV*vEM`$V)sDq@0JVM=
zBX|$X@iT6~<+IIV{Jtfaux6L>XT0fOKSNdY235(d9M2NedJC%3KGadTxD-$0k2r}A
zPT^eqim4c!W5(uL2;B-Mg-rCKt*9^V#t<IH2%bb8(F7`yY#!GAV$^jb>dbfIDm;Wb
znk)YG8&qLove0w2=-?l7*?%Q)kOeizD3;(`ti-%|X4|k8f5LOV<5<P@6TCaaEGyUB
z`iEriu>J{kq#?4@&cskn+J#E^04k9aA@;wF$wd}Q@i{7y44zh(w)rMeJMa|iv5;&!
zu?MU18mg&2;zlf|T=mjlsQXv34d0=TF3PX7DYnC9qKx`cH->z#;A*ZP<4O$jkSc0H
zy?8&?;3%p|Ut<#%F7TRc52~kzQO})2HRBY9F~GK{N!?{kbfX=0)`wADdI8m?&oPEe
z3cMHYLW;12e?5dsd<4nCZu!3O*T0}DEpWV}s6sXA7UYy%JII88cAO86-7cfLbOP0-
z_fb9a2=$^g(&vkohn$vGpb~FJ9nqhtL~i=`r~K=Gkj=DUq1UA4SZzIYyT34ks_Y@^
z!T0E37Ud~{Qf$O7RFj@THR%J~hW{bQZ@(|{>_;`}v1D&rk-LQ%3&tN6TSurAGO~JN
z4)OnJ@h8eeqm|IFY$en|>Qa@hQZ;@dbbbxGV5Adj9R7Mvk0pGPRf=s+W(V?f>-=Ty
zEGKILVofp@D40>3+#U#p)vU7#4eFULSVgFZ^dBOY91b+EYht#E$RczWYI$|%Z^W;}
zT4E;AL1-)62@Q2_&h(7t8VjcnWsKd=nM}>DDT}OfDpy3SDoY}j$&uXr25+TmdL<Hx
zWVUrD2Fp4Iy7wpgx(DL}QKw^Xd|!9MY1%u`n;7if?bHs&_tg_U{=(S5xkoa2dtd5z
DIPJVV

diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po
index 6c398f04b..40280f9ad 100644
--- a/rest_framework/locale/en/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Invalid basic header. No credentials provided."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Invalid basic header. Credentials string should not contain spaces."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Invalid basic header. Credentials not correctly base64 encoded."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Invalid username/password."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "User inactive or deleted."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Invalid token header. No credentials provided."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Invalid token header. Token string should not contain spaces."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr "Invalid token header. Token string should not contain invalid characters."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Invalid token."
 
@@ -86,11 +86,12 @@ msgstr "Authentication credentials were not provided."
 msgid "You do not have permission to perform this action."
 msgstr "You do not have permission to perform this action."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Not found."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Method \"{method}\" not allowed."
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Could not satisfy the request Accept header."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Unsupported media type \"{media_type}\" in request."
 
@@ -106,209 +108,238 @@ msgstr "Unsupported media type \"{media_type}\" in request."
 msgid "Request was throttled."
 msgstr "Request was throttled."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "This field is required."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "This field may not be null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" is not a valid boolean."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "This field may not be blank."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Ensure this field has no more than {max_length} characters."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Ensure this field has at least {min_length} characters."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Enter a valid email address."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "This value does not match the required pattern."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Enter a valid URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" is not a valid UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Enter a valid IPv4 or IPv6 address."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "A valid integer is required."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Ensure this value is less than or equal to {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Ensure this value is greater than or equal to {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "String value too large."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "A valid number is required."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Ensure that there are no more than {max_digits} digits in total."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Ensure that there are no more than {max_decimal_places} decimal places."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Ensure that there are no more than {max_whole_digits} digits before the decimal point."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datetime has wrong format. Use one of these formats instead: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Expected a datetime but got a date."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Date has wrong format. Use one of these formats instead: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Expected a date but got a datetime."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Time has wrong format. Use one of these formats instead: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Duration has wrong format. Use one of these formats instead: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" is not a valid choice."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr "More than {count} items..."
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Expected a list of items but got type \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr "This selection may not be empty."
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr "\"{input}\" is not a valid path choice."
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "No file was submitted."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "The submitted data was not a file. Check the encoding type on the form."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "No filename could be determined."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "The submitted file is empty."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Ensure this filename has at most {max_length} characters (it has {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr "This list may not be empty."
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Expected a dictionary of items but got type \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Invalid page \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Invalid cursor"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Invalid pk \"{pk_value}\" - object does not exist."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Incorrect type. Expected pk value, received {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Invalid hyperlink - No URL match."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Invalid hyperlink - Incorrect URL match."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Invalid hyperlink - Object does not exist."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Incorrect type. Expected URL string, received {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Object with {slug_name}={value} does not exist."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Invalid value."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Invalid data. Expected a dictionary, but got {datatype}."
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr "This field must be unique."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "The fields {field_names} must make a unique set."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "This field must be unique for the \"{date_field}\" date."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "This field must be unique for the \"{date_field}\" month."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "This field must be unique for the \"{date_field}\" year."
 
@@ -360,6 +395,6 @@ msgstr "Invalid version in hostname."
 msgid "Invalid version in query parameter."
 msgstr "Invalid version in query parameter."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Permission denied."
diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo
index 63cbeacd774042717c86f77916d2234dacfa52a1..61db1951b6317a491b6b1d1f64be82cb221be65e 100644
GIT binary patch
delta 93
zcmbQpGLdD%WL`^MBSQs411nQgZ3Cl;3#1*v0tOaVre@j(K)~gbSX`nTQk0lioRe6R
oUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hy{3FT;0N#Ba@c;k-

delta 93
zcmbQpGLdD%WL^th12Y9fV=E&=Z3DxJ3#1((0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
jg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-%_BgzN>)q)+S

diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po
index cff2f6aa7..49436f2a3 100644
--- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en_CA/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: English (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: en_CA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo
index 078860de7bebcc59e86b8fce35192fa01cbf6603..2060cb51feeef21b427092c3286739465ff7cf4f 100644
GIT binary patch
delta 23
ecmeyx^owaiFR!Jpk)eX2ft9JLwt>;aSq}hRX9uYO

delta 23
ecmeyx^owaiFRz8JftiA#v6Ydbwt?ZqSq}hRVh5%G

diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo
index 089525c32fe87be4adada56878bd8418925bac49..875788154f4b7c52923d48d42fbb55bc79610bde 100644
GIT binary patch
delta 2098
zcmZwITTEO<9LMoL2y87vE9KHkEdxanD0D$?rIbsdS835g2{kC5!Y18>vUGRBVof$C
zCK?~~f!3r+)9|2)#F$vuH!BhwwZ7OFq9zU2^i5)#7>%ZysNdh&)x^}v{?BJ-&e^jw
z^Ph9}m;N^f65kbMT`<ZJv6Z-*X?6xjvpG;)z^ok0(P1w>f)lt6U&GC~i2DAgSc<o>
z4*$R%SiR0{FAn2=yqGd!-%~k2N7emi-59}Pd>>meu-<GpcHt9v4%_hy)cMR@vwm#H
z?f427;Jc^+Ev5T!ru_?bzwHm0HCw`LjEZJ-0d?b#unm93F5H>NtTBT1n8bX%jk@k9
zd<<*o)JhFv4bGtY7chulVm<zjhp>8s*&cr1VpQm}EBFvDr`tDCGg?E<B!6SdT2%i*
z)J!K)sYqZIUdCel938IWCj1k#u;4*67SBpBv6D&#72W6<>Wd*P!51-z=TRy83^kBE
zF4p-PRC_Nf=VRD{=TNEnAl+U=O{|<z=(-McII@ZL*8t||(B@dgTKo|kaC4#A2|SEj
z@U65<*hu?Zyq;l}TVz&Adxg<Iig!^<?HHxQ0aPlcQK`O&W%x-6>)%A>79E{f$W}g%
zgZMNqq6Uz~ulL}yX&3M*+PAR}o0y(<^&EP*j2&3PbmbTh<0aI<envi4kzoCHQRzgj
z#97n@@1U0a8`R2_J)ByZlc-JkIu77hIEdTW02+7{_u+LU-ImWZwRy|19mi2Ay^PhE
zxIv|k%3ahzs$A*|9%_bfqh|OU>V_TVsV^QuwVy|&>{Zkff0%X^^+P!osi&e99qkjS
z6uf|pJz)z}bb}@2V{04&n8y~^Q&EH(X(h7%>?rcF=Qxlxdl@zGOZW_ajSidG5M<Ae
zBOjaMzz^Cyw&E3R(ewX9y2CLn<zxgIyv0$Q=}pv3KE@%ugL|--lUmZ3a1^hiuHV8l
zsQYxIHt8s4;C;kBh2Qs!mYQ)G?;JmWJTd+tx>2+KryNXI*k67*%&~zuM)VUq2(8Ki
zLPaa1wDhP!2@typUao#g_#>uzl+ZFa6IynaOhS93OAU%%8tf~}Avy{6rezb3c%0Ca
zq)n{SLA3a_)IllcMd>g7hIBufO8C25%hX2fC$zMB0<`4X4=SwSe~R+Tel;F@Kc_m$
ztKi?F*KaRzgvcd$9r*tpWX_%>^yKsr>$LNfQ{_vKk&1G<(XXZ6)4YrPk~P1Yb7($0
zP?9z6#ZM(m1IxKBli^t0o%ZJ3R3z?BhFs|MbbPMfhE9cJE*6>$jmN{0se3L+t`ywK
z$lF!d*x(w1?aj@#!N&O;g{3`yPq3}MxurHpS>Nx);&nq&Zz?wF#Us&nH{#8PLs2&n
zors*7nR6XyBdJ>VWOynv8}^d5MMD|$BgI<-6CoF!iF?Udabtd;=QK`_LAvRg5T`=4
fqHfk3zxJM2Z~Ju4AMJSfT5{_DFH0^|u4McTQRMV8

delta 1910
zcmYk+Uu+ar6vy$i&~_=c6se{B)v0y?q1(=GX(`(RrQ4#VTiRmVD1qogYPy8dq`Sp{
z$c8}R0ThgqXhMt_usryp8+ic}2@sT+`hdZh82|9%3m6}a2?_rB{$@tw&7S$potd4v
z_uMmcs_*wy{)c%*XN)#LEFsR%FdM_VVm7p&O3Z5TXLN98*z9qv#RZr|{ck%i#{C$@
zGgyb$umgX?P1rcg_W(X)mba_yv~!}g)NB|x;~G4Nt@s`GVAX811g25v&teL{!KbjM
z%xoTZp$7Ck>iA^fyQuqphE4bYBRt<49`SEHge{ynjT`VwOk!!dSv~gR96X4+?gXyD
z>!=Lf$CX&YMLM297k6PjzKz{@4cB3L1^46m*2B&s+@=FKi5mG))J!f0-UyE0Ma{Hi
zuD=uuaXI}KoR2S|gRfvEzJo>h5t1zX7#r{k=5?cc?C6hwV>Qly)E{|0vPSkIY9Ldn
z^Vfs^_oy|0fX!IN&9pQrRR1VyVwX`5yo0KR5=ONOyDQ0mjGajiyns`<5JQjoF2*?h
zCj25~Hj1_MV~lng4x@vwp;G=HM(`#+f%kDWmNV-0*nvZM7`NfK)#P6fj#J7T@nqmM
z4$z;=XgYBxs(Pm|jlW_W_A@>CIu7G4)LPe&7G<WN&05@p%D{)H^LJ30EzXlyrKA^?
zlGCW-yMlfA5TC=;Qh(&{V;B8Dkkzs_-bEE@FDCF!bnz>E8vn#7E+-ut$PnuKQ>Y2%
zZ?mHrMjZc!yHS69HRxYJ4eSys#dibCYWxSSMt(NJhEsMNwFDQDG1@fh|M&1oT)-xb
ztw^!wEy<1^xD}}*JBX_OH;`qrPf#Pjg*&i_lMe1gR>_WFEuKX^@G7psAF&y$IjQ~@
zB<pqzm7x!CQ1Ab3cGhuV1;bVfU&ift4pn4-q5c@5qhj2MA*2MnnQIVgEribhzfsTL
ztTiyTQbLnd<MU!+p6`8)v_{1Q-w>-J)XE5@obh?Bge_z7S`pisL=T}l(7@Fwc&{Ke
z;8udw^(F^ify>Q=-ild7zL!lm!K>*lgHo=KP$!{vQ)?%b!W5yVkBBnk5Ngj7jozN0
za(#?c-D<qC|1}l#24WMjo?uybgWo80Z{7R<JrKAByNDPugV5`vmh|zqs^pbKMR1Iw
z_dYyY=Q^T;Xn1RBxVvyN{ApR?P~|V7OiR>lc4Cc*cx;s$bKTkfebKEW`!d<g_}*w|
zIyaJV;%=-d>iXBkz3W`AOQo~9=-@<pZ+1^QH$IVY21m!o(pe`tI+4ldG9yk~ZhWkr
X*cBWoOjiwt3Io;4<`h1Ud>#4+Li)c8

diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po
index f0e9df792..5a296364e 100644
--- a/rest_framework/locale/es/LC_MESSAGES/django.po
+++ b/rest_framework/locale/es/LC_MESSAGES/django.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,40 +22,40 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Cabecera básica inválida. La cadena con las credenciales no debe contener espacios."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Nombre de usuario/contraseña inválidos."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Usuario inactivo o borrado."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Cabecera token inválida. Las credenciales no fueron suministradas."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Cabecera token inválida. La cadena token no debe contener espacios."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr "Cabecera token inválida. La cadena token no debe contener caracteres inválidos."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Token inválido."
 
@@ -91,11 +91,12 @@ msgstr "Las credenciales de autenticación no se proveyeron."
 msgid "You do not have permission to perform this action."
 msgstr "Usted no tiene permiso para realizar esta acción."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "No encontrado."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Método \"{method}\" no permitido."
 
@@ -104,6 +105,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
 
@@ -111,209 +113,238 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
 msgid "Request was throttled."
 msgstr "Solicitud fue regulada (throttled)."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Este campo es requerido."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Este campo no puede ser nulo."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" no es un booleano válido."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Este campo no puede estar en blanco."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Asegúrese de que este campo no tenga más de {max_length} caracteres."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Asegúrese de que este campo tenga al menos {min_length} caracteres."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Introduzca una dirección de correo electrónico válida."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Este valor no coincide con el patrón requerido."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Introduzca un \"slug\" válido consistente en letras, números, guiones o guiones bajos."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Introduzca una URL válida."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" no es un UUID válido."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Introduzca una dirección IPv4 o IPv6 válida."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Introduzca un número entero válido."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Asegúrese de que este valor es menor o igual a {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Asegúrese de que este valor es mayor o igual a {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Cadena demasiado larga."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Se requiere un número válido."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Asegúrese de que no haya más de {max_digits} dígitos en total."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Asegúrese de que no haya más de {max_decimal_places} decimales."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Asegúrese de que no haya más de {max_whole_digits} dígitos en la parte entera."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Fecha/hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Se esperaba un fecha/hora en vez de una fecha."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Fecha con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Se esperaba una fecha en vez de una fecha/hora."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Duración con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" no es una elección válida."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Se esperaba una lista de elementos en vez del tipo \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
-msgstr ""
+msgstr "Esta selección no puede estar vacía."
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" no es una elección de ruta válida."
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "No se envió ningún archivo."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "La información enviada no era un archivo. Compruebe el tipo de codificación del formulario."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "No se pudo determinar un nombre de archivo."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "El archivo enviado está vació."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Asegúrese de que el nombre de archivo no tenga más de {max_length} caracteres (tiene {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o bien está dañado."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
-msgstr ""
+msgstr "Esta lista no puede estar vacía."
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Página \"{page_number}\" inválida: {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Cursor inválido"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Tipo incorrecto. Se esperaba valor de clave primaria y se recibió {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Hiperenlace inválido - No hay URL coincidentes."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Hiperenlace inválido - Coincidencia incorrecta de la URL."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Hiperenlace inválido - Objeto no existe."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Tipo incorrecto. Se esperaba una URL y se recibió {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objeto con {slug_name}={value} no existe."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Valor inválido."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Datos inválidos. Se esperaba un diccionario pero es un {datatype}."
 
@@ -334,18 +365,22 @@ msgid "This field must be unique."
 msgstr "Este campo debe ser único."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Los campos {field_names} deben formar un conjunto único."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Este campo debe ser único para el día \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Este campo debe ser único para el mes \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Este campo debe ser único para el año \"{date_field}\"."
 
@@ -365,6 +400,6 @@ msgstr "Versión inválida en el nombre de host."
 msgid "Invalid version in query parameter."
 msgstr "Versión inválida en el parámetro de consulta."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Permiso denegado."
diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo
index 931ab9bdb2a718acffcc407fd8cdeec728223581..880d55b246acf178ca7b0cf7c5a52fa8c3516a16 100644
GIT binary patch
delta 96
zcmZp1ZE@X@D9mfAYh<WkXkcY(s%>C2IZs&H5iDY0VP$HjZ2$yZK8eL8x*<i0dBr)2
qCHX~G3K5BAnW;qz{zWPIg{74WHWm30mP1ZvUVd3-;^tGryZ8VjnI6&r

delta 96
zcmZp1ZE@X@D9mf2Yhb2eXl!L<sBK_4IZs&H5h7v)7BMg|;POc<F3}AsO3W+HNi4}P
lvQh}i$j?nIR&dTJ$}BF)OjWQc$<K8F;$*16=2ODE_y8JE9)|z`

diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po
index 597b15c6e..e642aaf0d 100644
--- a/rest_framework/locale/et/LC_MESSAGES/django.po
+++ b/rest_framework/locale/et/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Sobimatu kasutajatunnus/salasõna."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Kasutaja on inaktiivne või kustutatud."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada tühikuid."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Sobimatu lubakaart."
 
@@ -87,11 +87,12 @@ msgstr "Autentimistunnus on esitamata."
 msgid "You do not have permission to perform this action."
 msgstr "Teil puuduvad piisavad õigused selle tegevuse teostamiseks."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Ei leidnud."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Meetod \"{method}\" pole lubatud."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Päringu Accept-päist ei suutnud täita."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Meedia tüüpi {media_type} päringus ei toetata."
 
@@ -107,209 +109,238 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata."
 msgid "Request was throttled."
 msgstr "Liiga palju päringuid."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Väli on kohustuslik."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Väli ei tohi olla tühi."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" pole kehtiv kahendarv."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "See väli ei tohi olla tühi."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Veendu, et see väli poleks pikem kui {max_length} tähemärki."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Veendu, et see väli oleks vähemalt {min_length} tähemärki pikk."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Sisestage kehtiv e-posti aadress."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Väärtus ei ühti etteantud mustriga."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Sisestage kehtiv \"slug\", mis koosneks tähtedest, numbritest, ala- või sidekriipsudest."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Sisestage korrektne URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" pole kehtiv UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Sisendiks peab olema täisarv."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Veenduge, et väärtus on väiksem kui või võrdne väärtusega {max_value}. "
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Veenduge, et väärtus on suurem kui või võrdne väärtusega {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Sõne on liiga pikk."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Sisendiks peab olema arv."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Veenduge, et kokku pole rohkem kui {max_digits} numbit."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Veenduge, et komakohti pole rohkem kui {max_decimal_places}. "
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Veenduge, et täiskohti poleks rohkem kui {max_whole_digits}."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Valesti formaaditud kuupäev-kellaaeg. Kasutage mõnda neist: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" on sobimatu valik."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Ühtegi faili ei esitatud."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Esitatud andmetes ei olnud faili. Kontrollige vormi kodeeringut."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Ei suutnud tuvastada failinime."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Esitatud fail oli tühi."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Veenduge, et failinimi oleks maksimaalselt {max_length} tähemärki pikk (praegu on {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Laadige üles kehtiv pildifail. Üles laetud fail ei olnud pilt või oli see katki."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Sobimatu lehekülg \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Sobimatu kursor."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Sobimatu hüperlink - ei leidnud URLi vastet."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Sobimatu hüperlink - vale URLi vaste."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Sobimatu hüperlink - objekti ei eksisteeri."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Sobimatu andmetüüp. Ootasin URLi sõne, sain {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekti {slug_name}={value} ei eksisteeri."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Sobimatu väärtus."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {datatype}."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Selle välja väärtus peab olema unikaalne."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Veerud {field_names} peavad moodustama unikaalse hulga."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Selle välja väärtus peab olema unikaalne veerus \"{date_field}\" märgitud kuupäeval."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud kuul."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud aastal."
 
@@ -361,6 +396,6 @@ msgstr "Sobimatu versioon hostinimes."
 msgid "Invalid version in query parameter."
 msgstr "Sobimatu versioon päringu parameetris."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo
index d7be0d93cc974e575973e8ea349496f08a87ac09..9626fd35444715525dd1a03abe7460db17cfc360 100644
GIT binary patch
delta 2349
zcmZwIeQZ-z7{~F`GR7FN!C))nWn5k+;OOWE-AiF?Yy%t&H(?k|AmqATS+#3Ndpn%E
zG=^x5{((t@1{0$aQAeUtt1(6sz^U;i_!gqUL_;*j7?h#@2O;tMYr8*;p788*?(Ka!
z=Q+>0yxR43PwL0Af)j?ek61!{=r!gDMyB(J7MNkoa;!rO_hL1=ScT8vLVOo>|2Mc8
zC()0yii}x@&Df6j;C39(nKIYt?BGP>Ok>(Gg?HjPY(!tNF`KXlci|Hl!tYSOm(4P!
z8+YPLd>YH}J=B1{$e+KGw{&*yc^fcjQpUvSXhx?|5B?mRuyBqst=Nhkn8I3|z!Llm
zb)AQUH5fu=svmE~NAl-i#{kEduojC;jp@Q>Y~lUp7#)5y=W!8!l|R0Mn$dOCOseMQ
z+=M#6A2rj5P)l(fb^mL)8b8Gf{1YuKnrF;>T#E(Rf+@0S+Ucyv-KYnSp>BK<efTm4
z@GNSnuAv6h#Kro3AL@7rwf2u=1HOb>q95|d<-A=3>_%O8cs}{J=p5sO2Jj-PNG@Ux
z`W8@l*nxLp5-ah`yuV>R$J5G<`PjotQ8T~E=vQGiqf^RvqB1s`_u0JXedJ#w|AiBN
z^is+jF@U?!!M*qf-j36GyLL(+cH$Y_gOj)o+nJuuKZb|#0xDxcrYpzr5PpQJk?It0
z=U&r`8u7iT86VGk9#wpQV+%Ge&26V7HgbFlx8nDB5SLI04nBb0cp1sQ@h{6|whgtE
z$50tgy+ubUyNv6w$jZGah<ZQ*_v1NK)mAPyhUGW?xB-)>7mQ;)zK<%#Nz`*oR^-k%
zAggM^sHGS~#+))Q(9s&5MaE#RqDEH2RXoFlun-R*JJa-|YGoK%e)BwP0B<Az%qRTW
zgui1St|6^t+l-+yeG*Bg$z)Bj-RLNlf8?#^W6;F$LDY>;p&tAua*6pCHGmta8mYM@
z=TTG!C-6SJhN|`hq(Kuoih9pU^x!l?-=F_&dpN6?X~x?L%}@{7N+|tPO-rJt7xfYv
zkm^T8yPME}sBLo_p%x<av1-==Ej5Ebn~9k^qA}=fntE_85hV0+Qu7kpC2fS7z8zZY
zLZX#WTBj2hq1w<+Ql`{e2z?W#nwFRkXeyiP()?Maxr0z4H4{6CErjYrRZD4P8yWmp
zV|Qk2hwZPT$~M);RMS@LB(#NR5&F1w6V-b99dxuV+X((I%I<HiyNX9m#WXkD<3oa~
zVzmMy{aN9n^aq9O(iaMS1;e&GnEAQzkf*3K8MobVESg?g)|zQAihAdF^^R<`VsQ%_
zEPG%e?j$nL6~8mBEF2xNBjEw7f6$KG{jL*Fq$lSr%rul#coxRuj^z&8QR~6}STgF4
zSz*^1O4Qb7x=K%b8zSL^YYo|>Ry5{XcRQ9dH0+Mnn!dqs!b&(1r(YxZ&jp!Z=Uw%L
zoBj25R$U+z4Aund1A*e+9{(O^B%I(5f2Zv_A*()67xV|R*9DqF!KRu3t+?Axxc<Jl
z9Zf`RHx>_B`|Xji6SsQe1F<8?QET)4v0Se$5{|}3!gglMg1w$}q<rzr0f#v{L*Z!V
z(ee|XqHfz7NX93|(+^jy@J3dr*RS+tN_|(n3vA^k;V4sNESb$%`evmsbG`CZK?M)V
z=4s*;uCnsUbJDY`R%OPj4ttjLMv@7OS50MXVmvZ2KIBAQrR}F>H@vk<n`1>CYuHJ;
k*07zhCeFAddL%sH)S3>*<<|ta<?@%lyxf<$wBn-YA9dwRl>h($

delta 1875
zcmYk+TTB#J9LMqhtkf+60*i=<mjNx+!qR1_vf_<JYq_bdtR^-hA&sq8k(8xP8ca6z
ziBJ+BsPbadgfyo1^3q8gB1!e3mr$Fwwhw62Xkv`E38v|TCPowe{$_{76aM=-XNEa5
z=YK9&c7N5DxgN<mZIoTaGGa7jb`&4w@I(1*zF8%nM;9;S3Y^6ym>14Iw;C&GCoziM
zSc@NG3r^w=e2A}L%d=+9W*HlyvX2Xwu@S3s%{Joe*nwxT32&nAFJEBRiF+}E6Q~dW
z23O%9f%j4UEX^}phx_n397Xl_H70n!-KDaX3)T5%+we`S!_RRcUc&_bgKMy|Ae)hP
ze1Y~c)b(+U;U(1b|KnzK=|ue;<Yy`N1?^#6#rtiXibgOMcvUxO-$RYCyfB;cT6~^%
z2QJ1mx;TO*_yua#E+T`s@9{<a4b{(M)N_#{voc(Z8GUh*isobh^&uBf|1cA@|3l4f
zezDnlT!Wg5o}fLB8riR?7ygTy^K#x=g9or4hjBk%z;awvLjF~$<MZR#ia$DLL#UCq
zl$x!^w^12673c-dpg#B^MsW$ldkJ@72M%Eu{)Bt6f>CY9cW@7WTSoq0rjpB2){Wix
z7Jh`v$fLmRd}R;qQPc;|@}m!%&#*PJn!s+<8ajoV`#-T3i%Fj{wgr>;9(LnohRPu-
ziy1~Io<Oo=)2I~wjWJxgJe$f_QJFb`>iARKj8{<47qU0o@BlIkb`BeG64mc4D$|dV
zKg+~dW;=Whb>n>``}QR&<(IGyZy|qH;$}aj0V`?uAV-0HfcZF#S_7wX5&nP?{0r6J
zUEGMpJe<=0-${ie*aRxI-ywsxtAY1Wsf$!)ZN~)dlc?vWP%oT8&3Tx&$SzcdKEb2-
z3o;v)VBYA`y0B6E|6M8$7s7-~R1+#%7b;4>I^3nkQ-$-${}5$GnM)Eo3C=NpiZl&*
zL=B;gwi9zj8S@M8_qSBg^hcufXk;vEe=*J7+dzeH^@~!id7mq5gGv)>lv<Qq35`_g
zS0Mp@QC74|S_!@1KNi=iLeUwm@(iKrP+=4JMW-BRk~I@L`8XE*qOCVqv}<(usDy|X
zViUm*w0VSz79Km$n6bFAaBT~r)yj$KuU5^!=3EO;i-?2E-<~<xITj7Kd1u2Z$7{?z
z9`dI1&dnQ}DkvJ8F1+piTr?5#&X?SA3KG%SdbhrzDPCU_s~`Kgv?7_k68EpfVzC9C
zz3IVdYM}Rc`dIH^|3H(QI^5san|8My9ypR7JaWk0G}zzQOuP|X@E(+QIo?p&h~uTo
aZ-l&q%O-NX{gthbcd_b0$aAWHcb)(RHOD&u

diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po
index 35ba5db5e..383d968c7 100644
--- a/rest_framework/locale/fr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/fr/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:58+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: French (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "En-tête « basic » non valide. Informations d'identification non fournies."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "En-tête « basic » non valide. Les informations d'identification ne doivent pas contenir d'espaces."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "En-tête « basic » non valide. Encodage base64 des informations d'identification incorrect."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Utilisateur inactif ou supprimé."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "En-tête « token » non valide. Informations d'identification non fournies."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "En-tête « token » non valide. Un token ne doit pas contenir d'espaces."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
-msgstr ""
+msgstr "En-tête « token » non valide. Un token ne doit pas contenir de caractères invalides."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Token non valide."
 
@@ -90,11 +90,12 @@ msgstr "Informations d'authentification non fournies."
 msgid "You do not have permission to perform this action."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Pas trouvé."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Méthode \"{method}\" non autorisée."
 
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "L'en-tête « Accept » n'a pas pu être satisfaite."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Type de média \"{media_type}\" non supporté."
 
@@ -110,209 +112,238 @@ msgstr "Type de média \"{media_type}\" non supporté."
 msgid "Request was throttled."
 msgstr "Requête ralentie."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Ce champ est obligatoire."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Ce champ ne peut être null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" n'est pas un booléen valide."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Ce champ ne peut être vide."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Saisissez une adresse email valable."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Cette valeur ne satisfait pas le motif imposé."
 
-#: fields.py:628
+#: fields.py:723
 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."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Saisissez une URL valide."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" n'est pas un UUID valide."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Saisissez une adresse IPv4 ou IPv6 valide."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Un nombre entier valide est requis."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Assurez-vous que cette valeur est inférieure ou égale à {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Assurez-vous que cette valeur est supérieure ou égale à {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Chaîne de caractères trop longue."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Un nombre valide est requis."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Assurez-vous qu'il n'y a pas plus de {max_digits} chiffres au total."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Assurez-vous qu'il n'y a pas plus de {max_decimal_places} chiffres après la virgule."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Assurez-vous qu'il n'y a pas plus de {max_whole_digits} chiffres avant la virgule."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Attendait une date + heure mais a reçu une date."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Attendait une date mais a reçu une date + heure."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" n'est pas un choix valide."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr "Plus de {count} éléments..."
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
-msgstr ""
+msgstr "Cette sélection ne peut être vide."
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" n'est pas un choix de chemin valide."
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Aucun fichier n'a été soumis."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "La donnée soumise n'est pas un fichier. Vérifiez le type d'encodage du formulaire."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Le nom de fichier n'a pu être déterminé."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Le fichier soumis est vide."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est pas une image, ou il est corrompu."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
-msgstr ""
+msgstr "Cette liste ne peut pas être vide."
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Page \"{page_number}\" non valide : {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Curseur non valide"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Lien non valide : pas d'URL correspondante."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Lien non valide : URL correspondante incorrecte."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Lien non valide : l'objet n'existe pas."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Type incorrect. Attendait une URL, a reçu {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "L'object avec {slug_name}={value} n'existe pas."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Valeur non valide."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Donnée non valide. Attendait un dictionnaire, a reçu {datatype}."
 
@@ -333,18 +364,22 @@ msgid "This field must be unique."
 msgstr "Ce champ doit être unique."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Les champs {field_names} doivent former un ensemble unique."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Ce champ doit être unique pour la date \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Ce champ doit être unique pour le mois \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Ce champ doit être unique pour l'année \"{date_field}\"."
 
@@ -364,6 +399,6 @@ msgstr "Version non valide dans le nom d'hôte."
 msgid "Invalid version in query parameter."
 msgstr "Version non valide dans le paramètre de requête."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Permission refusée."
diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo
index f534447cf27b92f978d64356aa2cd01e6d379553..4f1c6c5a54d2015a623aa16ca719cb0c2ee25075 100644
GIT binary patch
delta 93
zcmeBY>1UZRnb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^{|GYz0Nn{4>i_@%

delta 93
zcmeBY>1UZRnb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHK2r~iz)D9h>

diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
index 90fe8446c..11ec107ea 100644
--- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
+++ b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.mo b/rest_framework/locale/gl/LC_MESSAGES/django.mo
index 1ddc9321494b95101101481427def05548ad0569..7446c524a616e0ce5c85ff6ba8bcd3a4ef5292a8 100644
GIT binary patch
delta 93
zcmZo>X=a%)nb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^|FAOx0Mt<(#{d8T

delta 93
zcmZo>X=a%)nb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHKurmSx%T^tH

diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po
index 8ec8f26c7..526f8d706 100644
--- a/rest_framework/locale/gl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/gl/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Galician (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo
index 8031c173bf897bec6279cede8d5a4d210485d4e9..3bce3c307f9381f0a8596c5530d5114964c8596d 100644
GIT binary patch
delta 94
zcmbQsI+u0ACtgckBSQs411nQgZ3Cl;|D_$l0tOaVre@j(K)~gbSX`nTQk0lioRe6R
pUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hyj%IXX1OPwS9#{YX

delta 94
zcmbQsI+u0ACteF(12Y9fV=E&=Z3DxJ|D_!v0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
kg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-$sW^`f%05*~y4FCWD

diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
index e61aac266..c34d39523 100644
--- a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
+++ b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Galician (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -87,11 +87,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -107,209 +109,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Valor non válido."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -361,6 +396,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Permiso denegado."
diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo
index a69d706560b2b3fe53280f0428d1fdc80605f049..79f7c7329c3eca4e9496a981a0345c1edcfd8aaf 100644
GIT binary patch
delta 118
zcmeD2=<(RFT`1F1*T_)8(7?*nRNKJFz<?{jUpFYVEVDQ>KTp>su_V<>!N|bSRM!Bk
z&cMRT)J)p|2)KL_i%WDviW2jRa}rDPi>wqP63a4Eixm8eQt}H+D-~=i@*ymToXouZ
MvdqNI3c_y$01KccVgLXD

delta 118
zcmeD2=<(RFT`1E+*T77{(AdhzP}{)Jz<?{jUpFYVEVDQ>KTp>su_V<>!N|bSRM!Ba
z&Iqi|0I1F<vA9Gxq$n}3I47|rzsO1<BqKjJu~@-5qbReuBr{dPrX)Yt0f>{K0-F_t
H-v|Hz0u?0}

diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po
index 3cd341314..6f7f67d7a 100644
--- a/rest_framework/locale/hu/LC_MESSAGES/django.po
+++ b/rest_framework/locale/hu/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Érvénytelen basic fejlécmező. Az azonosító karakterlánc nem tartalmazhat szóközöket."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Érvénytelen basic fejlécmező. Az azonosítók base64 kódolása nem megfelelő."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Érvénytelen felhasználónév/jelszó."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "A felhasználó nincs aktiválva vagy törölve lett."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Érvénytelen token fejlécmező. A token karakterlánc nem tartalmazhat szóközöket."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Érvénytelen token."
 
@@ -87,11 +87,12 @@ msgstr "Nem voltak megadva azonosítók."
 msgid "You do not have permission to perform this action."
 msgstr "Nincs jogosultsága a művelet végrehajtásához."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Nem található."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "A \"{method}\" metódus nem megengedett."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Nem támogatott média típus \"{media_type}\" a kérésben."
 
@@ -107,209 +109,238 @@ msgstr "Nem támogatott média típus \"{media_type}\" a kérésben."
 msgid "Request was throttled."
 msgstr "A kérés korlátozva lett."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Ennek a mezőnek a megadása kötelező."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Ez a mező nem lehet null értékű."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "Az \"{input}\" nem egy érvényes logikai érték."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Ez a mező nem lehet üres."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Bizonyosodjon meg arról, hogy ez a mező legfeljebb {max_length} karakterből áll."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Bizonyosodjon meg arról, hogy ez a mező legalább {min_length} karakterből áll."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Adjon meg egy érvényes e-mail címet!"
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Ez az érték nem illeszkedik a szükséges mintázatra."
 
-#: fields.py:628
+#: fields.py:723
 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."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Adjon meg egy érvényes URL-t!"
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Egy érvényes egész szám megadása szükséges."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Bizonyosodjon meg arról, hogy ez az érték legfeljebb {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Bizonyosodjon meg arról, hogy ez az érték legalább {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "A karakterlánc túl hosszú."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Egy érvényes szám megadása szükséges."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Bizonyosodjon meg arról, hogy a számjegyek száma összesen legfeljebb {max_digits}."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Bizonyosodjon meg arról, hogy a tizedes tört törtrészében levő számjegyek száma összesen legfeljebb {max_decimal_places}."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Bizonyosodjon meg arról, hogy a tizedes tört egész részében levő számjegyek száma összesen legfeljebb {max_whole_digits}."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Időt is tartalmazó dátum helyett egy időt nem tartalmazó dátum lett elküldve."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Időt nem tartalmazó dátum helyett egy időt is tartalmazó dátum lett elküldve."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Az idő formátuma hibás. Használja ezek valamelyikét helyette: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "Az \"{input}\" nem egy érvényes elem."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Elemek listája helyett \"{input_type}\" lett elküldve."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Semmilyen fájl sem került feltöltésre."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Az elküldött adat nem egy fájl volt. Ellenőrizze a kódolás típusát az űrlapon!"
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "A fájlnév nem megállapítható."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "A küldött fájl üres."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb {max_length} karakterből áll (jelenlegi hossza: {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 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."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Érvénytelen oldal \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Érvénytelen pk \"{pk_value}\" - az objektum nem létezik."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Helytelen típus. pk érték helyett {data_type} lett elküldve."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Érvénytelen link - Nem illeszkedő URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Érvénytelen link. - Eltérő URL illeszkedés."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Érvénytelen link - Az objektum nem létezik."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Helytelen típus. URL karakterlánc helyett {data_type} lett elküldve."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Érvénytelen érték."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Érvénytelen adat. Egy dictionary helyett {datatype} lett elküldve."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Ennek a mezőnek egyedinek kell lennie."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" dátumra."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" hónapra."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre."
 
@@ -361,6 +396,6 @@ msgstr "Érvénytelen verzió a hosztnévben."
 msgid "Invalid version in query parameter."
 msgstr "Érvénytelen verzió a lekérdezési paraméterben."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo
index 2b3c1dde98087668565db29bcdde535b0673e29b..0324ef5414254039b5a7cde12434e6c0a4cde9e8 100644
GIT binary patch
delta 93
zcmeyz{EvCUWL`^MBSQs411nQgZ3Cl;3#1*v0tOaVre@j(K)~gbSX`nTQk0lioRe6R
oUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hy{KLcu04xX|wg3PC

delta 93
zcmeyz{EvCUWL^th12Y9fV=E&=Z3DxJ3#1((0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
jg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-%_!^8*xBMlyF

diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po
index 03c8b66df..dac92dd57 100644
--- a/rest_framework/locale/id/LC_MESSAGES/django.po
+++ b/rest_framework/locale/id/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo
index 29ba49ed8c82e646c2ffd0e212e58eadb6baf8b0..6e7625826fe760f69c81c683f58112faf59f5d52 100644
GIT binary patch
delta 78
zcmZ4CwZdzIjtH-%u92aFp@EgDskVX9WJ?igF0hD!g_Wt<<Tw#=g^0wm%+w+U|Du%q
a!qQ3wn~Ho0%ONK-FTX4^ar0D>$pQdVQ5Y@&

delta 78
zcmZ4CwZdzIjtH-Xu7R0?p|O>bp|*kHWJ?igE{KQ`P-JqPh`2&XMt*K$v4V3(QD$*T
WW~zcsNq(*a5GO+gHcu6qEC2vY1Q+7~

diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po
index 009303dcb..da519aa59 100644
--- a/rest_framework/locale/it/LC_MESSAGES/django.po
+++ b/rest_framework/locale/it/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Italian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Header di base invalido. Credenziali non fornite."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Credenziali non correttamente codificate in base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Nome utente/password non validi"
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Utente inattivo o eliminato."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Header del token non valido. Credenziali non fornite."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Header del token non valido. Il contenuto del token non dovrebbe contenere spazi."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Token invalido."
 
@@ -90,11 +90,12 @@ msgstr "Non sono state immesse le credenziali di autenticazione."
 msgid "You do not have permission to perform this action."
 msgstr "Non hai l'autorizzazione per eseguire questa azione."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Non trovato."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metodo \"{method}\" non consentito"
 
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Tipo di media \"{media_type}\"non supportato."
 
@@ -110,209 +112,238 @@ msgstr "Tipo di media \"{media_type}\"non supportato."
 msgid "Request was throttled."
 msgstr "La richiesta è stata limitata (throttled)."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Campo obbligatorio."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Il campo non può essere nullo."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" non è un valido valore booleano."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Questo campo non può essere omesso."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Assicurati che questo campo non abbia più di {max_length} caratteri."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Inserisci un indirizzo email valido."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Questo valore non corrisponde alla sequenza richiesta."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Immetti uno \"slug\" valido che consista di lettere, numeri, underscore o trattini."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Inserisci un URL valido"
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" non è un UUID valido."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "È richiesto un numero intero valido."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Assicurati che il valore sia minore o uguale a {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Assicurati che il valore sia maggiore o uguale a {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Stringa troppo lunga."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "È richiesto un numero valido."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Assicurati che non ci siano più di {max_digits} cifre in totale."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Assicurati che non ci siano più di {max_decimal_places} cifre decimali."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Assicurati che non ci siano più di {max_whole_digits} cifre prima del separatore decimale."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "L'oggetto di tipo datetime è in un formato errato. Usa uno dei seguenti formati: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "La data è in un formato errato. Usa uno dei seguenti formati: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "L'orario ha un formato errato. Usa uno dei seguenti formati: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "La durata è in un formato errato. Usa uno dei seguenti formati: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" non è una scelta valida."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Attesa una lista di oggetti ma l'oggetto ricevuto è di tipo \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Non è stato inviato alcun file."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Il nome del file non può essere determinato."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Il file inviato è vuoto."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Pagina \"{page_number}\" non valida: {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Cursore non valido"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Collegamento non valido - Nessuna corrispondenza di URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Collegamento non valido - Corrispondenza di URL non corretta."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Collegamento non valido - L'oggetto non esiste."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "L'oggetto con {slug_name}={value} non esiste."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Valore non valido."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Dati non validi. Era atteso un dizionario, ma si è ricevuto {datatype}."
 
@@ -333,18 +364,22 @@ msgid "This field must be unique."
 msgstr "Questo campo deve essere unico."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "I campi {field_names} devono costituire un insieme unico."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Questo campo deve essere unico per la data \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Questo campo deve essere unico per il mese \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"."
 
@@ -364,6 +399,6 @@ msgstr "Versione non valida nel nome dell'host."
 msgid "Invalid version in query parameter."
 msgstr "Versione non valida nel parametro della query."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Permesso negato."
diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..9f92c5652b1aafd5df871322765262c2f6d050e7
GIT binary patch
literal 11341
zcmcJTYjhOndB?|&6FYKjC(g}o(`Kxsi7~7$#1JBaV+=UKhM0nI?KX`%+8s$_c6XMY
zS%ji+qTPjXFW9lb*o2EQ_kc(p8w@t|q^Iram-h5S+q6lq!>%NserQk6>4)~5w!i0{
zncdly7A>(mN2CAF%=<p?bAO)q{fB#R8`ZeFxj)1G_N|(>9{kn^`NyT-u4xZ|4}dzj
z1pEy!0scC;1H2DB4a)qVg1-v>BNzk!8=M2qx<k_*1D^&T2M+}JPvF;i{^Ex<?NQJM
zp9U|0Uj}b)(X@r&*T5&iVXzDQQ&7I&dZ(tX0K34?fm^|Q!Ly+7b2WJX^8o)B6ndZg
zh^Ea0dq9zA6coBwzy;ucf?osM??PtK2HU{b!MnkK0cG63gAala@ly1(27Cz2f%5(c
z*a7|-*arR=xE!2ykESgG9gtVrkHKF7|1fy|IVkeH3yK_ff7Hj>puGPEC~_u2vBUSk
zFM@}_Pl0~|>fqml9|!*jybZkfW15EQv`>TWU@IteR)aFn1V0Ua7wiCE1jRmo3<@82
zF<8Do1j_ScpxC<yoDU9zVwXP%p5FyUt_NU3#(fpk!Dm2Oe+U%6I1SDQ{}t>6@B4(N
zJqtbo-VeSO;8k!g&p!iydW)vr`AJ`oe-87q{zqU=?6w4yaYaz<@g^7p|2e>Wa9Vl4
z2>eZO0Q@$1Il%i_RGv42-va*zd=h*ZVY<N)@SEUYfxiWQ9^rlm{4OYd^|Ju)MoHh{
zc`3LQyavj;xBVKr0NX*~I~m|HQ0V;~_}k!Ij4R`JgK_W@_`Bd|KC5XK_#N=~!0Vv!
zw@ml_;d$^`o-cs%z6Ix820jhS^FeSCH~~HZexcRZ!+Ox>`H#Rp@Jl!wOKLBJ;ty|u
zs9bwDc-B7ezwZRU#QR=Q^uG@jzW*8&`EDV|9sw7CVuwLc#vcd8Z~qqj5O~WM{5ZM;
zT)^`~Aga{jpsfErQ24n3E(8Ap+zoybB0~2VDBu4Q6uSS$KZ(Qp`1cIBIKY<!{0~t0
zTQSQYUj${Hv!K}L7vQ(S`w>Q-H-hr~1}N)(Vz#Dz1$-5hdA|Tf{=4QN3-|%<Mwj><
z>d{CwN)|#z<&a0gk8y|BH-aCyn!29ge<$~9?iJiDrDF2ypj^TaVrh%zf$Mheh1?&O
z2QE~mVoLlM@sz(x4wCCuZqcL2AXf{w=<`F|k8tC@+6TFHZn59P+!DufiGD<v;e{%+
zySTs1eNXTbw^8vfu_^X_oLl^`ja&4G+o?-z7rh8e4Hs9wM`);v6i~S^hsx6{!8^G>
z#r-5VZl$f_eu{f3_Z{34zv5GCxaI2N{;2xp=jM+Gzi$(49k$Y$oV%%2w;VlfySkxo
zFp^e6@3rluX{6g4kBAT0R@}V7fQ;b|=+#ls&6!gdTDx}n(l%|e?wHvPW>z<|Sv#xS
z@pvwqH52l|=f_IBW<TFyGi$ETSv4Qixm53zZ#j3sOuJUxa4kEn$C)6HM$*v-&8(?}
z&1CHjRzj9pV&{?x_0D0u(>J6uTdia|uD&=PH#4q2U>XTC+omlwTvHz~Ae6P!{d%9B
zO&M;RzSc2yJI&oElX>tzIJ%W~T&8yE!~UC1J_*-Ky=OAHtS{bs<7Qdf$)OT=z;K0i
zei}+cddl`+r}g2Kv9Tv%#;uf*?8zjJxan-tgJ<1;Zqu5kWA$6E%vXqhbk}x`Wb*_D
z2k_1we|m*XuZem^3bV?Xjo(Db;yrzqiKRtf2#bqj-r<y$?n#>Ies^FK4r^qMxNBye
zM)T5ky<TRX%LpT|Hp`}LwJI8&I#Ykp!qZ@HIQTZJmJbz15(fQQ6F<y~)zUgKLsS?^
z6zPlOM_YrbNz-wrn+HSHc|tqP2CYsq*Waqg?X+V#u7%U%<Vn*NHO<le@Z(1=O?)_U
ztl$Vo149`?Q0XyBZ277U56fq8zHTHEjGi)P?dlc6dvuzaGOT1|{KkxlnG*1rka+CP
zxq81!VDc!j1%cWzD&T6z)sC^^k}HhtkcelwX3D9Mb%!#h9%RcNdDzriGdGD|nw+&f
zjfS!?uNw_>RGU^EC9AdR6<JV??zmZuFoy&cH?0jQVHlwepRXHC&8(Abnll?u<g+Ay
z!?EIFy3?0LQm2%NfcxZ-j5FsyteXg=vgq>kO!Ixlb!VWGZ}BPDAOkoV$tlA8bTqzc
z*JSW&;tq#XFC05tnJwyw=nNmJ*mh3Erb=nbmepnPSu>lo((Ck?UNwQ}oE#q?n0_GK
z%`oDr-si;N37g0e9hw{QmnyN0(J$U5(BntbrdG;Dipby<^&%7#3o>k75T>m#Y2TQ#
zYp*lY6;sZr#@gZCYI0+nS%IyhIWy$+<|x%$U(K$HoufOD1lpc49B0tZQnABzltV`z
zNkCHX@u*h6Y`2EeSEp3Rh}oo1nU=r+X<AmD_T&1TNuJ11EK(+Es!dyIB&EC)jMAXc
zHt@=H2kZnEV+cQJepHK<OxlCebgaygGpuwxnM+{(P{vl>NHZstlr)3Y`mCg>4^kDJ
zTyM%E?=n4jtqMzA#Z#|TKA54N1q1vfMp1CgBn~K((kB00niH~hn-)0cphd4XELpxs
z=xtgwtn^B4t@GGbLfug+rk}E8nbp3yiamEAYrAezUawI(%1=0yC0kD#*?x4{O?_5H
zm=dQ@tw=YJ5_P1Eb#xz85(^!|H7v`7irA9u4Yia~rBY0rzGT3RuTzy@<svCiDq-UY
z(hi7S>ggzrQbx^G#vPK6mEM3K)fO}IK4lCk`=RCDq>)}%Gb!>hol7QbzlmVX3WS0i
z#Z{~1AG1g40N0R*Ut(H{{E7QU`D|*rA=AKV8%_&8sj?Q4EvhZwr6kxI3{Wmq^`Mj_
zP$hY&UI{(im0d>nd+&wUrj1^L1Yb|u{SyDmr^8ASEgx;#S{mL=#?DIrK*U;x?=BLk
zJOuS!XjDRZZ6;|O(rozEi8dHt)_q@Q)ge2l=hP4=N}QSm6b+PeQnHZ@m!8K^)ialo
zg?$<t+XmjpiQqKZz@bt(A_x(rzF29xQEI%*P7uT@^q*z9gsrF#7<{8<g;9z8Jc-An
zYRJiK8x60@+ERjI%M-Du{ruOZFMZBP_uKmFWox?iK1pPx)^#nbP0>tjrPFUEVvpte
zomjWsrMIklsyjw2p!OTFr8sMsKDVQDUaaFQvALakXGhn(d9yp_c62Z>w%XiaNsgF0
zu46&hy!o>`xLQ`wd&j!7M%qaluAS}DpD{LA=;Ent!d{;n(!aWqL@&P{r5>|UGuq;I
z>Jg@;`*Wx>)@>T8F8v83W29xb_27W(X1dzj2L}h+T%l_9nHyzFdqRmBqtA3>6)|I-
z)4y*gv=#mK=ZyAQEi0F=Tvk<BXIn?h5(18$WUQM`p-Xqojcz;pA1l33Z5_y1i`I5O
z9$QcyC%p8T+1N5^lSoZn`hs4|t;o@(KWDV8O0ttn#vaFPPM4m}s7Gf}=R)>Y@?}xS
z!WON%S@-f|<%8QxJKpm0XT0J*ulTlCJmVE!^@^{1`ICJ0@&&K3!^>aw@~?P>A9y2$
z>g?#`$^51Ajzbg7ys2qk@p-Sn;^&*0?^lvmJ-V*!`Wr6k72Z%1?ez+$yy9v3o!>Qn
z;PUv3hrRrMB^3V;i%=CUlt+J39=+fdUMOujUfS`B8h66W@A2|Sy!@z_-&{BPLTTi+
z8AeZ>**$UU?Q(HT>Bx^^ptSd_EM3^;<srPeMz>1)W5O<4DQ-hCe(&KGU-F7YuQ<X|
z<;x?&bpC*s|ACi31x2NR-Bm(jf{I}Kk6*v?5`;?cyjpr2F?LP*Vu(o(Ak6hE$FE=7
z$p9~ZS}`TR!@+P0p&I$Crw>XK`;V6o6e2U;XY!{HPwvB~Dh$29<VzR!VC?b2TNNdg
zkLG>zPj^m%@+aQh;^nc+8L?b}AK&-#(<n()Q`)<2;uIrJmJg1UUOVX%^bagpC0voo
z1l-OUX!%|_S;X4sYgw#0!MHgFmH(WdJhEl{6^uVty70V`3m?J#3em%i^1iL5bNdy`
z<bnqB){@($<PDA<{P`kdVaMd?MHNm+y}c<tdc{$%aMUZj<`vJD_TuKGtcpTw7nqK<
z2gCD^fQc|TW{Hh_o+X6yV@hB@$228rIID8l5ix0f(5O&RO7up=!O$i@f<#MHlbHzk
z!t3&e_Y#{#_?TDRqvRe{`4}hJUfxDB+gZt0dT^jJLk6mhmm`x3bvZXtENu6RKT_*A
zm-N`{G`pTxJgPGA*_&A>NGX2#A<*`e{Twz!P7V@X%{0kPH=b5|6r-08?Igs!;#Osn
zYhh^-F2X=LKXLU?`ISrWKV6mlRocHX%XRgneD0Xa(!}kQT7CV}ZuObs9!R7FL`RbP
zhh-1sH>tkhRo!7@KVC}P_Rk<`WsN3DU%zz4E1Xls`25Vpvr7H&<?_KFRSTiSu?SJ8
zjmH+RSvDUZKUr0a6n`S?b>)fV9MZ{jwfCl0swyXccKr0^@dNLOmZ<CnqL+F(rYbuL
zHPSfU)B-a#3Wc-EL*F4OGBhL|=tK*jt9DnOTrs*jtg5$pQ+^$$r0113p^s(}wuS>v
zlPU~IvLG!N52^kI<&YYK&O>XGRs#}YKiVV}i7v%#X$wVpSLxhKrGu1HpPeeLmz7#C
zjgOuw?YSstWb6<sM`=2S4J8v*M~>Dc!&f|8=2g$u>L#I`N;EcPBwPiaw<(UO1vqfn
z1vYU08?}~AQjD$_b@Iyepo})}?NN$TC5V2Fu6NTx6(v-0c3kX)Qs0}ZbJ!W|H;QPJ
zoesI6zMrf{jw<hAJXMYWOW&veqdx5Q-NY-N6uZ>Azqo?<tlHZ&JHadBgOdDVwCOoS
zo+LM%gm7ekql#_eTC?*jHVxZ-1fwmB?mt2W2<-yNhCRr3yt{G^iEmGwVpr23r&bRm
zX)3EnkwLDML_lR_3rIe`pc-M?%SgtIwtgtNeDR9f%QRRlI$D`~S830_(p4fHDH?2#
z{C%fXlETigz{AXxLaG?uuT7kwJ)l{n6^n2hwv=M{>CQfDJBkLWr+n)4<bl0NIo;~@
zW;tKldSZMpdyld4Hx5Z7EgD2|$m(xrRj(<v8xJ47IGO)_PyWKh>q}a9Y^u`KNO?1T
z#F_Co*q5TU8(OE<9ET%Gjqs}W?1~U2qF$$JjM|hJkBEk9%Jf#Ra7?9Zw&K@R4=ioS
z_^X#G_e#u~J*g-@;HGBb^Vct(o470ml60c@2o+SjSs5!`+cJ4X_G*4l5$p>>hZs|{
zAyex|ELulKPHffwXr_ULP|cYw^3&upwKV2i@x=8@zA0uhLLCRw5k81u{~v@)Z~f$b
zAl$T|5(ECBh;I)xGhLSzS{m2g92l_hLKx<le~RNo_kiW?BNHcRQb>ekrE986klv^E
zFJZ&L2BWm?3KPN<T3=AYP2n$jys~HS^{X60`5EtUZLdq|Ip-A!5O&7?aa|<IiE~cL
z8mdC5&|;q%#+6Fvk<)5Xs~nvDP)U#PG)T9VP38EDS4y%`eL-#Vs1W;wv7o?Cqw(p6
z1p?OQjj@1okcmi1J4?rQs9bkA@=3bdYM~eEG{*(%J`EG>?;78HloQU<u6<KPshb%N
qm36l7m^?tDuan)MAm?u6E7n0%7lR&vhUom^iKFCUsU<hc=KlwDeduWb

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po
new file mode 100644
index 000000000..c8148e269
--- /dev/null
+++ b/rest_framework/locale/ja/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr "不正な基本ヘッダです。認証情報が含まれていません。"
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。"
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。"
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr "ユーザ名かパスワードが違います。"
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr "ユーザが無効か削除されています。"
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr "不正なトークンヘッダです。認証情報が含まれていません。"
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。"
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。"
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr "不正なトークンです。"
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "ユーザアカウントが無効化されています。"
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "提供された認証情報でログインできません。"
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "\"username\"と\"password\"を含まなければなりません。"
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr "サーバエラーが発生しました。"
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr "不正な形式のリクエストです。"
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr "認証情報が正しくありません。"
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr "認証情報が含まれていません。"
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr "このアクションを実行する権限がありません。"
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr "見つかりませんでした。"
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr "メソッド \"{method}\" は許されていません。"
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr "リクエストのAcceptヘッダを満たすことができませんでした。"
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr "リクエストのメディアタイプ \"{media_type}\" はサポートされていません。"
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr "リクエストの処理は絞られました。"
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr "この項目は必須です。"
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr "この項目はnullにできません。"
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr "\"{input}\" は有効なブーリアンではありません。"
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr "この項目は空にできません。"
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr "この項目が{max_length}文字より長くならないようにしてください。"
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr "この項目は少なくとも{min_length}文字以上にしてください。"
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr "有効なメールアドレスを入力してください。"
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr "この値は所要のパターンにマッチしません。"
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr "文字、数字、アンダースコア、またはハイフンから成る有効な \"slug\" を入力してください。"
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr "有効なURLを入力してください。"
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr "\"{value}\" は有効なUUIDではありません。"
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "有効なIPv4またはIPv6アドレスを入力してください。"
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr "有効な整数を入力してください。"
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr "この値は{max_value}以下にしてください。"
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr "この値は{min_value}以上にしてください。"
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr "文字列が長過ぎます。"
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr "有効な数値を入力してください。"
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr "合計で最大{max_digits}桁以下になるようにしてください。"
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr "小数点以下の桁数を{max_decimal_places}を超えないようにしてください。"
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr "整数部の桁数を{max_whole_digits}を超えないようにしてください。"
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr "日時の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr "日付ではなく日時を入力してください。"
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr "日時ではなく日付を入力してください。"
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr "\"{input}\"は有効な選択肢ではありません。"
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。"
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr "空でない項目を選択してください。"
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr "\"{input}\"は有効なパスの選択肢ではありません。"
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr "ファイルが添付されていません。"
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。"
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr "ファイル名が取得できませんでした。"
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr "添付ファイルの中身が空でした。"
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。"
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。"
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr "リストは空ではいけません。"
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。"
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr "ページ番号 \"{page_number}\" は不正です: {message}。"
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr "カーソルが不正です。"
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。"
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。"
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr "ハイパーリンクが不正です - URLにマッチしません。"
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr "ハイパーリンクが不正です - 不正なURLにマッチします。"
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr "ハイパーリンクが不正です - リンク先が存在しません。"
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。"
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr "{slug_name}={value} のデータが存在しません。"
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr "不正な値です。"
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr "不正なデータです。{datatype} 型ではなく辞書を入力してください。"
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr "なし"
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr "選択する項目がありません。"
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr "この項目は一意でなければなりません。"
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr "項目 {field_names} は一意な組でなければなりません。"
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr "この項目は \"{date_field}\" の日に対して一意でなければなりません。"
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr "この項目は \"{date_field}\" の月に対して一意でなければなりません。"
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr "この項目は \"{date_field}\" の年に対して一意でなければなりません。"
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr "\"Accept\" 内のバージョンが不正です。"
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr "URLパス内のバージョンが不正です。"
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr "ホスト名内のバージョンが不正です。"
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr "クエリパラメータ内のバージョンが不正です。"
+
+#: views.py:88
+msgid "Permission denied."
+msgstr "権限がありません。"
diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo
index 59699a217a1166f711b31bfacdab0a6b67695027..8e97250aa5ab595dde0a13441fdf37f75fa27a55 100644
GIT binary patch
delta 78
zcmZ4Dzr=sTA0b{#T_ZyULjx;QQ*8sI$(+K{TwoCc3oBEz$$G-#3K5BAnW;qz{zWPI
ag{74WHWm30mP1ZvUVd3-;^tIgdl3M7s~8&q

delta 78
zcmZ4Dzr=sTA0b`~T>~=(Lt`r=Lu~`Y$(+K{To4f>pvYuBVR40!jQrfhVg=`nqRirw
W%v1%NlKfl;AWnt~Y)%!n7XbirUKh{+

diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
index 720db8695..87388145d 100644
--- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "아이디/비밀번호가 유효하지 않습니다."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "계정이 중지되었거나 삭제되었습니다."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "토큰이 유효하지 않습니다."
 
@@ -87,11 +87,12 @@ msgstr "자격 인증데이터(authentication credentials)가 제공되지 않
 msgid "You do not have permission to perform this action."
 msgstr "이 작업을 "
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "찾을 수 없습니다."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Accept header 요청을 만족할 수 없습니다."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다."
 
@@ -107,209 +109,238 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니
 msgid "Request was throttled."
 msgstr "요청이 지연(throttled)되었습니다."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "이 항목을 채워주십시오."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "이 칸은 null일 수 없습니다."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "이 칸은 blank일 수 없습니다."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "이 칸이 글자 수가  적어도 {min_length} 이상인지 확인하십시오."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "유효한 이메일 주소를 입력하십시오."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "형식에 맞지 않는 값입니다."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "유효한 URL을 입력하십시오."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\"가 유효하지 않은 UUID 입니다."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "유효한 IPv4 또는 IPv6 주소를 입력하십시오."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "유효한 정수(integer)를 넣어주세요."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "문자열 값이 너무 큽니다."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "유효한 숫자를 넣어주세요."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "소수점 자릿수가  {max_decimal_places} 이하인지 확인하십시오."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "예상된 datatime 대신 date를 받았습니다."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "예상된 date 대신 datetime을 받았습니다."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "파일이 제출되지 않았습니다."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "파일명을 알 수 없습니다."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "제출된 파일이 비어있습니다."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "유효하지 않은 page \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "커서(cursor)가 유효하지 않습니다."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "유효하지 않은 하이퍼링크 - 일치하는 URL이 없습니다."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "유효하지 않은 하이퍼링크 - URL이 일치하지 않습니다."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "{slug_name}={value} 객체가 존재하지 않습니다."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "값이 유효하지 않습니다."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "이 칸은 반드시 고유해야 합니다."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -361,6 +396,6 @@ msgstr "hostname내 버전이 유효하지 않습니다."
 msgid "Invalid version in query parameter."
 msgstr "쿼리 파라메터내 버전이 유효하지 않습니다."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo
index f934c65c61f5a7f2e9f5d222adb0727dc8d65c14..a788d7fe4bd613bf1789a337e53617e251c14609 100644
GIT binary patch
delta 118
zcmewn{3Ce7cA-p5T_ZyULjx;QQ*8qy0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(XhF
zIs*$UQ!{M?AmH*zEH2RvDN4*M&PgoEFS1gING!`tEmH6=O35!QtyHk7$cL~Tax(Ms
N%Q6!;D+u2Z0|0m~CPDxJ

delta 118
zcmewn{3Ce7cA-oQT>~=(Lt`r=Lu~^?0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(Xgy
zIwP<;1E4ye#Nra&kfOxA;+({i{30ubkc|A?#9{^KjH1lqlFU>Eo09xo2Ov&{3T##o
Hz99wxZlfjl

diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po
index e03207335..b6655f58c 100644
--- a/rest_framework/locale/mk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/mk/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Macedonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Невалиден основен header. Не се внесени податоци за автентикација."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Невалидно корисничко име/лозинка."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Корисникот е деактивиран или избришан."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Невалиден токен header. Не се внесени податоци за најава."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Невалиден токен во header. Токенот не треба да содржи празни места."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Невалиден токен."
 
@@ -87,11 +87,12 @@ msgstr "Не се внесени податоци за најава."
 msgid "You do not have permission to perform this action."
 msgstr "Немате дозвола да го сторите ова."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Не е пронајдено ништо."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Методата \"{method}\" не е дозволена."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Не може да се исполни барањето на Accept header-от."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Media типот „{media_type}“ не е поддржан."
 
@@ -107,209 +109,238 @@ msgstr "Media типот „{media_type}“ не е поддржан."
 msgid "Request was throttled."
 msgstr "Request-от е забранет заради ограничувања."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Ова поле е задолжително."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Ова поле не смее да биде недефинирано."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" не е валиден boolean."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Ова поле не смее да биде празно."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Ова поле не смее да има повеќе од {max_length} знаци."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Ова поле мора да има барем {min_length} знаци."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Внесете валидна email адреса."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Ова поле не е по правилната шема/барање."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Внесете валиден URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Задолжителен е валиден цел број."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Вредноста треба да биде помала или еднаква на {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Вредноста треба да биде поголема или еднаква на {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Вредноста е преголема."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Задолжителен е валиден број."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Не смее да има повеќе од {max_digits} цифри вкупно."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Не смее да има повеќе од {max_decimal_places} децимални места."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Очекувано беше дата и време, а внесено беше само дата."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Датата е со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Очекувана беше дата, а внесени беа и дата и време."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Времето е со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "„{input}“ не е валиден избор."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Очекувана беше листа, а внесено беше „{input_type}“."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Ниеден фајл не е качен (upload-иран)."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Не може да се открие име на фајлот."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Качениот (upload-иран) фајл е празен."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Невалидна страна „{page_number}“: {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Невалиден pk „{pk_value}“ - објектот не постои."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Невалиден хиперлинк - не е внесен URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Невалиден хиперлинк - внесен е неправилен URL."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Невалиден хиперлинк - Објектот не постои."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Објектот со {slug_name}={value} не постои."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Невалидна вредност."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Ова поле мора да биде уникатно."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Полињата {field_names} заедно мора да формираат уникатен збир."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината."
 
@@ -361,6 +396,6 @@ msgstr "Невалидна верзија во hostname-от."
 msgid "Invalid version in query parameter."
 msgstr "Невалидна верзија во query параметарот."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo
index 968e11e9feb11497bd33ea33f8762646646af8d4..8bf83c6442c2e4c3d948937ecad82dd257705e64 100644
GIT binary patch
delta 93
zcmeBS>0y~Lnb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^{|GPw0NUFf;s5{u

delta 93
zcmeBS>0y~Lnb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHK2rvQw(cm4I

diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.po b/rest_framework/locale/nb/LC_MESSAGES/django.po
index bada69e64..6462590d2 100644
--- a/rest_framework/locale/nb/LC_MESSAGES/django.po
+++ b/rest_framework/locale/nb/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo
index c5546bedaab091fcf68b2346023ab324402ac857..aedfef2c5ca0c6fcab0cd15c9e2eb9d8bc2d2bf7 100644
GIT binary patch
delta 78
zcmdn&vDssTjtH-%u92aFp@EgDskVX9WJ?igF0hD!g_Wt<<Tw#=g^0wm%+w+U|Du%q
a!qQ3wn~Ho0%ONK-FTX4^ar0D>dHeua)EG(t

delta 78
zcmdn&vDssTjtH-Xu7R0?p|O>bp|*kHWJ?igE{KQ`P-JqPh`2&XMt*K$v4V3(QD$*T
WW~zcsNq(*a5GO+gHcu6q#}5EdhZp|<

diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po
index f11859920..11d2c080e 100644
--- a/rest_framework/locale/nl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/nl/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ongeldige basic header. Geen login gegevens opgegeven."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ongeldige basic header. login gegevens kunnen geen spaties bevatten."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ongeldige basic header. login gegevens zijn niet correct base64 versleuteld."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Ongeldige gebruikersnaam/wachtwoord."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Gebruiker inactief of verwijderd."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Ongeldige token header. Geen login gegevens opgegeven"
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ongeldige token header. Token kan geen spaties bevatten."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Ongeldige token."
 
@@ -87,11 +87,12 @@ msgstr "Authenticatie gegevens zijn niet opgegeven."
 msgid "You do not have permission to perform this action."
 msgstr "Je hebt geen toegang om deze actie uit te voeren."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Niet gevonden."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Methode \"{method}\" niet toegestaan."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kan niet voldoen aan de opgegeven \"Accept\" header."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Ongeldig media type \"{media_type}\" in aanvraag."
 
@@ -107,209 +109,238 @@ msgstr "Ongeldig media type \"{media_type}\" in aanvraag."
 msgid "Request was throttled."
 msgstr "Aanvraag was verstikt."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Dit veld is verplicht."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Dit veld mag niet leeg zijn."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" is een ongeldige boolean waarde."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Dit veld mag niet leeg zijn."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Zorg ervoor dat dit veld niet meer dan {max_length} karakters bevat."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Zorg ervoor dat dit veld minimaal {min_length} karakters bevat."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Voer een geldig e-mailadres in."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Deze waarde voldoet niet aan het benodigde formaat."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Voer een geldige \"slug\" in bestaande uit letters, cijfers, underscore of streepjes."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Voer een geldige URL in."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" in een ongeldige UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Een geldig getal is vereist."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Zorg ervoor dat deze waarde minder of gelijk is aan {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Zorg ervoor dat deze waarde groter of gelijk is aan {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Tekstuele waarde is te lang."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Een geldig nummer is verplicht."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Zorg ervoor dat er niet meer dan {max_digits} getallen zijn in totaal."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "zorg ervoor dat er niet meer dan {max_decimal_places} getallen achter de komma zijn."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} getallen voor de komma zijn."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datetime heeft een ongeldig formaat, gebruik 1 van de volgende formaten: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Verwacht een datetime, in plaats kreeg een date."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Date heeft het verkeerde formaat, gebruik 1 van de onderstaande formaten: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Verwacht een date, in plaats kreeg een datetime"
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Time heeft het verkeerde formaat, gebruik 1 van onderstaande formaten: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Tijdsduur heeft een verkeerd formaat, gebruik 1 van onderstaande formaten: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" is een ongeldige keuze."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Verwacht een lijst met items, kreeg een type \"{input_type}\" in plaats."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Er is geen bestand opgestuurd"
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "De verstuurde data was geen bestand. Controleer de encoding type op het formulier."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Bestandsnaam kan niet vastgesteld worden."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Het verstuurde bestand is leeg."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Zorg ervoor dat deze bestandsnaam minstens {max_length} karakters heeft (momenteel {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of mogelijk corrupt geraakt,"
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Verwacht een dictionary van items, in plaats kreeg een type \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ongeldige pagina \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Ongeldige cursor."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Ongeldig type. Verwacht een pk waarde, ontving {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Ongeldige hyperlink - Geen overeenkomende URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Ongeldige hyperlink - Ongeldige URL"
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ongeldige hyperlink - Object bestaat niet."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Object met {slug_name}={value} bestaat niet."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Ongeldige waarde."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ongeldige data. Verwacht een dictionary, kreeg een {datatype}."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Dit veld moet uniek zijn."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "De velden {field_names} moeten een unieke set zijn."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" datum."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" maand."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year."
 
@@ -361,6 +396,6 @@ msgstr "Ongeldige versie in host naam."
 msgid "Invalid version in query parameter."
 msgstr "Ongeldige versie in query parameter."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Toegang niet toegestaan."
diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo
index c23926d26ed0870921051882ccdd616d2626384e..90b5b93d7cc629fb169c02e9991fa62449848f1c 100644
GIT binary patch
delta 78
zcmZqjZt~usBf@K`Yh<WkXkcY(s%>C2*-}KB3oK$_VP$GIIZi}eAtJFXGqp&;zbGZY
au(VRarXnB0a>&Wd%P-4J+&op}tpET$!5BUO

delta 78
zcmZqjZt~usBf@K;Yhb2eXl!L<sBK_4*-}KB3nF3!6qy_+BCZgUk)NAbtl*qclv!Mo
WnW|t@lAr4U#K};B%~M6*3IG5#bQkjg

diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po
index 482b34c49..c9b3798cc 100644
--- a/rest_framework/locale/pl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pl/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +20,40 @@ msgstr ""
 "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"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Niepoprawny podstawowy nagłówek. Ciąg znaków danych uwierzytelniających nie powinien zawierać spacji."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Użytkownik nieaktywny lub usunięty."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Niepoprawny nagłówek tokena. Token nie może zawierać odstępów."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Niepoprawny token."
 
@@ -89,11 +89,12 @@ msgstr "Nie podano danych uwierzytelniających."
 msgid "You do not have permission to perform this action."
 msgstr "Nie masz uprawnień, by wykonać tę czynność."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Nie znaleziono."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Niedozwolona metoda \"{method}\"."
 
@@ -102,6 +103,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Nie można zaspokoić nagłówka Accept żądania."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
 
@@ -109,209 +111,238 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
 msgid "Request was throttled."
 msgstr "Żądanie zostało zdławione."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "To pole jest wymagane."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Pole nie może mieć wartości null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" nie jest poprawną wartością logiczną."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "To pole nie może być puste."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Upewnij się, że to pole ma nie więcej niż {max_length} znaków."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Podaj poprawny adres e-mail."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Ta wartość nie pasuje do wymaganego wzorca."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Wprowadź poprawną wartość pola typu \"slug\", składającą się ze znaków łacińskich, cyfr, podkreślenia lub myślnika."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Wprowadź poprawny adres URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" nie jest poprawnym UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Wymagana poprawna liczba całkowita."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Upewnij się, że ta wartość jest mniejsza lub równa {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Upewnij się, że ta wartość jest większa lub równa {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Za długi ciąg znaków."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Wymagana poprawna liczba."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Upewnij się, że liczba ma nie więcej niż {max_digits} cyfr."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Upewnij się, że liczba ma nie więcej niż {max_decimal_places} cyfr dziesiętnych."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Upewnij się, że liczba ma nie więcej niż {max_whole_digits} cyfr całkowitych."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Wartość daty z czasem ma zły format. Użyj jednego z dostępnych formatów: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Oczekiwano datę z czasem, otrzymano tylko datę."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Data ma zły format. Użyj jednego z tych formatów: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Oczekiwano daty a otrzymano datę z czasem."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Błędny format czasu. Użyj jednego z dostępnych formatów: {format}"
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Czas trwania ma zły format. Użyj w zamian jednego z tych formatów: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" nie jest poprawnym wyborem."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Nie przesłano pliku."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Przesłane dane nie były plikiem. Sprawdź typ kodowania formatki."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Nie można określić nazwy pliku."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Przesłany plik jest pusty."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Upewnij się, że nazwa pliku ma długość co najwyżej {max_length} znaków (aktualnie ma {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafiką lub jest uszkodzony."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Oczekiwano słownika, ale otrzymano  \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Niepoprawna strona \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Niepoprawny wskaźnik"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Błędny klucz główny \"{pk_value}\" - obiekt nie istnieje."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Błędny typ danych. Oczekiwano wartość klucza głównego, otrzymano {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Błędny hyperlink - nie znaleziono pasującego adresu URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Błędny hyperlink - błędne dopasowanie adresu URL."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Błędny hyperlink - obiekt nie istnieje."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Błędny typ danych. Oczekiwano adresu URL, otrzymano {data_type}"
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Obiekt z polem {slug_name}={value} nie istnieje"
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Niepoprawna wartość."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano  {datatype}."
 
@@ -332,18 +363,22 @@ msgid "This field must be unique."
 msgstr "Wartość dla tego pola musi być unikalna."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Pola {field_names} muszą tworzyć unikalny zestaw."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "To pole musi mieć unikalną wartość dla jednej daty z pola \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "To pole musi mieć unikalną wartość dla konkretnego miesiąca z pola \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{date_field}\"."
 
@@ -363,6 +398,6 @@ msgstr "Błędna wersja w nazwie hosta."
 msgid "Invalid version in query parameter."
 msgstr "Błędna wersja w parametrach zapytania."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Brak uprawnień."
diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo
index b7c95f60a34a4500a06cede454a6afc4f7ce3b98..84ad8acc7f10da60ac704ac616a4e774c76fd809 100644
GIT binary patch
delta 93
zcmZo=X=Rx(nb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^|8Oz_0M*4E%>V!Z

delta 93
zcmZo=X=Rx(nb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHKa54e_%*q{t

diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po
index 4e1399619..213d0fdc9 100644
--- a/rest_framework/locale/pt/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo
index a977651fdecdddbf7c79a2bf26476c6d2928ad9c..fc203d9bb61c23dc24ae159d085e26bbc5426d61 100644
GIT binary patch
delta 2961
zcma)+Yiu0V6@c$1j^jAwVdr7T$vW3-D2*L&)&@J^1RRo0h=a)n$A+|2vc|g;JjFA2
zGqbyDnxg%YAFV1?6&m;fN+~E&A+4x@6)I{Y)MnLGMWR%#5JadYEkc!|hzJA-fq;Hz
zb|M9V5J!9FyYG8mci+GL!#k`0Zf|;6AyeoE^vnXKj==9N;)CeLO7*}VsNpVn9W20Z
z_*2*kPea*%7OsbH!U6aR+zdChD76#b4fnuD8my`dG;U|$`Xx&3fCk<TpMhK9;#Q@$
z!7+FTJO)SMU!cq{SgO<n9EH8`$FLp#28uy1#^Z0q{2a=8z1Ju;tg1@Q&=8LvhH~&9
z;7#yDI0m;Y!)s_@8rI-)_+KdN-i6<WeGE#Z4#GZIhBE#*%)r0GH2fHj!%Zucx`q2y
zK!Y*$EbM}RjQeju@#rEHPnNH2upi3!UMQZ<LrFyyUJoCGYvDPl;lJQ2_!(@1?QKdC
zJk<fKTWF+c$U&1(HrlWQ{s?B^Lr_xmXDEg&W3kNlLFw;=lJglj0*^sS&2w@8A{57Z
zutL^thZ-JQMf}BpqYOxKoQD1I5*&n`tCji=+y~deQ!!tJL-b#V=MzdTUDMe2Hr7ij
z+ptay*$Pw8gJS4|@LTY=@%XD9#D6OTA2A>XWGLk<4B#E`1t_^{;&$ophf=+d!tcWW
z#Qp8KC-cYQz3>%y8|=s3-Oz=Tum+_znz2SAJy@k77Vm}Pu^01kC<pul?trV46bzh(
z+hG-o;b&kDz8^D7A&k<02$F8~3KYjKKsmp6V<U3YP|mCVgvJ1k=b)tG0^9~yYNhUh
z6L23q1?9lY5SyY>mwvLRaZnmwOaBn$F7-e>egcwybq<Q7=b=R4bBN7V)klJ4U@s&(
zDuBE^^>Zi}oPbgjPeVEAJS6Sv64WrkQ;=Fn!F%B}<ZSgUl=J=x`Kil%#IRLZc>^4Z
zSXJsU4LRUZD4x9x<$#M&EWU=1L}m!?hO<zL>nSLadK2CU*Hc*pPaTJNrcS~e;h$gv
zE=0d1+#ktZe7P_3TrLq$#fTkf8+t|d#trH#5=o8ZbrPLGH>1>Y^jv|u8I?bw+oXdm
zM#bnQ(m|>i7d@^0Pzqugl|Lhq1*p`<m~@a<R6^K{-ik`J7NHuIkczhwDG@1BiP9C3
z6!J$I743?6kc?EL>Xh)yU+Et77Br1!P*NO;{Ht9pyviulJo_lrGAA{0MWmi~p?9K7
zQF&_eJjs+gfacIF+9Eei(U3wph>FPbk-`%hNBJ*`q=|3%Qgc^$ws~{-a&t#h(JIZ=
z-fEsnv}DV^RdS3MCfmnqJ6pU3tHuvhZq&xta70^$f^P@4U$*{kVY}m1ta+!P^K+JO
z<x937gqN3f)<%}UuyADF2};_vj%v@8^sKFIw^%xwR#S6MpaXl}&dVKNT2T96+dB#8
z=7FI>J(w9C9`4T!WiqV?as!ig#R=FkkhMzos2<7;4i99ab(xz+he!G|Nb7_Zlm@1J
z%M0eMlJQ6NA*<rpzRvjtbEJG!Z~uX5w06upo~bxi?bg-zC&J@v+Ow9ngS?ravvj5Y
z1U^~1h)=rg>b&JT-keFR)G@p*+Yh9)S3hZV{j|(ZPmgEgEv9yEO*s)>UfZ!mVpxBY
zRkgN`ml7*2|47-X7+tbm?b@CRAM4x@wye9fY1}((eAkwPY_DMZcKt~sVJ6(=Mz|Z+
znDD)IN5a9bHP_jC&R~~o1=_ds_N-lIv!x4G$x5r;LDBZDf(f7MdT(*ushwKioLCz9
zWK>orpWiUuwad7(j@PhJPft#0$IBbvw@X%-Om?n6h@ttbmqfv^WTng}a^Xy}H(`ax
zlV_7f69i?)Cr*tTumcW@%?`r9C40jD?y*EU{C@W~cKoV)6W_mgU(5G{?i0)Q+uj`B
zHzE}NV&k5K8@|2qerE5|`M&z^Jtt4-b2wNqIw;S&cFCc2RR-d%Z|VJu?4VSCA{^-{
zR#V4_h&^-IvF8gUtYBAcs?OJq0~@)$61AM9xM=h@*<-X@|8*b+eeIt1FI;4_Mb5XR
z*5=}2$yCYG@<gnLD@9Y_iO}_R#rmNW<&rshC{Z1K^{Q}RYDnsB(G;)Cgl!#t;hEId
z6;lr0aGqO#y5Lwk{4_N-YiY-|?jx;nd8c(Q4!WWAcnV(?)aaCW9|akOm%8wM;}*$6
cTJ16(R&rH2D2G4m%{IGE5Y$hGuk|MX4<6Mw<NyEw

delta 2530
zcma*ndu$X%9Ki88T3&5=7A!42JJ-@efh*VYv<2Hz%Cir}79yZzx!ckWz1#Elu0~NB
zjfsdvVm8P>M5)FHpeA^l$Roj|nixsIm>8{z#t@8;phQLf(L}$$y=_9Ge>l0>&&=HJ
zyneHLtMlfDp>Jm9A629-ayj|%IHmUCU-?`}Z%j}sgeOtsCA<@_;~XrUn0sy>&ZXXp
zVSE4=<FmLH-^ca%CvL#Clay*vYDgWTu#JXGxDqQTE7gQMa0|YGjd&I1|6qYq9oUOA
z@nw{WzlT-$neQ!>e##1!T8`VW8V{rN_YSUNeDyPhW*TaWlxo91tiw|{6-RLu{(uWG
zG$pqqn{gra0hIP*7{L!vp8plspr#Y)=Rq!I829T3v5N84F$%JR^S)ooAJqRqSz+n4
z+?FrK`P8@I9q6FOLs*QbQKEJcS-koXm*5qYe*Q*zZsv5QO0X7(WX7!&Bqk}8iJU{Z
z;S0Zh10}XaGn86^3s6F_+pix(S=nWj0e?h^c`2hV!d+O82l0M9hov~HnEjVR9n){X
zjW`-mYCp<@y|Z&Mdjd7}*HI?;G1lOBScyd}OD41gW#GNI4o~40yy4r#s^kzpjXUsi
z3HvV%wH#%+F^RkI0=8l)vunqlxD|(yzSK>W!&Jz!Wo7j!v5sO34*OokTIyA7-)ii{
zMm&Vw_|cGGn9Z`}4-?sKbpmB2XHX8=O_W1c5zKYC5yR9|C|iC4oA6WIj77Yo($98e
z2-WY`pF)|?QJjZE7b);l*Ze>7DsqP<jIzQOlnL}9b5PIw^|$@{DDq;cTPOqO>0Ib$
zAz@Z6I1BGXeyX2~?ASAC$oqeuLWqVS7nx}@%IV*UGO;0y;ETRjd?oPguBu1bfeviO
z$8ZH+@ckXPQ(s7@(%+NFCaGauChz}63IQ7UFey!zgC$AgE=dNLv(Y7$+Y;X+@4LXl
zy~Epzo#aVmc}+Kw3(1Sf@_I^G#?pkb0^@tL9jnVqB#yEZ9B%J}1YWv}tHex_Z220m
zl)FewCCM4`b_HcO*eov$;O(lon7oX<ku2kTab7M3lDrL)#*;bZUgBl&k{m$3Nvee`
zXF}pFNe<#zlJ7`?Um1sM$*alo*5r{TNf>woC4voJEbgYlH$(BoR7=Tn&{mS`$Z~k5
zk>!2PCwI8PiJP*AC-wxg^Cu_9WzQDAmgk<HGCg~C+QGc+f#UB2)~ax1g|1)P*igSH
zQXh#F+|wQ2Y7SbCWhcVxjI`OP8zS|~!;##54c>hb?&~m|bhsyFB%A>wZKoP_Prn^E
z9NpHRvYfPK>eXpG-a?N04cW`H_XXT!Nol?@V8yaWN-}|LSLunsj6N&cZ(1o^r_H#I
zn+e-JQ&#Sl&Asl{m)q^k!O*7ew^N38MqaUX!i<`ZGcugAY)8w8M$$|`Om6J6Eo~;E
zb|RfJVn&^6camnx&bVKd|K=VE7G*yV<_8LmfswajwvwLRYj^e*_ipXbQ9HiJO4u1~
zrg+kJLltvoNP9wt9Q#vR1Gf88MHSaKrv}|`D_(WK*41uasEL;5P%T$0G>_|Zq2opC
z#}-B>?#jyb;}VX0pmHDo{!|%Vl1W%myH0h>%wsIY$?S=nX-kR;!)7HZBd#-X?Qf6!
za8=j%k&_N{{-i276f*}+?U*U;b)%E!fRWpQ%KdDFxx3FY2V##`(!Y)x@uaQ){eZ2F
z#K^n)|36^p_{b^8d!YLEA=(|s{LfL`NOi-q9#e*w*s`QJXT{&*I^F9SvcMSOG#$+i
zgXW_;W;u@S9<OdI=rm)Nq0^5fP4}1T=6kgjH}=X+Bg32@yH0m&BlS?m8nihDi5Q{t
rVkIYlPW_u{m4>LDN@bF1w!4j^!A_Yv<G4p^)=hBYjAyu`HNk%X4T`Wl

diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
index f3080b9ff..7fdefbd5c 100644
--- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Craig Blaszczyk <masterjakul@gmail.com>, 2015
+# Ederson  Mota Pereira <edermp@gmail.com>, 2015
 # Filipe Rinaldi <filipe.rinaldi@gmail.com>, 2015
+# Hugo Leonardo Chalhoub Mendonça <hugoleonardocm@live.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,46 +21,46 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Cabeçalho básico inválido. Credenciais não fornecidas."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
-msgstr "Usário ou senha inválido."
+msgstr "Usuário ou senha inválido."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Usuário inativo ou removido."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Cabeçalho de token inválido. Credenciais não fornecidas."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
-msgstr ""
+msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Token inválido."
 
 #: authtoken/serializers.py:20
 msgid "User account is disabled."
-msgstr "Conta de usário desabilitada."
+msgstr "Conta de usuário desabilitada."
 
 #: authtoken/serializers.py:23
 msgid "Unable to log in with provided credentials."
@@ -86,13 +88,14 @@ msgstr "As credenciais de autenticação não foram fornecidas."
 
 #: exceptions.py:99
 msgid "You do not have permission to perform this action."
-msgstr "Você não tem persmissao para executar essa ação."
+msgstr "Você não tem permissão para executar essa ação."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Não encontrado."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Método \"{method}\" não é permitido."
 
@@ -101,218 +104,248 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
-msgstr "Media type \"{media_type}\" no pedido não é suportado."
+msgstr "Tipo de mídia  \"{media_type}\" no pedido não é suportado."
 
 #: exceptions.py:145
 msgid "Request was throttled."
 msgstr "Pedido foi limitado."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Este campo não pode ser nulo."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" não é um valor boleano válido."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Este campo não pode ser em branco."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Certifique-se de que este campo tenha mais de {min_length} caracteres."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Insira um endereço de email válido."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Este valor não corresponde ao padrão exigido."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Entrar um \"slug\" válido que consista de letras, números, sublinhados ou hífens."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Entrar um URL válido."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr "\"{value}\" não é um UUID valid."
+msgstr "\"{value}\" não é um UUID válido."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Informe um endereço IPv4 ou IPv6 válido."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Um número inteiro válido é exigido."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Certifique-se de que este valor seja inferior ou igual a {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Certifque-se de que este valor seja maior ou igual a {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Valor da string é muito grande."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Um número válido é necessário."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Certifique-se de que não haja mais de {max_digits} dígitos no total."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Certifique-se de que não haja mais de {max_decimal_places} casas decimais."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Certifique-se de que não haja mais de {max_whole_digits} dígitos antes do ponto decimal."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
-msgstr "Data e hora são necessários mas apenas data foi encontrada."
+msgstr "Necessário uma data e hora mas recebeu uma data."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Necessário uma data mas recebeu uma data e hora."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
-msgstr "Tempo tem formato errado. Usa um desses em vez disso: {format}."
+msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" não é um escolha válido."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
-msgstr ""
+msgstr "Esta seleção não pode estar vazia."
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" não é uma escolha válida para um caminho."
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
-msgstr "Ficheiro não foi submetido."
+msgstr "Nenhum arquivo foi submetido."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
-msgstr "Os dados submetidos nao foram um ficheiro. Certifique-se do tipo de codificação no formulário."
+msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Nome do arquivo não pode ser determinado."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
-msgstr "O arquivo submetido ésta vázio."
+msgstr "O arquivo submetido está vázio."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
-msgstr "Certifique-se de que o nome do ficheiro tem menos de {max_length} caracteres (tem {length})."
+msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr "Fazer upload de um imagem válido. O arquivo mandou não foi um imagem ou foi corrupto."
+msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
-msgstr ""
+msgstr "Esta lista não pode estar vazia."
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr "Esperou um dicionário de itens mas recebeu tipo \"{input_type}\"."
+msgstr "Esperado um dicionário de itens mas recebeu tipo \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
-msgstr "Página inválido \"{page_number}\": {message}."
+msgstr "Página inválida \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
-msgstr "Cursor invalído"
+msgstr "Cursor inválido"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Pk inválido \"{pk_value}\" - objeto não existe."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr "Tipo incorreto. Necessário valor pk, recebeu {data_type}."
+msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
-msgstr "Hyperlink inválido - URL não combinou."
+msgstr "Hyperlink inválido - Sem combinação para a URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
-msgstr "Hyperlink inválido - URL combinou errado."
+msgstr "Hyperlink inválido - Combinação URL incorreta."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
-msgstr "Hyperlink inválido - objeto não existe."
+msgstr "Hyperlink inválido - Objeto não existe."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objeto com {slug_name}={value} não existe."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Valor inválido."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
-msgstr "Data inválido. Necessário um dicionário mas recebeu {datatype}."
+msgstr "Dado inválido. Necessário um dicionário mas recebeu {datatype}."
 
 #: templates/rest_framework/horizontal/radio.html:2
 #: templates/rest_framework/inline/radio.html:2
@@ -324,44 +357,48 @@ msgstr "Nenhum(a/as)"
 #: templates/rest_framework/inline/select_multiple.html:2
 #: templates/rest_framework/vertical/select_multiple.html:2
 msgid "No items to select."
-msgstr "Nenhum itens para escholher."
+msgstr "Nenhum item para escholher."
 
 #: validators.py:24
 msgid "This field must be unique."
-msgstr "Esse campo deve ser unico."
+msgstr "Esse campo deve ser  único."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
-msgstr "Os campos {field_names} devem criar um set unico."
+msgstr "Os campos {field_names} devem criar um set único."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
-msgstr "O campo deve ser unico pela data \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para a data."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
-msgstr "O campo deve ser unico pelo anô \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para o mês."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
-msgstr "O campo deve ser unico pela mês \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para o ano."
 
 #: versioning.py:42
 msgid "Invalid version in \"Accept\" header."
-msgstr "Versão inválido no cabeçalho \"Accept\"."
+msgstr "Versão inválida no cabeçalho \"Accept\"."
 
 #: versioning.py:73 versioning.py:115
 msgid "Invalid version in URL path."
-msgstr "Versão inválido no caminho de URL."
+msgstr "Versão inválida no caminho de URL."
 
 #: versioning.py:144
 msgid "Invalid version in hostname."
-msgstr "Versão inválido no hostname."
+msgstr "Versão inválida no hostname."
 
 #: versioning.py:166
 msgid "Invalid version in query parameter."
 msgstr "Versão inválida no parâmetro de query."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
-msgstr "Permissão negado."
+msgstr "Permissão negada."
diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo
index 66b7505479c152b7c9dd721b2bdb645cf6f35d5d..18198f0165df6a89e65af76d6971af1b19fb4fd3 100644
GIT binary patch
delta 93
zcmbQnGL2=zWL`^MBSQs411nQgZ3Cl;3#1*v0tOaVre@j(K)~gbSX`nTQk0lioRe6R
oUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hy{3FE(0OB7W00000

delta 93
zcmbQnGL2=zWL^th12Y9fV=E&=Z3DxJ3#1((0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
jg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-%_BgF^+*(4pc

diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
index 33cb7ea14..45c8fe2d3 100644
--- a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo
index e6a12ef6d3c8db922e23a1783f7e6081d6dc0f1a..cf41cba12a94b4f3650726a4190b0737734b741a 100644
GIT binary patch
delta 96
zcmcZ~c|USPqA;(eu92aFp@EgDskVX9<UC<%N3e*2g_Wt9wgC`u`6L#X=!O&}<`w58
rmgE;%DMTceWu_J>_!p(*7nW8k*i__0SPnUvdHH3TiJMOei%J3jbd(<!

delta 96
zcmcZ~c|USPqA;(8u7R0?p|O>bp|*kH<UC<%M~H|KSj51<fXgSbxI{OkC^4@%C$S{I
m$Vwq3BR@B>Siw1?D6_aEGgZN+BtO>yh?AiLn@<UgN&*0DOCHMr

diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po
index a016e84e9..9a2fb7c02 100644
--- a/rest_framework/locale/ru/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ru/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Russian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +20,40 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Недопустимый заголовок. Не предоставлены учетные данные."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Недопустимые имя пользователя или пароль."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Пользователь неактивен или удален."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Недопустимый токен."
 
@@ -89,11 +89,12 @@ msgstr "Учетные данные не были предоставлены."
 msgid "You do not have permission to perform this action."
 msgstr "У вас нет прав для выполнения этой операции."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Не найдено."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Метод \"{method}\" не разрешен."
 
@@ -102,6 +103,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе."
 
@@ -109,209 +111,238 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в
 msgid "Request was throttled."
 msgstr "Запрос был проигнорирован."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Это поле обязательно."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Это поле не может быть null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" не является корректным булевым значением."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Это поле не может быть пустым."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Убедитесь что в этом поле не больше {max_length} символов."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Убедитесь что в этом поле как минимум {min_length} символов."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Введите корректный адрес электронной почты."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Значение не соответствует требуемому паттерну."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Введите корректный URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" не является корректным UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Требуется целочисленное значение."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Убедитесь что значение меньше или равно {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Убедитесь что значение больше или равно {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Слишком длинное значение."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Требуется численное значение."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Убедитесь что в числе не больше {max_digits} знаков."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Убедитесь что в цисле не больше {max_whole_digits} знаков в целой части."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат datetime. Используйте один из этих форматов:  {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Ожидался datetime, но был получен date."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат date. Используйте один из этих форматов: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Ожидался date, но был получен datetime."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" не является корректным значением."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Ожидался list со значениями, но был получен \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Не был загружен файл."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Загруженный файл не является корректным файлом. "
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Невозможно определить имя файла."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Загруженный файл пуст."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Недопустимая страница \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Не корректный курсор"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Недопустимая ссылка - нет совпадения по URL."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Недопустимая ссылка - некорректное совпадение по URL,"
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Недопустимая ссылка - объект не существует."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Некорректный тип. Ожидался URL, получен {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Объект с {slug_name}={value} не существует."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Недопустимое значение."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}."
 
@@ -332,18 +363,22 @@ msgid "This field must be unique."
 msgstr "Это поле должно быть уникально."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Поля {field_names} должны производить массив с уникальными значениями."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Это поле должно быть уникально для даты \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Это поле должно быть уникально для месяца \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Это поле должно быть уникально для года \"{date_field}\"."
 
@@ -363,6 +398,6 @@ msgstr "Недопустимая версия в имени хоста."
 msgid "Invalid version in query parameter."
 msgstr "Недопустимая версия в параметре запроса."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo
index 47bb7b62a792ef9262bae028928aa80528dabd08..f80b9568a755d7631bcf4e58b21356c634a058fb 100644
GIT binary patch
delta 96
zcmdnuwZ&^gqA;(eu92aFp@EgDskVX9<UC<%N3e*2g_Wt9wgC`u`6L#X=!O&}<`w58
rmgE;%DMTceWu_J>_!p(*7nW8k*i__0SPnUvdHH3TiJMOeX9)rTN=P2>

delta 96
zcmdnuwZ&^gqA;(8u7R0?p|O>bp|*kH<UC<%M~H|KSj51<fXgSbxI{OkC^4@%C$S{I
m$Vwq3BR@B>Siw1?D6_aEGgZN+BtO>yh?AiLn@<U62?78>{~n|O

diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po
index 7ac9f5686..ee171b51d 100644
--- a/rest_framework/locale/sk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/sk/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Nesprávne prihlasovacie údaje."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Daný používateľ je neaktívny, alebo zmazaný."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Nesprávny token."
 
@@ -87,11 +87,12 @@ msgstr "Prihlasovacie údaje neboli zadané."
 msgid "You do not have permission to perform this action."
 msgstr "K danej akcii nemáte oprávnenie."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Nebolo nájdené."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metóda \"{method}\" nie je povolená."
 
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"."
 
@@ -107,209 +109,238 @@ msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"."
 msgid "Request was throttled."
 msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Toto pole je povinné."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Toto pole nemôže byť nulové."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" je validný boolean."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Toto pole nemože byť prázdne."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Uistite sa, že toto pole nemá viac ako {max_length} znakov."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Uistite sa, že toto pole má viac ako {min_length} znakov."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Vložte správnu emailovú adresu."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Toto pole nezodpovedá požadovanému formátu."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Zadajte platný \"slug\", ktorý obsahuje len malé písmená, čísla, spojovník alebopodtržítko."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Zadajte platnú URL adresu."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" nie je platné UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Je vyžadované celé číslo."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Uistite sa, že hodnota je menšia alebo rovná {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Uistite sa, že hodnota je väčšia alebo rovná {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Zadaný textový reťazec je príliš dlhý."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Je vyžadované číslo."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_digits} cifier."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_decimal_places}  desatinných miest."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_whole_digits} cifier pred desatinnou čiarkou."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Nesprávny formát dátumu a času. Prosím použite jeden z nasledujúcich formátov: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Vložený len dátum - date namiesto dátumu a času - datetime."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Nesprávny formát dátumu. Prosím použite jeden z nasledujúcich formátov: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Nesprávny formát času. Prosím použite jeden z nasledujúcich formátov: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" je nesprávny výber z daných možností."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Bol očakávaný zoznam položiek, no namiesto toho bol nájdený \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Nebol odoslaný žiadny súbor."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Odoslané dáta neobsahujú súbor. Prosím skontrolujte kódovanie - encoding type daného formuláru."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Nebolo možné určiť meno súboru."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Odoslaný súbor je prázdny."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Uistite sa, že meno súboru neobsahuje viac ako {max_length} znakov. (V skutočnosti ich má   {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Uploadujte prosím obrázok. Súbor, ktorý ste uploadovali buď nie je obrázok, alebo daný obrázok je poškodený."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Nesprávne číslo stránky \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Nesprávny kurzor."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Nesprávny primárny kľúč \"{pk_value}\" - objekt s daným primárnym kľúčom neexistuje."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Nesprávny typ. Bol prijatý {data_type} namiesto primárneho kľúča."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Nesprávny hypertextový odkaz - žiadna zhoda."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Nesprávny hypertextový odkaz - chybná URL."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Nesprávny typ {data_type}. Požadovaný typ: hypertextový odkaz."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt, ktorého atribút \"{slug_name}\" je \"{value}\" neexistuje."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Nesprávna hodnota."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{datatype}\"."
 
@@ -330,18 +361,22 @@ msgid "This field must be unique."
 msgstr "Táto položka musí byť unikátna."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Dané položky:  {field_names} musia tvoriť musia spolu tvoriť unikátnu množinu."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Položka musí byť pre špecifický deň \"{date_field}\" unikátna."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Položka musí byť pre mesiac \"{date_field}\" unikátna."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Položka musí byť pre rok \"{date_field}\" unikátna."
 
@@ -361,6 +396,6 @@ msgstr "Nesprávna verzia v \"hostname\"."
 msgid "Invalid version in query parameter."
 msgstr "Nesprávna verzia v parametri požiadavku."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo
index 5a5efc5f3e9dbf666aaa40879294e9d809d2ae1d..e2e4717ba5abaf40f031f585f33f966b56535eb2 100644
GIT binary patch
delta 96
zcmZ4QwccyPArW3nT_ZyULjx;QQ*8sI$>&9+9l;_77FMQa+6F+t<&#)kq8n0_m{**W
rSdw34r4W%=mYG_l;9r!IUszhHU{jF~VL9Yv=H-`VCT`XiWf1@Xf_EOJ

delta 96
zcmZ4QwccyPArW2+T>~=(Lt`r=Lu~`Y$>&9+9U&q{U=afY11_J$;u77EqQt!7oWzp+
mA}fWEjQrfhVg=`nqRirw%v1%NlKfl;AWnt~Y}OWK5dZ*rE*@F{

diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.po b/rest_framework/locale/sv/LC_MESSAGES/django.po
index 159068df6..daebfb63a 100644
--- a/rest_framework/locale/sv/LC_MESSAGES/django.po
+++ b/rest_framework/locale/sv/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Ogiltigt användarnamn/lösenord."
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Användaren borttagen eller inaktiv."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla ogiltiga tecken."
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Ogiltig \"token\"."
 
@@ -88,11 +88,12 @@ msgstr "Autentiseringsuppgifter ej tillhandahållna."
 msgid "You do not have permission to perform this action."
 msgstr "Du har inte tillåtelse att utföra denna förfrågan."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Hittades inte."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metoden \"{method}\" tillåts inte."
 
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Medietypen \"{media_type}\" stöds inte."
 
@@ -108,209 +110,238 @@ msgstr "Medietypen \"{media_type}\" stöds inte."
 msgid "Request was throttled."
 msgstr "Förfrågan stoppades eftersom du har skickat för många."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Det här fältet är obligatoriskt."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Det här fältet får inte vara null."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" är inte ett giltigt booleskt värde."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Det här fältet får inte vara blankt."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Se till att detta fält inte har fler än {max_length} tecken."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Se till att detta fält har minst {min_length} tecken."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Ange en giltig mejladress."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Det här värdet matchar inte mallen."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Ange en giltig \"slug\" bestående av bokstäver, nummer, understreck eller bindestreck."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Ange en giltig URL."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value} är inte ett giltigt UUID."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Ange en giltig IPv4- eller IPv6-adress."
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Ett giltigt heltal krävs."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Se till att detta värde är mindre än eller lika med {max_value}."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Se till att detta värde är större än eller lika med {min_value}."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "Textvärdet är för långt."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Ett giltigt nummer krävs."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Se till att det inte finns fler än totalt {max_digits} siffror."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Se till att det inte finns fler än {max_decimal_places} decimaler."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Se till att det inte finns fler än {max_whole_digits} siffror före decimalpunkten."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {format}."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Förväntade en datumtid men fick ett datum."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Förväntade ett datum men fick en datumtid."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "Perioden har fel format. Använd ett av dessa format istället: {format}."
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" är inte ett giltigt val."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Förväntade en lista med element men fick typen \"{input_type}\"."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Ingen fil skickades."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Inget filnamn kunde bestämmas."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Den skickade filen var tom."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Förväntade en \"dictionary\" med element men fick typen \"{input_type}\"."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ogiltigt sida \"{page_number}\": {message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Ogiltig cursor."
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Ogiltig hyperlänk - Ingen URL matchade."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Ogiltig hyperlänk - Felaktig URL-matching."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ogiltig hyperlänk - Objektet finns inte."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt med {slug_name}={value} finns inte."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Ogiltigt värde."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ogiltig data. Förväntade en dictionary, men fick {datatype}."
 
@@ -331,18 +362,22 @@ msgid "This field must be unique."
 msgstr "Det här fältet måste vara unikt."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Fälten {field_names} måste skapa ett unikt set."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Det här fältet måste vara unikt för datumet \"{date_field}\"."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Det här fältet måste vara unikt för månaden \"{date_field}\"."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Det här fältet måste vara unikt för året \"{date_field}\"."
 
@@ -362,6 +397,6 @@ msgstr "Ogiltig version i värdnamnet."
 msgid "Invalid version in query parameter."
 msgstr "Ogiltig version i förfrågningsparametern."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Åtkomst nekad."
diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo
index fc61233feaa6d8eeba10205f37efbf793f28bf26..aa35f51c9f0950dcfdec9520ac13aaf39a63a2ff 100644
GIT binary patch
delta 118
zcmezE{@Z=SRpCraT_ZyULjx;QQ*8qy0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(XhF
zIs*$UQ!{M?AmH*zEH2RvDN4*M&PgoEFS1gING!`tEmH6=O35!QtyHk7$cL~Tax(Ms
N%Q6!;+llPu2LOHeCQJYT

delta 118
zcmezE{@Z=SRpCqvT>~=(Lt`r=Lu~^?0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPQ(Xgy
zIwP<;1E4ye#Nra&kfOxA;+({i{30ubkc|A?#9{^KjH1lqlFU>Eo09xo2Ov&{3T(C$
H*~<?AbZsU9

diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po
index 5e5818a8b..30b587036 100644
--- a/rest_framework/locale/tr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/tr/LC_MESSAGES/django.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,40 +23,40 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış."
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli."
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış."
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "Geçersiz kullanıcı adı/parola"
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "Kullanıcı aktif değil ya da silinmiş."
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik."
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı."
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "Geçersiz token."
 
@@ -92,11 +92,12 @@ msgstr "Giriş bilgileri verilmedi."
 msgid "You do not have permission to perform this action."
 msgstr "Bu işlemi yapmak için izniniz bulunmuyor."
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "Bulunamadı."
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "\"{method}\" metoduna izin verilmiyor."
 
@@ -105,6 +106,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil."
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"."
 
@@ -112,209 +114,238 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"."
 msgid "Request was throttled."
 msgstr "Üst üste çok fazla istek yapıldı."
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "Bu alan zorunlu."
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "Bu alan boş bırakılmamalı."
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" geçerli bir boolean değil."
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "Bu alan boş bırakılmamalı."
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun."
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun."
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "Geçerli bir e-posta adresi girin."
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor."
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz."
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "Geçerli bir URL girin."
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" geçerli bir UUID değil."
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "Geçerli bir tam sayı girin."
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun."
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun."
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "String değeri çok uzun."
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "Geçerli bir numara gerekiyor."
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun."
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun."
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun."
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın."
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "Datetime değeri bekleniyor, ama date değeri geldi."
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın."
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi."
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın."
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" geçerli bir seçim değil."
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı."
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "Hiçbir dosya verilmedi."
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin."
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "Hiçbir dosya adı belirlenemedi."
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "Gönderilen dosya boş."
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)."
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk."
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı."
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Geçersiz sayfa \"{page_number}\":{message}."
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "Sayfalandırma imleci geçersiz"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı."
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}."
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "Geçersiz bağlantı - Hiçbir URL eşleşmedi."
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "Geçersiz bağlantı - Yanlış URL eşleşmesi."
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "Geçersiz bağlantı - Obje bulunamadı."
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı."
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı."
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "Geçersiz değer."
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. "
 
@@ -335,18 +366,22 @@ msgid "This field must be unique."
 msgstr "Bu alan eşsiz olmalı."
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar."
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı."
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı."
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı."
 
@@ -366,6 +401,6 @@ msgstr "Host adında geçersiz versiyon."
 msgid "Invalid version in query parameter."
 msgstr "Sorgu parametresinde geçersiz versiyon."
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "Erişim engellendi."
diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo
index 01777ca5cb14bec83275b841cd7d1042b336cc10..580ae75400d243a901a498104f6b7672420619d2 100644
GIT binary patch
delta 93
zcmeBT>0+5Mnb%U+$WX!1z{=EA+rVhz0%=FEfPsaTshPF`5ODb<7MJLT6eZ>r=OmWo
o7g;GpB$j2S7Ag1_rQ{cuRw~$3<U?2vIhlF+WtoW^|L`#a0NH09+yDRo

delta 93
zcmeBT>0+5Mnb$(sz)Zo=*viOI+rV(*0%=ExfDu^0z`%gZC$YFhH>4;ruQ(^MB)`Z?
jAtWO|H?dg3Iio1ExFj=G!KNfX*8zx=p#mHK@G$}a&}<!%

diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
index 5bf503dff..52e6e5072 100644
--- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo
index e981153d68bf4c7c73d7322eab0bcd088a857e09..5e8e0ed5fdf2006196b2af0bb7046f233db246e2 100644
GIT binary patch
delta 93
zcmX@da*k!fWL`^MBSQs411nQgZ3Cl;3#1*v0tOaVre@j(K)~gbSX`nTQk0lioRe6R
oUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hy{1e0o01Dn7r~m)}

delta 93
zcmX@da*k!fWL^th12Y9fV=E&=Z3DxJ3#1((0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
jg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-%_6T}Dr0plKB

diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po
index d369ca260..aa67fd208 100644
--- a/rest_framework/locale/uk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/uk/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "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"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo
index 77c8a0b9be66f54d636a61f0d2730704ff1cb23a..10a4c9b6c067bf89e20214259394c1408e1eb85a 100644
GIT binary patch
delta 93
zcmeyz{EvCUWL`^MBSQs411nQgZ3Cl;3#1*v0tOaVre@j(K)~gbSX`nTQk0lioRe6R
oUu2~akyw_QTBP7#l#*XqTB%@Dkq==x<YeaMmt`hy{KLcu04xX|wg3PC

delta 93
zcmeyz{EvCUWL^th12Y9fV=E&=Z3DxJ3#1((0!Cl~0|NstpTy!4-H@WhyyBe1lKdho
jg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-%_!^8*xBMlyF

diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po
index c37a38c89..bbda294b1 100644
--- a/rest_framework/locale/vi/LC_MESSAGES/django.po
+++ b/rest_framework/locale/vi/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr ""
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr ""
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr ""
 
@@ -86,11 +86,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -106,209 +108,238 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr ""
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr ""
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr ""
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
@@ -329,18 +360,22 @@ msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -360,6 +395,6 @@ msgstr ""
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr ""
diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo
index 3b90a8e16ee525c332c88dc4c47111c63a9f19f9..39e31b65508d43fd949ee7d87ec274fd6fa7c909 100644
GIT binary patch
delta 96
zcmZ4MvDRb5ArW3nT_ZyULjx;QQ*8sI$>&9+9l;_77FMQa+6F+t<&#)kq8n0_m{**W
rSdw34r4W%=mYG_l;9r!IUszhHU{jF~VL9Yv=H-`VCT`XiW#R__e|{dC

delta 96
zcmZ4MvDRb5ArW2+T>~=(Lt`r=Lu~`Y$>&9+9U&q{U=afY11_J$;u77EqQt!7oWzp+
mA}fWEjQrfhVg=`nqRirw%v1%NlKfl;AWnt~Y}OWK;s*eBH6Bj@

diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
index f0a7d534c..920d70ad5 100644
--- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
+++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:73
+#: authentication.py:72
 msgid "Invalid basic header. No credentials provided."
 msgstr "无效的Basic认证头，没有提供认证信息。"
 
-#: authentication.py:76
+#: authentication.py:75
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。"
 
-#: authentication.py:82
+#: authentication.py:81
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。"
 
-#: authentication.py:100
+#: authentication.py:98
 msgid "Invalid username/password."
 msgstr "用户名或者密码错误。"
 
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
 msgid "User inactive or deleted."
 msgstr "用户未激活或者已删除。"
 
-#: authentication.py:170
+#: authentication.py:168
 msgid "Invalid token header. No credentials provided."
 msgstr "没有提供认证信息（认证令牌HTTP头无效）。"
 
-#: authentication.py:173
+#: authentication.py:171
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。"
 
-#: authentication.py:179
+#: authentication.py:177
 msgid ""
 "Invalid token header. Token string should not contain invalid characters."
 msgstr "无效的Token。Token字符串不能包含非法的字符。"
 
-#: authentication.py:188
+#: authentication.py:186
 msgid "Invalid token."
 msgstr "认证令牌无效。"
 
@@ -88,11 +88,12 @@ msgstr "身份认证信息未提供。"
 msgid "You do not have permission to perform this action."
 msgstr "您没有执行该操作的权限。"
 
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
 msgid "Not found."
 msgstr "未找到。"
 
 #: exceptions.py:109
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "方法 “{method}” 不被允许。"
 
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "无法满足Accept HTTP头的请求。"
 
 #: exceptions.py:132
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "不支持请求中的媒体类型 “{media_type}”。"
 
@@ -108,209 +110,238 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。"
 msgid "Request was throttled."
 msgstr "请求超过了限速。"
 
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
 #: validators.py:162
 msgid "This field is required."
 msgstr "该字段是必填项。"
 
-#: fields.py:168
+#: fields.py:263
 msgid "This field may not be null."
 msgstr "该字段不能为 null。"
 
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "“{input}” 不是合法的布尔值。"
 
-#: fields.py:567
+#: fields.py:662
 msgid "This field may not be blank."
 msgstr "该字段不能为空。"
 
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "请确保这个字段不能超过 {max_length} 个字符。"
 
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "请确保这个字段至少包含 {min_length} 个字符。"
 
-#: fields.py:606
+#: fields.py:701
 msgid "Enter a valid email address."
 msgstr "请输入合法的邮件地址。"
 
-#: fields.py:617
+#: fields.py:712
 msgid "This value does not match the required pattern."
 msgstr "输入值不匹配要求的模式。"
 
-#: fields.py:628
+#: fields.py:723
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。"
 
-#: fields.py:640
+#: fields.py:735
 msgid "Enter a valid URL."
 msgstr "请输入合法的URL。"
 
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "“{value}”不是合法的UUID。"
 
-#: fields.py:687
+#: fields.py:782
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "请输入一个有效的IPv4或IPv6地址。"
 
-#: fields.py:712
+#: fields.py:807
 msgid "A valid integer is required."
 msgstr "请填写合法的整数值。"
 
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "请确保该值小于或者等于 {max_value}。"
 
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "请确保该值大于或者等于 {min_value}。"
 
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
 msgid "String value too large."
 msgstr "字符串值太长。"
 
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
 msgid "A valid number is required."
 msgstr "请填写合法的数字。"
 
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "请确保总计不超过 {max_digits} 个数字。"
 
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "请确保总计不超过 {max_decimal_places} 个小数位。"
 
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。"
 
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "日期时间格式错误。请从这些格式中选择：{format}。"
 
-#: fields.py:900
+#: fields.py:995
 msgid "Expected a datetime but got a date."
 msgstr "期望为日期时间，得到的是日期。"
 
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "日期格式错误。请从这些格式中选择：{format}。"
 
-#: fields.py:966
+#: fields.py:1061
 msgid "Expected a date but got a datetime."
 msgstr "期望为日期，得到的是日期时间。"
 
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "时间格式错误。请从这些格式中选择：{format}。"
 
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
 msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。"
 
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "“{input}” 不是合法选项。"
 
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。"
 
-#: fields.py:1156
+#: fields.py:1256
 msgid "This selection may not be empty."
 msgstr ""
 
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
 msgid "\"{input}\" is not a valid path choice."
 msgstr ""
 
-#: fields.py:1213
+#: fields.py:1313
 msgid "No file was submitted."
 msgstr "没有提交任何文件。"
 
-#: fields.py:1214
+#: fields.py:1314
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "提交的数据不是一个文件。请检查表单的编码类型。"
 
-#: fields.py:1215
+#: fields.py:1315
 msgid "No filename could be determined."
 msgstr "无法检测到文件名。"
 
-#: fields.py:1216
+#: fields.py:1316
 msgid "The submitted file is empty."
 msgstr "提交的是空文件。"
 
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。"
 
-#: fields.py:1263
+#: fields.py:1363
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。"
 
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
 msgid "This list may not be empty."
 msgstr ""
 
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。"
 
 #: pagination.py:192
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "无效页面 “{page_number}”：{message}。"
 
-#: pagination.py:459
+#: pagination.py:462
 msgid "Invalid cursor"
 msgstr "无效游标"
 
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "无效主键 “{pk_value}” － 对象不存在。"
 
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "类型错误。期望为主键，得到的类型为 {data_type}。"
 
-#: relations.py:207
+#: relations.py:225
 msgid "Invalid hyperlink - No URL match."
 msgstr "无效超链接 －没有匹配的URL。"
 
-#: relations.py:208
+#: relations.py:226
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr "无效超链接 －错误的URL匹配。"
 
-#: relations.py:209
+#: relations.py:227
 msgid "Invalid hyperlink - Object does not exist."
 msgstr "无效超链接 －对象不存在。"
 
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。"
 
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "属性 {slug_name} 为 {value} 的对象不存在。"
 
-#: relations.py:370
+#: relations.py:388
 msgid "Invalid value."
 msgstr "无效值。"
 
 #: serializers.py:310
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。"
 
@@ -331,18 +362,22 @@ msgid "This field must be unique."
 msgstr "该字段必须唯一。"
 
 #: validators.py:78
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "字段 {field_names} 必须能构成唯一集合。"
 
 #: validators.py:226
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "该字段必须在日期 “{date_field}” 唯一。"
 
 #: validators.py:241
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "该字段必须在月份 “{date_field}” 唯一。"
 
 #: validators.py:254
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "该字段必须在年 “{date_field}” 唯一。"
 
@@ -362,6 +397,6 @@ msgstr "主机名包含无效版本。"
 msgid "Invalid version in query parameter."
 msgstr "请求参数里包含无效版本。"
 
-#: views.py:86
+#: views.py:88
 msgid "Permission denied."
 msgstr "没有权限。"
diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..b82d4c1c668d8d0f909d6cdf82a77d680bc60d80
GIT binary patch
literal 522
zcmZut%T59@6xHZzmabjgg$oT{rbB|kBF4xgA(23EeC$kRE<<%_$F?x&fB0X1f!|^W
z4KDN~C%tXY?diFnd%N#j9^0P#o(G;gp2wag8lE5i^3<=TW`mK@Pc(7ZPw<wEm0EG=
zJPDO*7<aE@m>MysLYwDcOu04=2R4-nUM^CLvE~qrhB3Ac3Flj}BOGz4v8ayh6l)Pg
zjMwWGR%6TyaZF2DTKv_q2Ctt~m`89Wti#v{Wi#Ql;czdOk_-$@qF)xTaJJIl)kP+i
zUP@7&==r&CQ|UsagfWRZhxSY=vIK{*kcCi3a5!@==V4eBMb(wB%PFnO)-YMeMMK_q
z6BncZ&%^A;Cw!Yd#CPFQFz64uzq5;~ENE-xNcj-2xu1rkl?(GsNY#YNOc+b9brbin
y@vAGpGbMvvHPMMwDTl_Rbel*V)?UFVTNsgHPn)^rpz`(BwxT9{mo3%|w!Q$7nV$Fn

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..a2bfc894c
--- /dev/null
+++ b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr ""
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr ""
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr ""
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr ""
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:88
+msgid "Permission denied."
+msgstr ""

From 1054ea559ca1c27dcd9e187cf44aba377a947d3d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Mon, 21 Sep 2015 13:28:37 +0200
Subject: [PATCH 33/67] Fix the issue link.

---
 docs/topics/release-notes.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 59a8040ae..cab164011 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -525,9 +525,9 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh3321]: https://github.com/tomchristie/django-rest-framework/issues/3321
 
 <!-- 3.2.4 -->
-[gh3314]: https://github.com/tomchristie/django-rest-framework/issues/@3314
-[gh3323]: https://github.com/tomchristie/django-rest-framework/issues/@3323
-[gh3324]: https://github.com/tomchristie/django-rest-framework/issues/@3324
-[gh3359]: https://github.com/tomchristie/django-rest-framework/issues/@3359
-[gh3361]: https://github.com/tomchristie/django-rest-framework/issues/@3361
-[gh3364]: https://github.com/tomchristie/django-rest-framework/issues/@3364
+[gh3314]: https://github.com/tomchristie/django-rest-framework/issues/3314
+[gh3323]: https://github.com/tomchristie/django-rest-framework/issues/3323
+[gh3324]: https://github.com/tomchristie/django-rest-framework/issues/3324
+[gh3359]: https://github.com/tomchristie/django-rest-framework/issues/3359
+[gh3361]: https://github.com/tomchristie/django-rest-framework/issues/3361
+[gh3364]: https://github.com/tomchristie/django-rest-framework/issues/3364

From 6ee3e29460cadc80a80baf2b48174ba6f295182f Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Mon, 21 Sep 2015 13:28:59 +0200
Subject: [PATCH 34/67] Add #3415 to the 3.2.4 release

---
 docs/topics/release-notes.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index cab164011..260dc476c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -48,7 +48,7 @@ You can determine your currently installed version using `pip freeze`:
 * Fix `allow_empty` not working on serializers with `many=True`. ([#3361][gh3361], [#3364][gh3364])
 * Let `DurationField` accepts integers. ([#3359][gh3359])
 * Multi-level dictionaries not supported in multipart requests. ([#3314][gh3314])
-
+* Fix `ListField` truncation on HTTP PATCH ([#3415][gh3415], [#2761][gh2761])
 
 ### 3.2.3
 
@@ -525,9 +525,11 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh3321]: https://github.com/tomchristie/django-rest-framework/issues/3321
 
 <!-- 3.2.4 -->
+[gh2761]: https://github.com/tomchristie/django-rest-framework/issues/2761
 [gh3314]: https://github.com/tomchristie/django-rest-framework/issues/3314
 [gh3323]: https://github.com/tomchristie/django-rest-framework/issues/3323
 [gh3324]: https://github.com/tomchristie/django-rest-framework/issues/3324
 [gh3359]: https://github.com/tomchristie/django-rest-framework/issues/3359
 [gh3361]: https://github.com/tomchristie/django-rest-framework/issues/3361
 [gh3364]: https://github.com/tomchristie/django-rest-framework/issues/3364
+[gh3415]: https://github.com/tomchristie/django-rest-framework/issues/3415

From 796baab86f81543019f5757eb0a3ec077dd14d49 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 15:47:11 +0200
Subject: [PATCH 35/67] Drop Pythons 3.2, 3.3 for Django `master`

No longer supported
---
 .travis.yml | 4 ----
 tox.ini     | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87db5e046..7513b4db2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,16 +24,12 @@ env:
     - TOX_ENV=py27-django15
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-djangomaster
-    - TOX_ENV=py32-djangomaster
-    - TOX_ENV=py33-djangomaster
     - TOX_ENV=py34-djangomaster
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: TOX_ENV=py27-djangomaster
-    - env: TOX_ENV=py32-djangomaster
-    - env: TOX_ENV=py33-djangomaster
     - env: TOX_ENV=py34-djangomaster
 
 install:
diff --git a/tox.ini b/tox.ini
index ef505248b..89d43771a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,8 @@ addopts=--tb=short
 envlist =
        py27-{lint,docs},
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18,master}
+       {py27,py32,py33,py34}-django{17,18},
+       {py27,py34}-django{master}
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage

From 366dff4f26afe5139f1628052c84258f2bc2a388 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 15:58:34 +0200
Subject: [PATCH 36/67] Test Python 3.5 against Django `master`

---
 .travis.yml |  2 ++
 tox.ini     | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7513b4db2..a714b8013 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,12 +25,14 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-djangomaster
     - TOX_ENV=py34-djangomaster
+    - TOX_ENV=py35-djangomaster
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: TOX_ENV=py27-djangomaster
     - env: TOX_ENV=py34-djangomaster
+    - env: TOX_ENV=py35-djangomaster
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 89d43771a..924d11df5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,17 @@ envlist =
        py27-{lint,docs},
        {py26,py27,py32,py33,py34}-django{15,16},
        {py27,py32,py33,py34}-django{17,18},
-       {py27,py34}-django{master}
+       {py27,py34,py35}-django{master}
 
 [testenv]
+basepython =
+            py26: python2.6
+            py27: python2.7
+            py32: python3.2
+            py33: python3.3
+            py34: python3.4
+            py35: python3.5
+
 commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1

From 8edb9d3c1f6d4582f558fcc1d1024c35353ac9bf Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 16:08:56 +0200
Subject: [PATCH 37/67] Drop testing against Django 1.5

---
 .travis.yml | 5 -----
 tox.ini     | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a714b8013..4a7fdd42f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,6 @@ env:
     - TOX_ENV=py32-django16
     - TOX_ENV=py27-django16
     - TOX_ENV=py26-django16
-    - TOX_ENV=py34-django15
-    - TOX_ENV=py33-django15
-    - TOX_ENV=py32-django15
-    - TOX_ENV=py27-django15
-    - TOX_ENV=py26-django15
     - TOX_ENV=py27-djangomaster
     - TOX_ENV=py34-djangomaster
     - TOX_ENV=py35-djangomaster
diff --git a/tox.ini b/tox.ini
index 924d11df5..135ca4407 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ addopts=--tb=short
 [tox]
 envlist =
        py27-{lint,docs},
-       {py26,py27,py32,py33,py34}-django{15,16},
+       {py26,py27,py32,py33,py34}-django16,
        {py27,py32,py33,py34}-django{17,18},
        {py27,py34,py35}-django{master}
 
@@ -21,7 +21,6 @@ commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.10  # Should track maximum supported
        django18: Django==1.8.4  # Should track maximum supported

From 9216dc9a254160a9903359fbf0db2b2c5826212c Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 16:20:07 +0200
Subject: [PATCH 38/67] Remove Django 1.5 EmailValidator fallback

---
 rest_framework/compat.py | 13 -------------
 rest_framework/fields.py |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 4d3b29ddd..fa737f42a 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -183,19 +183,6 @@ else:
             super(URLValidator, self).__init__(*args, **kwargs)
 
 
-# EmailValidator requires explicit regex prior to 1.6+
-if django.VERSION >= (1, 6):
-    from django.core.validators import EmailValidator
-else:
-    from django.core.validators import EmailValidator as DjangoEmailValidator
-    from django.core.validators import email_re
-
-
-    class EmailValidator(DjangoEmailValidator):
-        def __init__(self, *args, **kwargs):
-            super(EmailValidator, self).__init__(email_re, *args, **kwargs)
-
-
 # PATCH method is not implemented by Django
 if 'patch' not in View.http_method_names:
     View.http_method_names = View.http_method_names + ['patch']
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 7c48c621e..63e0b2dbf 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -11,7 +11,7 @@ import uuid
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import RegexValidator, ip_address_validators
+from django.core.validators import EmailValidator, RegexValidator, ip_address_validators
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
 from django.utils import six, timezone
@@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from rest_framework import ISO_8601
 from rest_framework.compat import (
-    EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+    MaxLengthValidator, MaxValueValidator, MinLengthValidator,
     MinValueValidator, OrderedDict, URLValidator, duration_string,
     parse_duration, unicode_repr, unicode_to_repr
 )

From e625cff8a5e4e4353d280fdd4c305dc6dbeed999 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 16:22:46 +0200
Subject: [PATCH 39/67] Remove Django 1.5 URLValidator fallback

---
 rest_framework/compat.py | 13 -------------
 rest_framework/fields.py |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index fa737f42a..c1074b7f8 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -170,19 +170,6 @@ else:
             super(MaxLengthValidator, self).__init__(*args, **kwargs)
 
 
-# URLValidator only accepts `message` in 1.6+
-if django.VERSION >= (1, 6):
-    from django.core.validators import URLValidator
-else:
-    from django.core.validators import URLValidator as DjangoURLValidator
-
-
-    class URLValidator(DjangoURLValidator):
-        def __init__(self, *args, **kwargs):
-            self.message = kwargs.pop('message', self.message)
-            super(URLValidator, self).__init__(*args, **kwargs)
-
-
 # PATCH method is not implemented by Django
 if 'patch' not in View.http_method_names:
     View.http_method_names = View.http_method_names + ['patch']
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 63e0b2dbf..c44440ecd 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -11,7 +11,7 @@ import uuid
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import EmailValidator, RegexValidator, ip_address_validators
+from django.core.validators import EmailValidator, RegexValidator, ip_address_validators, URLValidator
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
 from django.utils import six, timezone
@@ -24,7 +24,7 @@ from django.utils.translation import ugettext_lazy as _
 from rest_framework import ISO_8601
 from rest_framework.compat import (
     MaxLengthValidator, MaxValueValidator, MinLengthValidator,
-    MinValueValidator, OrderedDict, URLValidator, duration_string,
+    MinValueValidator, OrderedDict, duration_string,
     parse_duration, unicode_repr, unicode_to_repr
 )
 from rest_framework.exceptions import ValidationError

From 4a1ab3c18c7c85c9d962e7b6605e7d57423d29fe Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 16:29:33 +0200
Subject: [PATCH 40/67] Fix isort errors

---
 rest_framework/fields.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index c44440ecd..1e23b35f0 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -11,7 +11,9 @@ import uuid
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import EmailValidator, RegexValidator, ip_address_validators, URLValidator
+from django.core.validators import (
+    EmailValidator, RegexValidator, URLValidator, ip_address_validators
+)
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
 from django.utils import six, timezone
@@ -24,8 +26,8 @@ from django.utils.translation import ugettext_lazy as _
 from rest_framework import ISO_8601
 from rest_framework.compat import (
     MaxLengthValidator, MaxValueValidator, MinLengthValidator,
-    MinValueValidator, OrderedDict, duration_string,
-    parse_duration, unicode_repr, unicode_to_repr
+    MinValueValidator, OrderedDict, duration_string, parse_duration,
+    unicode_repr, unicode_to_repr
 )
 from rest_framework.exceptions import ValidationError
 from rest_framework.settings import api_settings

From 25de8c960fcbb79f6d1097da22cab2dfeefb4e6e Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 19:57:20 +0200
Subject: [PATCH 41/67] Remove Django 1.5 get_model_name fallback

---
 rest_framework/compat.py      | 8 --------
 rest_framework/filters.py     | 6 ++----
 rest_framework/permissions.py | 6 ++----
 tests/test_permissions.py     | 4 ++--
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index c1074b7f8..b348f05a9 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -127,14 +127,6 @@ except ImportError:
     pass
 
 
-def get_model_name(model_cls):
-    try:
-        return model_cls._meta.model_name
-    except AttributeError:
-        # < 1.6 used module_name instead of model_name
-        return model_cls._meta.module_name
-
-
 # MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+
 if django.VERSION >= (1, 8):
     from django.core.validators import MinValueValidator, MaxValueValidator
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 90c19aba0..c1e0ae054 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -11,9 +11,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
 
-from rest_framework.compat import (
-    distinct, django_filters, get_model_name, guardian
-)
+from rest_framework.compat import distinct, django_filters, guardian
 from rest_framework.settings import api_settings
 
 FilterSet = django_filters and django_filters.FilterSet or None
@@ -202,7 +200,7 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend):
         model_cls = queryset.model
         kwargs = {
             'app_label': model_cls._meta.app_label,
-            'model_name': get_model_name(model_cls)
+            'model_name': model_cls._meta.model_name
         }
         permission = self.perm_format % kwargs
         if guardian.VERSION >= (1, 3):
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 628538903..292952cfa 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -5,8 +5,6 @@ from __future__ import unicode_literals
 
 from django.http import Http404
 
-from rest_framework.compat import get_model_name
-
 SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS')
 
 
@@ -104,7 +102,7 @@ class DjangoModelPermissions(BasePermission):
         """
         kwargs = {
             'app_label': model_cls._meta.app_label,
-            'model_name': get_model_name(model_cls)
+            'model_name': model_cls._meta.model_name
         }
         return [perm % kwargs for perm in self.perms_map[method]]
 
@@ -166,7 +164,7 @@ class DjangoObjectPermissions(DjangoModelPermissions):
     def get_required_object_permissions(self, method, model_cls):
         kwargs = {
             'app_label': model_cls._meta.app_label,
-            'model_name': get_model_name(model_cls)
+            'model_name': model_cls._meta.model_name
         }
         return [perm % kwargs for perm in self.perms_map[method]]
 
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index ffc262a41..f0d77e957 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -11,7 +11,7 @@ from rest_framework import (
     HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers,
     status
 )
-from rest_framework.compat import get_model_name, guardian, unittest
+from rest_framework.compat import guardian, unittest
 from rest_framework.filters import DjangoObjectPermissionsFilter
 from rest_framework.routers import DefaultRouter
 from rest_framework.test import APIRequestFactory
@@ -278,7 +278,7 @@ class ObjectPermissionsIntegrationTests(TestCase):
 
         # give everyone model level permissions, as we are not testing those
         everyone = Group.objects.create(name='everyone')
-        model_name = get_model_name(BasicPermModel)
+        model_name = BasicPermModel._meta.model_name
         app_label = BasicPermModel._meta.app_label
         f = '{0}_{1}'.format
         perms = {

From 8ea1606abf5eee6a3e97c71b3cc93a81e362d782 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 20:16:52 +0200
Subject: [PATCH 42/67] Remove Django 1.5 clean_manytomany_helptext fallback

---
 rest_framework/compat.py              | 11 -----------
 rest_framework/utils/field_mapping.py |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b348f05a9..fcca2dcbf 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -106,17 +106,6 @@ try:
 except ImportError:
     django_filters = None
 
-if django.VERSION >= (1, 6):
-    def clean_manytomany_helptext(text):
-        return text
-else:
-    # Up to version 1.5 many to many fields automatically suffix
-    # the `help_text` attribute with hardcoded text.
-    def clean_manytomany_helptext(text):
-        if text.endswith(' Hold down "Control", or "Command" on a Mac, to select more than one.'):
-            text = text[:-69]
-        return text
-
 # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
 # Fixes (#1712). We keep the try/except for the test suite.
 guardian = None
diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index f2598974e..a28553693 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -8,7 +8,6 @@ from django.core import validators
 from django.db import models
 from django.utils.text import capfirst
 
-from rest_framework.compat import clean_manytomany_helptext
 from rest_framework.validators import UniqueValidator
 
 NUMERIC_FIELD_TYPES = (
@@ -222,7 +221,7 @@ def get_relation_kwargs(field_name, relation_info):
     if model_field:
         if model_field.verbose_name and needs_label(model_field, field_name):
             kwargs['label'] = capfirst(model_field.verbose_name)
-        help_text = clean_manytomany_helptext(model_field.help_text)
+        help_text = model_field.help_text
         if help_text:
             kwargs['help_text'] = help_text
         if not model_field.editable:

From 2aa33ed54460f016c157cbf13e7e122b7040704b Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Mon, 21 Sep 2015 20:23:39 +0200
Subject: [PATCH 43/67] Adjust README and Release Notes

---
 README.md                    |  2 +-
 docs/topics/release-notes.md | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b183e14df..c2a686f4c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.5.6+, 1.6.3+, 1.7, 1.8)
+* Django (1.6.3+, 1.7, 1.8)
 
 # Installation
 
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 68803a5b1..be2586f02 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -38,6 +38,14 @@ You can determine your currently installed version using `pip freeze`:
 
 ---
 
+## 3.3.x series
+
+### 3.0.0
+
+**Date**: NOT YET RELEASED
+
+* Removed support for Django Version 1.5 ([#3421][gh3421])
+
 ## 3.2.x series
 
 ### 3.2.3
@@ -514,5 +522,6 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh3321]: https://github.com/tomchristie/django-rest-framework/issues/3321
 
 
-
+<!-- 3.0.0 -->
+[gh3421]: https://github.com/tomchristie/django-rest-framework/pulls/3421
 

From 0155a44aac6a09fa081b7bcb94c196f04a178f26 Mon Sep 17 00:00:00 2001
From: Alexey Boriskin <sun.void@gmail.com>
Date: Tue, 22 Sep 2015 12:13:01 +0300
Subject: [PATCH 44/67] Typo in test method name

---
 tests/test_atomic_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index d0d088f52..9c30c2f8b 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -45,7 +45,7 @@ class DBTransactionTests(TestCase):
     def tearDown(self):
         connections.databases['default']['ATOMIC_REQUESTS'] = False
 
-    def test_no_exception_conmmit_transaction(self):
+    def test_no_exception_commit_transaction(self):
         request = factory.post('/')
 
         with self.assertNumQueries(1):

From 524a28c6f86c12bca302b50c1d7b7061034033f7 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 15:14:25 +0200
Subject: [PATCH 45/67] Exclude Guardian testing against Django master

---
 tox.ini | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tox.ini b/tox.ini
index 135ca4407..204a68457 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,3 +39,25 @@ commands = mkdocs build
 deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-documentation.txt
+
+# Specify explicitly to exclude Django Guardian against Django master (various Pythons)
+[testenv:py27-djangomaster]
+deps =
+       https://github.com/django/django/archive/master.tar.gz
+       -rrequirements/requirements-testing.txt
+       markdown==2.5.2
+       django-filter==0.10.0
+[testenv:py34-djangomaster]
+deps =
+       https://github.com/django/django/archive/master.tar.gz
+       -rrequirements/requirements-testing.txt
+       markdown==2.5.2
+       django-filter==0.10.0
+
+[testenv:py35-djangomaster]
+deps =
+       https://github.com/django/django/archive/master.tar.gz
+       -rrequirements/requirements-testing.txt
+       markdown==2.5.2
+       django-filter==0.10.0
+

From 5c0dffa4f784b708d2d59abbda2215bb34e9e39c Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 15:39:51 +0200
Subject: [PATCH 46/67] Remove Django 1.6 from test matrix

---
 .travis.yml | 5 -----
 tox.ini     | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a7fdd42f..acd711917 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,6 @@ env:
     - TOX_ENV=py33-django17
     - TOX_ENV=py32-django17
     - TOX_ENV=py27-django17
-    - TOX_ENV=py34-django16
-    - TOX_ENV=py33-django16
-    - TOX_ENV=py32-django16
-    - TOX_ENV=py27-django16
-    - TOX_ENV=py26-django16
     - TOX_ENV=py27-djangomaster
     - TOX_ENV=py34-djangomaster
     - TOX_ENV=py35-djangomaster
diff --git a/tox.ini b/tox.ini
index 204a68457..0d3836ff2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,11 @@ addopts=--tb=short
 [tox]
 envlist =
        py27-{lint,docs},
-       {py26,py27,py32,py33,py34}-django16,
        {py27,py32,py33,py34}-django{17,18},
        {py27,py34,py35}-django{master}
 
 [testenv]
 basepython =
-            py26: python2.6
             py27: python2.7
             py32: python3.2
             py33: python3.3
@@ -21,7 +19,6 @@ commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.10  # Should track maximum supported
        django18: Django==1.8.4  # Should track maximum supported
        djangomaster: https://github.com/django/django/archive/master.tar.gz

From 68c88e180f1344bb641096276a23d5858aa065b9 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 15:55:39 +0200
Subject: [PATCH 47/67] Remove ContentType import fallback

---
 rest_framework/compat.py        | 10 ----------
 tests/test_relations_generic.py |  4 +++-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index fcca2dcbf..e6039de5e 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -90,16 +90,6 @@ except ImportError:
     from django.db.models import get_model
 
 
-# Import path changes from 1.7 onwards.
-try:
-    from django.contrib.contenttypes.fields import (
-        GenericForeignKey, GenericRelation
-    )
-except ImportError:
-    from django.contrib.contenttypes.generic import (
-        GenericForeignKey, GenericRelation
-    )
-
 # django-filter is optional
 try:
     import django_filters
diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py
index 5cb2dfc05..340d4d1d1 100644
--- a/tests/test_relations_generic.py
+++ b/tests/test_relations_generic.py
@@ -1,12 +1,14 @@
 from __future__ import unicode_literals
 
+from django.contrib.contenttypes.fields import (
+    GenericForeignKey, GenericRelation
+)
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.test import TestCase
 from django.utils.encoding import python_2_unicode_compatible
 
 from rest_framework import serializers
-from rest_framework.compat import GenericForeignKey, GenericRelation
 
 
 @python_2_unicode_compatible

From 6e86a53c922f09785869e022a7ccf51928a55382 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 16:14:45 +0200
Subject: [PATCH 48/67] Remove `apps.get_model` fallback

* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`
---
 rest_framework/compat.py           | 8 --------
 rest_framework/utils/model_meta.py | 5 +++--
 tests/test_utils.py                | 6 +++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index e6039de5e..b85e2b965 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -82,14 +82,6 @@ except ImportError:
     postgres_fields = None
 
 
-# Apps only exists from 1.7 onwards.
-try:
-    from django.apps import apps
-    get_model = apps.get_model
-except ImportError:
-    from django.db.models import get_model
-
-
 # django-filter is optional
 try:
     import django_filters
diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py
index 971864769..5cb9d3a57 100644
--- a/rest_framework/utils/model_meta.py
+++ b/rest_framework/utils/model_meta.py
@@ -8,11 +8,12 @@ Usage: `get_field_info(model)` returns a `FieldInfo` instance.
 import inspect
 from collections import namedtuple
 
+from django.apps import apps
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
 
-from rest_framework.compat import OrderedDict, get_model
+from rest_framework.compat import OrderedDict
 
 FieldInfo = namedtuple('FieldResult', [
     'pk',  # Model field instance
@@ -45,7 +46,7 @@ def _resolve_model(obj):
     """
     if isinstance(obj, six.string_types) and len(obj.split('.')) == 2:
         app_name, model_name = obj.split('.')
-        resolved_model = get_model(app_name, model_name)
+        resolved_model = apps.get_model(app_name, model_name)
         if resolved_model is None:
             msg = "Django did not return a model for {0}.{1}"
             raise ImproperlyConfigured(msg.format(app_name, model_name))
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 4c9fd03c8..fdc61a4aa 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -150,16 +150,16 @@ class ResolveModelWithPatchedDjangoTests(TestCase):
 
     def setUp(self):
         """Monkeypatch get_model."""
-        self.get_model = rest_framework.utils.model_meta.get_model
+        self.get_model = rest_framework.utils.model_meta.apps.get_model
 
         def get_model(app_label, model_name):
             return None
 
-        rest_framework.utils.model_meta.get_model = get_model
+        rest_framework.utils.model_meta.apps.get_model = get_model
 
     def tearDown(self):
         """Revert monkeypatching."""
-        rest_framework.utils.model_meta.models.get_model = self.get_model
+        rest_framework.utils.model_meta.apps.get_model = self.get_model
 
     def test_blows_up_if_model_does_not_resolve(self):
         with self.assertRaises(ImproperlyConfigured):

From 0b3440817270896a5df7195a72be60487fac32aa Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 16:24:22 +0200
Subject: [PATCH 49/67] Remove `unittest.skipUnless`

---
 rest_framework/compat.py      | 8 --------
 tests/test_atomic_requests.py | 3 ++-
 tests/test_filters.py         | 3 ++-
 tests/test_permissions.py     | 3 ++-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b85e2b965..389501730 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -67,14 +67,6 @@ except ImportError:
     from django.utils.datastructures import SortedDict as OrderedDict
 
 
-# unittest.SkipUnless only available in Python 2.7.
-try:
-    import unittest
-    unittest.skipUnless
-except (ImportError, AttributeError):
-    from django.utils import unittest
-
-
 # contrib.postgres only supported from 1.8 onwards.
 try:
     from django.contrib.postgres import fields as postgres_fields
diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index 2d973cb8a..316c8832a 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import unittest
+
 from django.conf.urls import url
 from django.db import connection, connections, transaction
 from django.http import Http404
@@ -7,7 +9,6 @@ from django.test import TestCase, TransactionTestCase
 from django.utils.decorators import method_decorator
 
 from rest_framework import status
-from rest_framework.compat import unittest
 from rest_framework.exceptions import APIException
 from rest_framework.response import Response
 from rest_framework.test import APIRequestFactory
diff --git a/tests/test_filters.py b/tests/test_filters.py
index bce6e08fa..729a7b75b 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import datetime
+import unittest
 from decimal import Decimal
 
 from django.conf.urls import url
@@ -12,7 +13,7 @@ from django.utils.dateparse import parse_date
 from django.utils.six.moves import reload_module
 
 from rest_framework import filters, generics, serializers, status
-from rest_framework.compat import django_filters, unittest
+from rest_framework.compat import django_filters
 from rest_framework.test import APIRequestFactory
 
 from .models import BaseFilterableItem, BasicModel, FilterableItem
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index f0d77e957..e04c72ec9 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import base64
+import unittest
 
 from django.contrib.auth.models import Group, Permission, User
 from django.core.urlresolvers import ResolverMatch
@@ -11,7 +12,7 @@ from rest_framework import (
     HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers,
     status
 )
-from rest_framework.compat import guardian, unittest
+from rest_framework.compat import guardian
 from rest_framework.filters import DjangoObjectPermissionsFilter
 from rest_framework.routers import DefaultRouter
 from rest_framework.test import APIRequestFactory

From 45ace5010eabe1f8d0afc988ce94dd6262a0886b Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 16:35:38 +0200
Subject: [PATCH 50/67] Remove OrderedDict fallback

---
 rest_framework/compat.py                   | 10 ----------
 rest_framework/fields.py                   |  5 +++--
 rest_framework/metadata.py                 |  3 ++-
 rest_framework/pagination.py               |  3 +--
 rest_framework/relations.py                |  3 ++-
 rest_framework/routers.py                  |  3 +--
 rest_framework/utils/model_meta.py         |  4 +---
 rest_framework/utils/serializer_helpers.py |  3 ++-
 tests/test_model_serializer.py             |  3 ++-
 tests/test_renderers.py                    |  3 +--
 10 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 389501730..baed9d40a 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -57,16 +57,6 @@ def distinct(queryset, base):
     return queryset.distinct()
 
 
-# OrderedDict only available in Python 2.7.
-# This will always be the case in Django 1.7 and above, as these versions
-# no longer support Python 2.6.
-# For Django <= 1.6 and Python 2.6 fall back to SortedDict.
-try:
-    from collections import OrderedDict
-except ImportError:
-    from django.utils.datastructures import SortedDict as OrderedDict
-
-
 # contrib.postgres only supported from 1.8 onwards.
 try:
     from django.contrib.postgres import fields as postgres_fields
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1e23b35f0..f216c7612 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -7,6 +7,7 @@ import decimal
 import inspect
 import re
 import uuid
+from collections import OrderedDict
 
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
@@ -26,8 +27,8 @@ from django.utils.translation import ugettext_lazy as _
 from rest_framework import ISO_8601
 from rest_framework.compat import (
     MaxLengthValidator, MaxValueValidator, MinLengthValidator,
-    MinValueValidator, OrderedDict, duration_string, parse_duration,
-    unicode_repr, unicode_to_repr
+    MinValueValidator, duration_string, parse_duration, unicode_repr,
+    unicode_to_repr
 )
 from rest_framework.exceptions import ValidationError
 from rest_framework.settings import api_settings
diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
index 5058422f2..aba1a2013 100644
--- a/rest_framework/metadata.py
+++ b/rest_framework/metadata.py
@@ -8,12 +8,13 @@ to return this information in a more standardized way.
 """
 from __future__ import unicode_literals
 
+from collections import OrderedDict
+
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
 from django.utils.encoding import force_text
 
 from rest_framework import exceptions, serializers
-from rest_framework.compat import OrderedDict
 from rest_framework.request import clone_request
 from rest_framework.utils.field_mapping import ClassLookupDict
 
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index bf72ef4fc..d82a755c8 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 
 import warnings
 from base64 import b64decode, b64encode
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
 
 from django.core.paginator import Paginator as DjangoPaginator
 from django.core.paginator import InvalidPage
@@ -16,7 +16,6 @@ from django.utils import six
 from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
-from rest_framework.compat import OrderedDict
 from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 56af657d9..24800a758 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,6 +1,8 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+from collections import OrderedDict
+
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.core.urlresolvers import (
     NoReverseMatch, Resolver404, get_script_prefix, resolve
@@ -12,7 +14,6 @@ from django.utils.encoding import smart_text
 from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
-from rest_framework.compat import OrderedDict
 from rest_framework.fields import (
     Field, empty, get_attribute, is_simple_callable, iter_options
 )
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index b96100ec2..d4e9d95ed 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -16,14 +16,13 @@ For example, you might have a `urls.py` that looks something like this:
 from __future__ import unicode_literals
 
 import itertools
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
 
 from django.conf.urls import url
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import NoReverseMatch
 
 from rest_framework import views
-from rest_framework.compat import OrderedDict
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.urlpatterns import format_suffix_patterns
diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py
index 5cb9d3a57..d16630ed6 100644
--- a/rest_framework/utils/model_meta.py
+++ b/rest_framework/utils/model_meta.py
@@ -6,15 +6,13 @@ relationships and their associated metadata.
 Usage: `get_field_info(model)` returns a `FieldInfo` instance.
 """
 import inspect
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
 
 from django.apps import apps
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
 
-from rest_framework.compat import OrderedDict
-
 FieldInfo = namedtuple('FieldResult', [
     'pk',  # Model field instance
     'fields',  # Dict of field name -> model field instance
diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py
index 0aede90f7..ddf160868 100644
--- a/rest_framework/utils/serializer_helpers.py
+++ b/rest_framework/utils/serializer_helpers.py
@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 
 import collections
+from collections import OrderedDict
 
 from django.utils.encoding import force_text
 
-from rest_framework.compat import OrderedDict, unicode_to_repr
+from rest_framework.compat import unicode_to_repr
 
 
 class ReturnDict(OrderedDict):
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 89557fa1d..aa62ec4ae 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -8,6 +8,7 @@ an appropriate set of serializer fields for each case.
 from __future__ import unicode_literals
 
 import decimal
+from collections import OrderedDict
 
 import django
 import pytest
@@ -21,7 +22,7 @@ from django.utils import six
 
 from rest_framework import serializers
 from rest_framework.compat import DurationField as ModelDurationField
-from rest_framework.compat import OrderedDict, unicode_repr
+from rest_framework.compat import unicode_repr
 
 
 def dedent(blocktext):
diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index 03b95243f..060d3503a 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 import json
 import re
-from collections import MutableMapping
+from collections import MutableMapping, OrderedDict
 
 from django.conf.urls import include, url
 from django.core.cache import cache
@@ -13,7 +13,6 @@ from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework import permissions, serializers, status
-from rest_framework.compat import OrderedDict
 from rest_framework.renderers import (
     BaseRenderer, BrowsableAPIRenderer, HTMLFormRenderer, JSONRenderer
 )

From 8d740a11e409693332d421f203425d968b30e73c Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.co.uk>
Date: Tue, 22 Sep 2015 16:39:25 +0200
Subject: [PATCH 51/67] Adjust README and Release Notes

---
 README.md                    | 4 ++--
 docs/topics/release-notes.md | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c2a686f4c..c0b7eab1e 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ There is a live example API for testing purposes, [available here][sandbox].
 
 # Requirements
 
-* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.6.3+, 1.7, 1.8)
+* Python (2.7, 3.2, 3.3, 3.4)
+* Django (1.7, 1.8)
 
 # Installation
 
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index be2586f02..13f95b80b 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -45,6 +45,7 @@ You can determine your currently installed version using `pip freeze`:
 **Date**: NOT YET RELEASED
 
 * Removed support for Django Version 1.5 ([#3421][gh3421])
+* Removed support for Django Version 1.6 and Python 2.6 ([#3429][gh3429])
 
 ## 3.2.x series
 
@@ -524,4 +525,4 @@ For older release notes, [please see the version 2.x documentation][old-release-
 
 <!-- 3.0.0 -->
 [gh3421]: https://github.com/tomchristie/django-rest-framework/pulls/3421
-
+[gh3429]: https://github.com/tomchristie/django-rest-framework/pull/3429

From 134f5fa4bc783481d394f9c35d9e9e5880c30103 Mon Sep 17 00:00:00 2001
From: paolopaolopaolo <dpaolomercado@gmail.com>
Date: Tue, 22 Sep 2015 11:40:19 -0700
Subject: [PATCH 52/67] Fixes #3265 (now with Test Case)

- Added test_data_access_before_save_raises_error test
---
 tests/test_serializer.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index c18cbb584..e99efe3d2 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -51,6 +51,15 @@ class TestSerializer:
         with pytest.raises(AttributeError):
             serializer.data
 
+    def test_data_access_before_save_raises_error(self):
+        def create(validated_data):
+            return validated_data
+        serializer = self.Serializer(data={'char': 'abc', 'integer': 123})
+        serializer.create = create
+        assert serializer.is_valid()
+        assert serializer.data == {'char': 'abc', 'integer': 123}
+        with pytest.raises(AssertionError):
+            serializer.save()
 
 class TestValidateMethod:
     def test_non_field_error_validate_method(self):

From 7640bfea9ed80bd2cb892efebd75a797681f5297 Mon Sep 17 00:00:00 2001
From: paolopaolopaolo <dpaolomercado@gmail.com>
Date: Tue, 22 Sep 2015 11:49:51 -0700
Subject: [PATCH 53/67] Add `assert` statement to `.save()` method in
 Serializer:

- Asserts that `_data` does not exist when calling `.save()`
---
 rest_framework/serializers.py | 6 ++++++
 tests/test_serializer.py      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 037939e31..a3c26e1ee 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -166,6 +166,12 @@ class BaseSerializer(Field):
             "For example: 'serializer.save(owner=request.user)'.'"
         )
 
+        assert not hasattr(self, '_data'), (
+            "You cannot call `.save()` after accessing `serializer.data`."
+            "If you need to access data before committing to the database then "
+            "inspect 'serializer.validated_data' instead. "
+        )
+
         validated_data = dict(
             list(self.validated_data.items()) +
             list(kwargs.items())
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index e99efe3d2..741c6ab17 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -61,6 +61,7 @@ class TestSerializer:
         with pytest.raises(AssertionError):
             serializer.save()
 
+
 class TestValidateMethod:
     def test_non_field_error_validate_method(self):
         class ExampleSerializer(serializers.Serializer):

From 8a82a07f8d0770740c4aaa6d03a2f7207c54299a Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Wed, 23 Sep 2015 10:51:23 +0200
Subject: [PATCH 54/67] fixing a trivial HTML tag which is closed twice

---
 docs_theme/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs_theme/base.html b/docs_theme/base.html
index 93b687cfc..369927b41 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -136,7 +136,7 @@
   </div> <!--/.wrapper -->
 
   <footer class="span12">
-    <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.</a>
+    <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.
     </p>
   </footer>
 

From 62c000bc12e63a4bb9de8d4cc84e8f1244bf6634 Mon Sep 17 00:00:00 2001
From: Stian Jensen <me@stianj.com>
Date: Wed, 23 Sep 2015 15:07:56 +0200
Subject: [PATCH 55/67] Use model error_messages when available

In the automatically applied UniqueValidator, use the error message from
error_messages defined in the model instead of the generic default
UniqueValidator message.

This fixes #2878.
---
 rest_framework/utils/field_mapping.py | 10 +++++++++-
 tests/test_validators.py              |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index f2598974e..48c584b91 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -193,7 +193,15 @@ def get_field_kwargs(field_name, model_field):
         ]
 
     if getattr(model_field, 'unique', False):
-        validator = UniqueValidator(queryset=model_field.model._default_manager)
+        unique_error_message = model_field.error_messages.get('unique', None)
+        if unique_error_message:
+            unique_error_message = unique_error_message % {
+                'model_name': model_field.model._meta.object_name,
+                'field_label': model_field.verbose_name
+            }
+        validator = UniqueValidator(
+            queryset=model_field.model._default_manager,
+            message=unique_error_message)
         validator_kwarg.append(validator)
 
     if validator_kwarg:
diff --git a/tests/test_validators.py b/tests/test_validators.py
index 206e882a7..acaaf5743 100644
--- a/tests/test_validators.py
+++ b/tests/test_validators.py
@@ -48,7 +48,7 @@ class TestUniquenessValidation(TestCase):
         data = {'username': 'existing'}
         serializer = UniquenessSerializer(data=data)
         assert not serializer.is_valid()
-        assert serializer.errors == {'username': ['This field must be unique.']}
+        assert serializer.errors == {'username': ['UniquenessModel with this username already exists.']}
 
     def test_is_unique(self):
         data = {'username': 'other'}

From 02e1f69d2b7e7f85f3800a4b11d87b423e726072 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 11:44:07 +0100
Subject: [PATCH 56/67] Django 1.9 support

---
 .travis.yml                           | 11 +++---
 README.md                             |  4 +--
 docs/index.md                         |  4 +--
 rest_framework/utils/field_mapping.py |  8 +++++
 tox.ini                               | 50 +++++++++++++--------------
 5 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index acd711917..e8561a7ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ sudo: false
 env:
     - TOX_ENV=py27-lint
     - TOX_ENV=py27-docs
+    - TOX_ENV=py35-django19
+    - TOX_ENV=py34-django19
+    - TOX_ENV=py27-django19
     - TOX_ENV=py34-django18
     - TOX_ENV=py33-django18
     - TOX_ENV=py32-django18
@@ -13,16 +16,12 @@ env:
     - TOX_ENV=py33-django17
     - TOX_ENV=py32-django17
     - TOX_ENV=py27-django17
-    - TOX_ENV=py27-djangomaster
-    - TOX_ENV=py34-djangomaster
-    - TOX_ENV=py35-djangomaster
 
 matrix:
+    # Python 3.5 not yet available on travis, watch this to see when it is.
   fast_finish: true
   allow_failures:
-    - env: TOX_ENV=py27-djangomaster
-    - env: TOX_ENV=py34-djangomaster
-    - env: TOX_ENV=py35-djangomaster
+    - env: TOX_ENV=py35-django19
 
 install:
   - pip install tox
diff --git a/README.md b/README.md
index c0b7eab1e..f9bd1f439 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ There is a live example API for testing purposes, [available here][sandbox].
 
 # Requirements
 
-* Python (2.7, 3.2, 3.3, 3.4)
-* Django (1.7, 1.8)
+* Python (2.7, 3.2, 3.3, 3.4, 3.5)
+* Django (1.7, 1.8, 1.9)
 
 # Installation
 
diff --git a/docs/index.md b/docs/index.md
index 37f192094..4617d0bcc 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -52,8 +52,8 @@ Some reasons you might want to use REST framework:
 
 REST framework requires the following:
 
-* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.5.6+, 1.6.3+, 1.7+, 1.8)
+* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4, 3.5)
+* Django (1.7+, 1.8, 1.9)
 
 The following packages are optional:
 
diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index fef9f5d3d..8206578ee 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -112,6 +112,14 @@ def get_field_kwargs(field_name, model_field):
         kwargs['choices'] = model_field.choices
         return kwargs
 
+    # Our decimal validation is handled in the field code, not validator code.
+    # (In Django 1.9+ this differs from previous style)
+    if isinstance(model_field, models.DecimalField):
+        validator_kwarg = [
+            validator for validator in validator_kwarg
+            if not isinstance(validator, validators.DecimalValidator)
+        ]
+
     # Ensure that max_length is passed explicitly as a keyword arg,
     # rather than as a validator.
     max_length = getattr(model_field, 'max_length', None)
diff --git a/tox.ini b/tox.ini
index 0d3836ff2..0ef64cc49 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ addopts=--tb=short
 envlist =
        py27-{lint,docs},
        {py27,py32,py33,py34}-django{17,18},
-       {py27,py34,py35}-django{master}
+       {py27,py34,py35}-django{19}
 
 [testenv]
 basepython =
@@ -19,17 +19,17 @@ commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-       django17: Django==1.7.10  # Should track maximum supported
-       django18: Django==1.8.4  # Should track maximum supported
-       djangomaster: https://github.com/django/django/archive/master.tar.gz
-       -rrequirements/requirements-testing.txt
-       -rrequirements/requirements-optionals.txt
+        django17: Django==1.7.10  # Should track maximum supported
+        django18: Django==1.8.4  # Should track maximum supported
+        django19: https://www.djangoproject.com/download/1.9a1/tarball/
+        -rrequirements/requirements-testing.txt
+        -rrequirements/requirements-optionals.txt
 
 [testenv:py27-lint]
 commands = ./runtests.py --lintonly
 deps =
-       -rrequirements/requirements-codestyle.txt
-       -rrequirements/requirements-testing.txt
+        -rrequirements/requirements-codestyle.txt
+        -rrequirements/requirements-testing.txt
 
 [testenv:py27-docs]
 commands = mkdocs build
@@ -37,24 +37,24 @@ deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-documentation.txt
 
-# Specify explicitly to exclude Django Guardian against Django master (various Pythons)
-[testenv:py27-djangomaster]
+# Specify explicitly to exclude Django Guardian against Django 1.9
+[testenv:py27-django19]
 deps =
-       https://github.com/django/django/archive/master.tar.gz
-       -rrequirements/requirements-testing.txt
-       markdown==2.5.2
-       django-filter==0.10.0
-[testenv:py34-djangomaster]
-deps =
-       https://github.com/django/django/archive/master.tar.gz
-       -rrequirements/requirements-testing.txt
-       markdown==2.5.2
-       django-filter==0.10.0
+        https://www.djangoproject.com/download/1.9a1/tarball/
+        -rrequirements/requirements-testing.txt
+        markdown==2.5.2
+        django-filter==0.10.0
 
-[testenv:py35-djangomaster]
+[testenv:py34-django19]
 deps =
-       https://github.com/django/django/archive/master.tar.gz
-       -rrequirements/requirements-testing.txt
-       markdown==2.5.2
-       django-filter==0.10.0
+        https://www.djangoproject.com/download/1.9a1/tarball/
+        -rrequirements/requirements-testing.txt
+        markdown==2.5.2
+        django-filter==0.10.0
 
+[testenv:py35-django19]
+deps =
+        https://www.djangoproject.com/download/1.9a1/tarball/
+        -rrequirements/requirements-testing.txt
+        markdown==2.5.2
+        django-filter==0.10.0

From c64896c849d7dbf13834a5300f7085cf5041d1df Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 15:33:55 +0100
Subject: [PATCH 57/67] More cleanup of browser overrides

---
 docs/api-guide/format-suffixes.md | 10 ++++++
 docs/api-guide/settings.md        | 56 +++++++------------------------
 rest_framework/negotiation.py     |  3 --
 rest_framework/reverse.py         |  1 -
 rest_framework/settings.py        |  4 +--
 tests/test_renderers.py           | 11 ------
 tests/test_response.py            | 22 ------------
 7 files changed, 24 insertions(+), 83 deletions(-)

diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md
index 35dbcd39c..13717b05f 100644
--- a/docs/api-guide/format-suffixes.md
+++ b/docs/api-guide/format-suffixes.md
@@ -69,6 +69,16 @@ If using the `i18n_patterns` function provided by Django, as well as `format_suf
 
 ---
 
+## Query parameter formats
+
+An alternative to the format suffixes is to include the requested format in a query parameter. REST framework provides this option by default, and it is used in the browsable API to switch between differing available representations.
+
+To select a representation using its short format, use the `format` query parameter. For example: `http://example.com/organizations/?format=csv`.
+
+The name of this query parameter can be modified using the `URL_FORMAT_OVERRIDE` setting. Set the value to `None` to disable this behavior.
+
+---
+
 ## Accept headers vs. format suffixes
 
 There seems to be a view among some of the Web community that filename extensions are not a RESTful pattern, and that `HTTP Accept` headers should always be used instead.
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 13d23a69e..23691dec1 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -249,47 +249,23 @@ Default:
 
 ---
 
-## Browser overrides
-
-*The following settings provide URL or form-based overrides of the default browser behavior.*
-
-#### FORM_METHOD_OVERRIDE
-
-The name of a form field that may be used to override the HTTP method of the form.
-
-If the value of this setting is `None` then form method overloading will be disabled.
-
-Default: `'_method'`
-
-#### FORM_CONTENT_OVERRIDE
-
-The name of a form field that may be used to override the content of the form payload.  Must be used together with `FORM_CONTENTTYPE_OVERRIDE`.
-
-If either setting is `None` then form content overloading will be disabled.
-
-Default: `'_content'`
-
-#### FORM_CONTENTTYPE_OVERRIDE
-
-The name of a form field that may be used to override the content type of the form payload.  Must be used together with `FORM_CONTENT_OVERRIDE`.
-
-If either setting is `None` then form content overloading will be disabled.
-
-Default: `'_content_type'`
-
-#### URL_ACCEPT_OVERRIDE
-
-The name of a URL parameter that may be used to override the HTTP `Accept` header.
-
-If the value of this setting is `None` then URL accept overloading will be disabled.
-
-Default: `'accept'`
+## Content type controls
 
 #### URL_FORMAT_OVERRIDE
 
-The name of a URL parameter that may be used to override the default `Accept` header based content negotiation.
+The name of a URL parameter that may be used to override the default content negotiation `Accept` header behavior, by using a `format=…` query parameter in the request URL.
 
-If the value of this setting is `None` then URL format overloading will be disabled.
+For example: `http://example.com/organizations/?format=csv`
+
+If the value of this setting is `None` then URL format overrides will be disabled.
+
+Default: `'format'`
+
+#### FORMAT_SUFFIX_KWARG
+
+The name of a parameter in the URL conf that may be used to provide a format suffix. This setting is applied when using `format_suffix_patterns` to include suffixed URL patterns.
+
+For example: `http://example.com/organizations.csv/`
 
 Default: `'format'`
 
@@ -451,12 +427,6 @@ A string representing the key that should be used for the URL fields generated b
 
 Default: `'url'`
 
-#### FORMAT_SUFFIX_KWARG
-
-The name of a parameter in the URL conf that may be used to provide a format suffix.
-
-Default: `'format'`
-
 #### NUM_PROXIES
 
 An integer of 0 or more, that may be used to specify the number of application proxies that the API runs behind.  This allows throttling to more accurately identify client IP addresses.  If set to `None` then less strict IP matching will be used by the throttle classes.
diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index b9263c447..2a2b6f168 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -92,9 +92,6 @@ class DefaultContentNegotiation(BaseContentNegotiation):
         """
         Given the incoming request, return a tokenised list of media
         type strings.
-
-        Allows URL style accept override.  eg. "?accept=application/json"
         """
         header = request.META.get('HTTP_ACCEPT', '*/*')
-        header = request.query_params.get(self.settings.URL_ACCEPT_OVERRIDE, header)
         return [token.strip() for token in header.split(',')]
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
index af7c5e949..5a7ba09a8 100644
--- a/rest_framework/reverse.py
+++ b/rest_framework/reverse.py
@@ -22,7 +22,6 @@ def preserve_builtin_query_params(url, request=None):
 
     overrides = [
         api_settings.URL_FORMAT_OVERRIDE,
-        api_settings.URL_ACCEPT_OVERRIDE
     ]
 
     for param in overrides:
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ddf37d443..9d834c125 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -91,10 +91,8 @@ DEFAULTS = {
     ),
     'TEST_REQUEST_DEFAULT_FORMAT': 'multipart',
 
-    # Browser enhancements
-    'URL_ACCEPT_OVERRIDE': 'accept',
+    # Hyperlink settings
     'URL_FORMAT_OVERRIDE': 'format',
-
     'FORMAT_SUFFIX_KWARG': 'format',
     'URL_FIELD_NAME': 'url',
 
diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index 060d3503a..b4b2db22e 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -191,17 +191,6 @@ class RendererEndToEndTests(TestCase):
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
-    def test_specified_renderer_serializes_content_on_accept_query(self):
-        """The '_accept' query string should behave in the same way as the Accept header."""
-        param = '?%s=%s' % (
-            api_settings.URL_ACCEPT_OVERRIDE,
-            RendererB.media_type
-        )
-        resp = self.client.get('/' + param)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
-        self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
-        self.assertEqual(resp.status_code, DUMMYSTATUS)
-
     def test_unsatisfiable_accept_header_on_request_returns_406_status(self):
         """If the Accept header is unsatisfiable we should return a 406 Not Acceptable response."""
         resp = self.client.get('/', HTTP_ACCEPT='foo/bar')
diff --git a/tests/test_response.py b/tests/test_response.py
index b53688e5c..df2d7b4ec 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -10,7 +10,6 @@ from rest_framework.renderers import (
     BaseRenderer, BrowsableAPIRenderer, JSONRenderer
 )
 from rest_framework.response import Response
-from rest_framework.settings import api_settings
 from rest_framework.views import APIView
 from tests.models import BasicModel
 
@@ -176,17 +175,6 @@ class RendererIntegrationTests(TestCase):
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
-    def test_specified_renderer_serializes_content_on_accept_query(self):
-        """The '_accept' query string should behave in the same way as the Accept header."""
-        param = '?%s=%s' % (
-            api_settings.URL_ACCEPT_OVERRIDE,
-            RendererB.media_type
-        )
-        resp = self.client.get('/' + param)
-        self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
-        self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
-        self.assertEqual(resp.status_code, DUMMYSTATUS)
-
     def test_specified_renderer_serializes_content_on_format_query(self):
         """If a 'format' query is specified, the renderer with the matching
         format attribute should serialize the response."""
@@ -299,16 +287,6 @@ class Issue807Tests(TestCase):
         resp = self.client.get('/setbyview', **headers)
         self.assertEqual('setbyview', resp['Content-Type'])
 
-    def test_viewset_label_help_text(self):
-        param = '?%s=%s' % (
-            api_settings.URL_ACCEPT_OVERRIDE,
-            'text/html'
-        )
-        resp = self.client.get('/html_new_model_viewset/' + param)
-        self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8')
-        # self.assertContains(resp, 'Text comes here')
-        # self.assertContains(resp, 'Text description.')
-
     def test_form_has_label_and_help_text(self):
         resp = self.client.get('/html_new_model')
         self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8')

From ed677f0138849e9c60ecd124b75b360fb04d7c38 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 16:37:48 +0100
Subject: [PATCH 58/67] Update docs for content overriding

---
 docs/topics/browser-enhancements.md | 93 ++++++++++++++++-------------
 1 file changed, 50 insertions(+), 43 deletions(-)

diff --git a/docs/topics/browser-enhancements.md b/docs/topics/browser-enhancements.md
index 5a1726201..e1977e826 100644
--- a/docs/topics/browser-enhancements.md
+++ b/docs/topics/browser-enhancements.md
@@ -4,58 +4,36 @@
 >
 > &mdash; [RESTful Web Services][cite], Leonard Richardson & Sam Ruby.
 
+In order to allow the browsable API to function, there are a couple of browser enhancements that REST framework needs to provide.
+
+As of version 3.3.0 onwards these are enabled with javascript, using the [ajax-form][ajax-form] library.
+
 ## Browser based PUT, DELETE, etc...
 
-REST framework supports browser-based `PUT`, `DELETE` and other methods, by
-overloading `POST` requests using a hidden form field.
+The [AJAX form library][ajax-form] supports browser-based `PUT`, `DELETE` and other methods on HTML forms.
 
-Note that this is the same strategy as is used in [Ruby on Rails][rails].
+After including the library, use the `data-method` attribute on the form, like so:
 
-For example, given the following form:
-
-    <form action="/news-items/5" method="POST">
-        <input type="hidden" name="_method" value="DELETE">
+    <form action="/" data-method="PUT">
+        <input name='foo'/>
+        ...
     </form>
 
-`request.method` would return `"DELETE"`.
-
-## HTTP header based method overriding
-
-REST framework also supports method overriding via the semi-standard `X-HTTP-Method-Override` header.  This can be useful if you are working with non-form content such as JSON and are working with an older web server and/or hosting provider that doesn't recognise particular HTTP methods such as `PATCH`.  For example [Amazon Web Services ELB][aws_elb].
-
-To use it, make a `POST` request, setting the `X-HTTP-Method-Override` header.
-
-For example, making a `PATCH` request via `POST` in jQuery:
-
-	$.ajax({
-		url: '/myresource/',
-		method: 'POST',
-		headers: {'X-HTTP-Method-Override': 'PATCH'},
-		...
-	});
+Note that prior to 3.3.0, this support was server-side rather than javascript based. The method overloading style (as used in [Ruby on Rails][rails]) is no longer supported due to subtle issues that it introduces in request parsing.
 
 ## Browser based submission of non-form content
 
-Browser-based submission of content types other than form are supported by
-using form fields named `_content` and `_content_type`:
+Browser-based submission of content types such as JSON are supported by the [AJAX form library][ajax-form], using form fields with `data-override='content-type'` and `data-override='content'` attributes.
 
-For example, given the following form:
+For example:
 
-    <form action="/news-items/5" method="PUT">
-        <input type="hidden" name="_content_type" value="application/json">
-        <input name="_content" value="{'count': 1}">
-    </form>
+        <form action="/">
+            <input data-override='content-type' value='application/json' type='hidden'/>
+            <textarea data-override='content'>{}</textarea>
+            <input type="submit"/>
+        </form>
 
-`request.content_type` would return `"application/json"`, and
-`request.stream` would return `"{'count': 1}"`
-
-## URL based accept headers
-
-REST framework can take `?accept=application/json` style URL parameters,
-which allow the `Accept` header to be overridden.
-
-This can be useful for testing the API from a web browser, where you don't
-have any control over what is sent in the `Accept` header.
+Note that prior to 3.3.0, this support was server-side rather than javascript based.
 
 ## URL based format suffixes
 
@@ -63,8 +41,37 @@ REST framework can take `?format=json` style URL parameters, which can be a
 useful shortcut for determining which content type should be returned from
 the view.
 
-This is a more concise than using the `accept` override, but it also gives
-you less control.  (For example you can't specify any media type parameters)
+This behavior is controlled using the `URL_FORMAT_OVERRIDE` setting.
+
+## HTTP header based method overriding
+
+Prior to version 3.3.0 the semi extension header `X-HTTP-Method-Override` was supported for overriding the request method. This behavior is no longer in core, but can be adding if needed using middleware.
+
+For example:
+
+    METHOD_OVERRIDE_HEADER = 'HTTP_X_HTTP_METHOD_OVERRIDE'
+ 
+    class MethodOverrideMiddleware(object):
+        def process_view(self, request, callback, callback_args, callback_kwargs):
+            if request.method != 'POST':
+                return
+            if METHOD_OVERRIDE_HEADER not in request.META:
+                return
+            request.method = request.META[METHOD_OVERRIDE_HEADER]
+
+## URL based accept headers
+
+Until version 3.3.0 REST framework included built-in support for `?accept=application/json` style URL parameters, which would allow the `Accept` header to be overridden.
+
+Since the introduction of the content negotiation API this behavior is no longer included in core, but may be added using a custom content negotiation class, if needed.
+
+For example:
+
+    class AcceptQueryParamOverride()
+        def get_accept_list(self, request):
+           header = request.META.get('HTTP_ACCEPT', '*/*')
+           header = request.query_params.get('_accept', header)
+           return [token.strip() for token in header.split(',')]
 
 ## Doesn't HTML5 support PUT and DELETE forms?
 
@@ -74,7 +81,7 @@ was later [dropped from the spec][html5].  There remains
 as well as how to support content types other than form-encoded data.
 
 [cite]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260
+[ajax-form]: https://github.com/tomchristie/ajax-form
 [rails]: http://guides.rubyonrails.org/form_helpers.html#how-do-forms-with-put-or-delete-methods-work
 [html5]: http://www.w3.org/TR/html5-diff/#changes-2010-06-24
 [put_delete]: http://amundsen.com/examples/put-delete-forms/
-[aws_elb]: https://forums.aws.amazon.com/thread.jspa?messageID=400724

From 10dbf1316f9092dbd751b1e47fbcab45576ca8fc Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 17:25:52 +0100
Subject: [PATCH 59/67] Added JSONField. Closes #3170.

---
 docs/api-guide/fields.md      |  8 +++++
 rest_framework/compat.py      |  7 +++++
 rest_framework/fields.py      | 26 ++++++++++++++++
 rest_framework/serializers.py |  3 ++
 tests/test_fields.py          | 56 +++++++++++++++++++++++++++++++++++
 5 files changed, 100 insertions(+)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 2fbb84c03..3888e9100 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -459,6 +459,14 @@ You can also use the declarative style, as with `ListField`. For example:
     class DocumentField(DictField):
         child = CharField()
 
+## JSONField
+
+A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON encoded strings.
+
+**Signature**: `JSONField(binary)`
+
+- `binary` - If set to `True` then the field will output and validate a JSON encoded string, rather that a primitive data structure. Defaults to `False`.
+
 ---
 
 # Miscellaneous fields
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index baed9d40a..5ca5da20e 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -64,6 +64,13 @@ except ImportError:
     postgres_fields = None
 
 
+# JSONField is only supported from 1.9 onwards
+try:
+    from django.contrib.postgres.fields import JSONField
+except ImportError:
+    JSONField = None
+
+
 # django-filter is optional
 try:
     import django_filters
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1c051db6d..a1d99bd88 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -5,6 +5,7 @@ import copy
 import datetime
 import decimal
 import inspect
+import json
 import re
 import uuid
 from collections import OrderedDict
@@ -1522,6 +1523,31 @@ class DictField(Field):
         ])
 
 
+class JSONField(Field):
+    default_error_messages = {
+        'invalid': _('Value must be valid JSON.')
+    }
+
+    def __init__(self, *args, **kwargs):
+        self.binary = kwargs.pop('binary', False)
+        super(JSONField, self).__init__(*args, **kwargs)
+
+    def to_internal_value(self, data):
+        try:
+            if self.binary:
+                return json.loads(data)
+            else:
+                json.dumps(data)
+        except (TypeError, ValueError):
+            self.fail('invalid')
+        return data
+
+    def to_representation(self, value):
+        if self.binary:
+            return json.dumps(value)
+        return value
+
+
 # Miscellaneous field types...
 
 class ReadOnlyField(Field):
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 0b0b1aa62..5aef1df69 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -21,6 +21,7 @@ from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework.compat import DurationField as ModelDurationField
+from rest_framework.compat import JSONField as ModelJSONField
 from rest_framework.compat import postgres_fields, unicode_to_repr
 from rest_framework.utils import model_meta
 from rest_framework.utils.field_mapping import (
@@ -790,6 +791,8 @@ class ModelSerializer(Serializer):
     }
     if ModelDurationField is not None:
         serializer_field_mapping[ModelDurationField] = DurationField
+    if ModelJSONField is not None:
+        serializer_field_mapping[ModelJSONField] = JSONField
     serializer_related_field = PrimaryKeyRelatedField
     serializer_url_field = HyperlinkedIdentityField
     serializer_choice_field = ChoiceField
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 6048f49d0..270a0f652 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1525,6 +1525,62 @@ class TestUnvalidatedDictField(FieldValues):
     field = serializers.DictField()
 
 
+class TestJSONField(FieldValues):
+    """
+    Values for `JSONField`.
+    """
+    valid_inputs = [
+        ({
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': None
+        }, {
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': None
+        }),
+    ]
+    invalid_inputs = [
+        ({'a': set()}, ['Value must be valid JSON.']),
+    ]
+    outputs = [
+        ({
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': 3
+        }, {
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': 3
+        }),
+    ]
+    field = serializers.JSONField()
+
+
+class TestBinaryJSONField(FieldValues):
+    """
+    Values for `JSONField` with binary=True.
+    """
+    valid_inputs = [
+        ('{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': None
+        }),
+    ]
+    invalid_inputs = [
+        ('{"a": "unterminated string}', ['Value must be valid JSON.']),
+    ]
+    outputs = [
+        ({
+            'a': 1,
+            'b': ['some', 'list', True, 1.23],
+            '3': None
+        }, '{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
+    ]
+    field = serializers.JSONField(binary=True)
+
+
 # Tests for FieldField.
 # ---------------------
 

From ec8098b7e2b69e51c1a3196c20d11b253f914926 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 17:32:36 +0100
Subject: [PATCH 60/67] Work around 2.x/3.x json.dumps() return type fuzziness

---
 rest_framework/fields.py | 6 +++++-
 tests/test_fields.py     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index a1d99bd88..38db39287 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1544,7 +1544,11 @@ class JSONField(Field):
 
     def to_representation(self, value):
         if self.binary:
-            return json.dumps(value)
+            value = json.dumps(value)
+            # On python 2.x the return type for json.dumps() is underspecified.
+            # On python 3.x json.dumps() returns unicode strings.
+            if isinstance(value, six.text_type):
+                value = bytes(value.encode('utf-8'))
         return value
 
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 270a0f652..bcd65a1a6 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1562,7 +1562,7 @@ class TestBinaryJSONField(FieldValues):
     Values for `JSONField` with binary=True.
     """
     valid_inputs = [
-        ('{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
+        (b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
             'a': 1,
             'b': ['some', 'list', True, 1.23],
             '3': None
@@ -1576,7 +1576,7 @@ class TestBinaryJSONField(FieldValues):
             'a': 1,
             'b': ['some', 'list', True, 1.23],
             '3': None
-        }, '{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
+        }, b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
     ]
     field = serializers.JSONField(binary=True)
 

From dad207de6687fc5d9fd32b47d64932f0982617a7 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 17:41:09 +0100
Subject: [PATCH 61/67] Don't attempt to test dicts (unordered)

---
 tests/test_fields.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/test_fields.py b/tests/test_fields.py
index bcd65a1a6..104337627 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1572,11 +1572,7 @@ class TestBinaryJSONField(FieldValues):
         ('{"a": "unterminated string}', ['Value must be valid JSON.']),
     ]
     outputs = [
-        ({
-            'a': 1,
-            'b': ['some', 'list', True, 1.23],
-            '3': None
-        }, b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}'),
+        (['some', 'list', True, 1.23], b'["some", "list", true, 1.23]'),
     ]
     field = serializers.JSONField(binary=True)
 

From 265ec8ac62ef4b2b8ee74525e7c263bf559a2355 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 28 Sep 2015 17:47:51 +0100
Subject: [PATCH 62/67] Handle binary or unicode with JSONField

---
 docs/api-guide/fields.md | 2 +-
 rest_framework/fields.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 3888e9100..f8be0c1b9 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -461,7 +461,7 @@ You can also use the declarative style, as with `ListField`. For example:
 
 ## JSONField
 
-A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON encoded strings.
+A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON-encoded binary strings.
 
 **Signature**: `JSONField(binary)`
 
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 38db39287..0d4a51152 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1535,6 +1535,8 @@ class JSONField(Field):
     def to_internal_value(self, data):
         try:
             if self.binary:
+                if isinstance(data, six.binary_type):
+                    data = data.decode('utf-8')
                 return json.loads(data)
             else:
                 json.dumps(data)

From 3262ee6c907484b5633177c59cff4e151c55c912 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@gmail.com>
Date: Tue, 29 Sep 2015 21:59:09 +0200
Subject: [PATCH 63/67] Fixed minor doc typo.

---
 rest_framework/renderers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a450be848..c5b0aeb3c 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -4,7 +4,7 @@ Renderers are used to serialize a response into specific media types.
 They give us a generic way of being able to handle various media types
 on the response, such as JSON encoded data or HTML output.
 
-REST framework also provides an HTML renderer the renders the browsable API.
+REST framework also provides an HTML renderer that renders the browsable API.
 """
 from __future__ import unicode_literals
 

From 0e56b2ea745c0e691ea92c1e04089a19478f5ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20H=C3=A5vard=20Blindheim?= <rhblind@gmail.com>
Date: Wed, 30 Sep 2015 10:24:21 +0200
Subject: [PATCH 64/67] Added drf-haystack to third party resources

---
 docs/topics/third-party-resources.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md
index 9c302f77e..bef3effc7 100644
--- a/docs/topics/third-party-resources.md
+++ b/docs/topics/third-party-resources.md
@@ -246,6 +246,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [django-versatileimagefield][django-versatileimagefield] - Provides a drop-in replacement for Django's stock `ImageField` that makes it easy to serve images in multiple sizes/renditions from a single field. For DRF-specific implementation docs, [click here][django-versatileimagefield-drf-docs].
 * [drf-tracking][drf-tracking] - Utilities to track requests to DRF API views.
 * [django-rest-framework-braces][django-rest-framework-braces] - Collection of utilities for working with Django Rest Framework. The most notable ones are [FormSerializer](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#formserializer) and [SerializerForm](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#serializerform), which are adapters between DRF serializers and Django forms.
+* [drf-haystack][drf-haystack] - Haystack search for Django Rest Framework
 
 ## Other Resources
 
@@ -345,3 +346,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces
 [dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions
 [django-url-filter]: https://github.com/miki725/django-url-filter
+[drf-haystack]: http://drf-haystack.readthedocs.org/en/latest/

From 670b0b710b8eaebbc990969f0639c08fc6638fdf Mon Sep 17 00:00:00 2001
From: Marlon <mcastle@users.noreply.github.com>
Date: Wed, 30 Sep 2015 21:09:37 -0500
Subject: [PATCH 65/67] Use serializers.ValidationError

Per django rest framework docs, and to prevent confusion with Django's ValidationError, `serializers.ValidationError` is preferred to `exceptions.ValidationError`.
---
 rest_framework/authtoken/serializers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 597aeed22..8a295c03e 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import authenticate
 from django.utils.translation import ugettext_lazy as _
 
-from rest_framework import exceptions, serializers
+from rest_framework import serializers
 
 
 class AuthTokenSerializer(serializers.Serializer):
@@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer):
             if user:
                 if not user.is_active:
                     msg = _('User account is disabled.')
-                    raise exceptions.ValidationError(msg)
+                    raise serializers.ValidationError(msg)
             else:
                 msg = _('Unable to log in with provided credentials.')
-                raise exceptions.ValidationError(msg)
+                raise serializers.ValidationError(msg)
         else:
             msg = _('Must include "username" and "password".')
-            raise exceptions.ValidationError(msg)
+            raise serializers.ValidationError(msg)
 
         attrs['user'] = user
         return attrs

From f60c0e99f6121099ec78745e8169c1e6c8ab0667 Mon Sep 17 00:00:00 2001
From: Andrew <andseier@gmail.com>
Date: Thu, 1 Oct 2015 14:25:04 +0700
Subject: [PATCH 66/67] Small doc typo `throttles` --> `throttling`

---
 docs/api-guide/throttling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index 57bce54e7..36753aafc 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -184,7 +184,7 @@ If the `.wait()` method is implemented and the request is throttled, then a `Ret
 
 The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests.
 
-    class RandomRateThrottle(throttles.BaseThrottle):
+    class RandomRateThrottle(throttling.BaseThrottle):
         def allow_request(self, request, view):
             return random.randint(1, 10) == 1
 

From 3cdd3c5f6e7fc55aa0bf6c5e566d37179b5bb6a4 Mon Sep 17 00:00:00 2001
From: Philip Garnero <philip.garnero@epitech.eu>
Date: Fri, 2 Oct 2015 14:30:27 -0700
Subject: [PATCH 67/67] Added django-rest-framework-social-oauth2 to list of
 third party packages

---
 docs/api-guide/authentication.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 7fda98e67..3ade3a661 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -360,6 +360,10 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a
 
 [Django-rest-auth][django-rest-auth] library provides a set of REST API endpoints for registration, authentication (including social media authentication), password reset, retrieve and update user details, etc. By having these API endpoints, your client apps such as AngularJS, iOS, Android, and others can communicate to your Django backend site independently via REST APIs for user management.
 
+## django-rest-framework-social-oauth2
+
+[Django-rest-framework-social-oauth2][django-rest-framework-social-oauth2] library provides an easy way to integrate social plugins (facebook, twitter, google, etc.) to your authentication system and an easy oauth2 setup. With this library, you will be able to authenticate users based on external tokens (e.g. facebook access token), convert these tokens to "in-house" oauth2 tokens and use and generate oauth2 tokens to authenticate your users.
+
 ## django-rest-knox
 
 [Django-rest-knox][django-rest-knox] library provides models and views to handle token based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into).
@@ -404,4 +408,5 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a
 [mac]: http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token-05
 [djoser]: https://github.com/sunscrapers/djoser
 [django-rest-auth]: https://github.com/Tivix/django-rest-auth
+[django-rest-framework-social-oauth2]: https://github.com/PhilipGarnero/django-rest-framework-social-oauth2
 [django-rest-knox]: https://github.com/James1345/django-rest-knox