From fdd811ec53b3bdc46a2c934422066e1aa9f9dd05 Mon Sep 17 00:00:00 2001
From: Aider Ibragimov <aider.ibragimov@gmail.com>
Date: Wed, 4 Mar 2015 08:22:46 +0300
Subject: [PATCH 01/54] Allow blank/null on radio.html choices

---
 .../rest_framework/horizontal/radio.html      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
index 52238bb1a..efca2883e 100644
--- a/rest_framework/templates/rest_framework/horizontal/radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -1,20 +1,36 @@
+{% load i18n %}
+
 <div class="form-group">
     {% if field.label %}
         <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>
     {% endif %}
     <div class="col-sm-10">
     {% if style.inline %}
+        {% if field.allow_null or field.allow_blank %}
+            <label class="radio-inline">
+                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+                {% trans "None" %}
+            </label>
+        {% endif %}
         {% for key, text in field.choices.items %}
             <label class="radio-inline">
-                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
                 {{ text }}
             </label>
         {% endfor %}
     {% else %}
+        {% if field.allow_null or field.allow_blank %}
+            <div class="radio">
+                <label>
+                    <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+                    {% trans "None" %}
+                </label>
+            </div>
+        {% endif %}
         {% for key, text in field.choices.items %}
             <div class="radio">
                 <label>
-                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %} />
                     {{ text }}
                 </label>
             </div>

From 7159b31023640b8821131e39a7f9eaadfacb2f07 Mon Sep 17 00:00:00 2001
From: Aider Ibragimov <aider.ibragimov@gmail.com>
Date: Sat, 7 Mar 2015 07:17:22 +0300
Subject: [PATCH 02/54] update vertical and inline layouts for radio choices

---
 .../rest_framework/horizontal/radio.html        |  5 +++--
 .../templates/rest_framework/inline/radio.html  | 11 +++++++++++
 .../rest_framework/vertical/radio.html          | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
index efca2883e..cabd09d2b 100644
--- a/rest_framework/templates/rest_framework/horizontal/radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% trans "None" as none_choice %}
 
 <div class="form-group">
     {% if field.label %}
@@ -9,7 +10,7 @@
         {% if field.allow_null or field.allow_blank %}
             <label class="radio-inline">
                 <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                {% trans "None" %}
+                {{ none_choice }}
             </label>
         {% endif %}
         {% for key, text in field.choices.items %}
@@ -23,7 +24,7 @@
             <div class="radio">
                 <label>
                     <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
-                    {% trans "None" %}
+                    {{ none_choice }}
                 </label>
             </div>
         {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
index 1915f4f84..b65016715 100644
--- a/rest_framework/templates/rest_framework/inline/radio.html
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -1,7 +1,18 @@
+{% load i18n %}
+{% trans "None" as none_choice %}
+
 <div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label class="sr-only">{{ field.label }}</label>
     {% endif %}
+    {% if field.allow_null or field.allow_blank %}
+        <div class="radio">
+            <label>
+                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %}>
+                {{ none_choice }}
+            </label>
+        </div>
+    {% endif %}
     {% for key, text in field.choices.items %}
         <div class="radio">
             <label>
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html
index ed9f9ddbb..dea03e54e 100644
--- a/rest_framework/templates/rest_framework/vertical/radio.html
+++ b/rest_framework/templates/rest_framework/vertical/radio.html
@@ -1,9 +1,18 @@
+{% load i18n %}
+{% trans "None" as none_choice %}
+
 <div class="form-group {% if field.errors %}has-error{% endif %}">
     {% if field.label %}
         <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
     {% endif %}
     {% if style.inline %}
         <div>
+        {% if field.allow_null or field.allow_blank %}
+            <label class="radio-inline">
+                <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+                {{ none_choice }}
+            </label>
+        {% endif %}
         {% for key, text in field.choices.items %}
             <label class="radio-inline">
                 <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
@@ -12,6 +21,14 @@
         {% endfor %}
         </div>
     {% else %}
+        {% if field.allow_null or field.allow_blank %}
+            <div class="radio">
+                <label>
+                    <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
+                    {{ none_choice }}
+                </label>
+            </div>
+        {% endif %}
         {% for key, text in field.choices.items %}
             <div class="radio">
                 <label>

From 3e44f788b194e74777013841d18a2a035df0757d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Mon, 9 Mar 2015 17:28:00 +0100
Subject: [PATCH 03/54] Fixed a typo in the documentation's link.

---
 docs/topics/3.1-announcement.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md
index 6eb3681ff..80d4007eb 100644
--- a/docs/topics/3.1-announcement.md
+++ b/docs/topics/3.1-announcement.md
@@ -206,4 +206,4 @@ This will either be made as a single 3.2 release, or split across two separate r
 [pagination]: ../api-guide/pagination.md
 [versioning]: ../api-guide/versioning.md
 [internationalization]: internationalization.md
-[customizing-field-mappings]: ../api-guide/serializers.md/#customizing-field-mappings
+[customizing-field-mappings]: ../api-guide/serializers.md#customizing-field-mappings

From 69b6e26f06c787761bb8d6006ed6fc607fbc9d23 Mon Sep 17 00:00:00 2001
From: Bryan Alsdorf <bryan@mariadb.com>
Date: Tue, 10 Mar 2015 17:30:41 -0500
Subject: [PATCH 04/54] Changed incorrect class name

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

diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md
index 3518fb34e..eca468b8b 100644
--- a/docs/api-guide/pagination.md
+++ b/docs/api-guide/pagination.md
@@ -127,7 +127,7 @@ This pagination style mirrors the syntax used when looking up multiple database
 
 #### Setup
 
-To enable the `PageNumberPagination` style globally, use the following configuration:
+To enable the `LimitOffsetPagination` style globally, use the following configuration:
 
     REST_FRAMEWORK = {
         'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination'

From 7854c939dd077b54c8bcecb649581e2a9fd6399f Mon Sep 17 00:00:00 2001
From: James Rutherford <james.rutherford@maplecroft.com>
Date: Wed, 11 Mar 2015 10:44:42 +0000
Subject: [PATCH 05/54] Fixed import statement in API docs

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

diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md
index 8a848c20c..dd3295c4f 100644
--- a/docs/api-guide/testing.md
+++ b/docs/api-guide/testing.md
@@ -65,7 +65,7 @@ When testing views directly using a request factory, it's often convenient to be
 
 To forcibly authenticate a request, use the `force_authenticate()` method.
 
-    from rest_framework.tests import force_authenticate
+    from rest_framework.test import force_authenticate
 
     factory = APIRequestFactory()
     user = User.objects.get(username='olivia')

From 2484dbf4e15e2156079b4bcd447b17258649e67f Mon Sep 17 00:00:00 2001
From: Esmail <esmail.fadae@kobotoolbox.org>
Date: Wed, 11 Mar 2015 12:00:19 -0400
Subject: [PATCH 06/54] Fix example of explicit format URL (for real).

Do what I meant to do in #2670:

The link is displayed in the tutorial as "http://example.com/api/items/4.json" but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json".
---
 docs/tutorial/2-requests-and-responses.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md
index e2c173d6e..2cad1e5d8 100644
--- a/docs/tutorial/2-requests-and-responses.md
+++ b/docs/tutorial/2-requests-and-responses.md
@@ -200,7 +200,7 @@ See the [browsable api][browsable-api] topic for more information about the brow
 
 In [tutorial part 3][tut-3], we'll start using class based views, and see how generic views reduce the amount of code we need to write.
 
-[json-url]: http://example.com/api/items/4.json
+[json-url]: http://example.com/api/items/4/.json
 [devserver]: http://127.0.0.1:8000/snippets/
 [browsable-api]: ../topics/browsable-api.md
 [tut-1]: 1-serialization.md

From 6c1d0d7ed05941c7a673d1bb3f0e1b56a4b6ab44 Mon Sep 17 00:00:00 2001
From: Dirk Moors <dirkmoors@gmail.com>
Date: Thu, 12 Mar 2015 16:36:26 +0100
Subject: [PATCH 07/54] Fixed problem with imporing rest_framework.views in
 apps.py

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

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index f41a9ae1a..5e60448d4 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -10,7 +10,7 @@ from django.core.paginator import InvalidPage, Paginator as DjangoPaginator
 from django.template import Context, loader
 from django.utils import six
 from django.utils.six.moves.urllib import parse as urlparse
-from django.utils.translation import ugettext as _
+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 a02098b855aad0847cddacc4bed2d280017b46c5 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Fri, 13 Mar 2015 00:15:53 +0100
Subject: [PATCH 08/54] Fix the link to the old doc (#2681).

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 35592febe..84d310c2c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -154,7 +154,7 @@ For older release notes, [please see the version 2.x documentation](old-release-
 [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion
 [ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582
 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3
-[old-release-notes]: http://tomchristie.github.io/rest-framework-2-docs/topics/release-notes#24x-series
+[old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/version-2.4.x/docs/topics/release-notes.md
 
 [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22
 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22

From 8d0dbc8092a754e1f0f7d80d93506072556f35a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Fri, 13 Mar 2015 01:07:20 +0100
Subject: [PATCH 09/54] Fix lookup_url_kwarg handling in viewsets.

The ``lookup_url_kwarg`` is intended to set the name of a field in the
URL regexps when using custom ``lookup_field``, but the routers ignore
it altogether.
---
 rest_framework/routers.py |  5 +++--
 tests/test_routers.py     | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index b1e39ff7d..4df852bfb 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -218,14 +218,15 @@ class SimpleRouter(BaseRouter):
 
         https://github.com/alanjds/drf-nested-routers
         """
-        base_regex = '(?P<{lookup_prefix}{lookup_field}>{lookup_value})'
+        base_regex = '(?P<{lookup_prefix}{lookup_url_kwarg}>{lookup_value})'
         # Use `pk` as default field, unset set.  Default regex should not
         # consume `.json` style suffixes and should break at '/' boundaries.
         lookup_field = getattr(viewset, 'lookup_field', 'pk')
+        lookup_url_kwarg = getattr(viewset, 'lookup_url_kwarg', None) or lookup_field
         lookup_value = getattr(viewset, 'lookup_value_regex', '[^/.]+')
         return base_regex.format(
             lookup_prefix=lookup_prefix,
-            lookup_field=lookup_field,
+            lookup_url_kwarg=lookup_url_kwarg,
             lookup_value=lookup_value
         )
 
diff --git a/tests/test_routers.py b/tests/test_routers.py
index 08c58ec70..19eeb868d 100644
--- a/tests/test_routers.py
+++ b/tests/test_routers.py
@@ -32,6 +32,13 @@ class NoteViewSet(viewsets.ModelViewSet):
     lookup_field = 'uuid'
 
 
+class KWargedNoteViewSet(viewsets.ModelViewSet):
+    queryset = RouterTestModel.objects.all()
+    serializer_class = NoteSerializer
+    lookup_field = 'text__contains'
+    lookup_url_kwarg = 'text'
+
+
 class MockViewSet(viewsets.ModelViewSet):
     queryset = None
     serializer_class = None
@@ -40,6 +47,9 @@ class MockViewSet(viewsets.ModelViewSet):
 notes_router = SimpleRouter()
 notes_router.register(r'notes', NoteViewSet)
 
+kwarged_notes_router = SimpleRouter()
+kwarged_notes_router.register(r'notes', KWargedNoteViewSet)
+
 namespaced_router = DefaultRouter()
 namespaced_router.register(r'example', MockViewSet, base_name='example')
 
@@ -47,6 +57,7 @@ urlpatterns = [
     url(r'^non-namespaced/', include(namespaced_router.urls)),
     url(r'^namespaced/', include(namespaced_router.urls, namespace='example')),
     url(r'^example/', include(notes_router.urls)),
+    url(r'^example2/', include(kwarged_notes_router.urls)),
 ]
 
 
@@ -177,6 +188,33 @@ class TestLookupValueRegex(TestCase):
             self.assertEqual(expected[idx], self.urls[idx].regex.pattern)
 
 
+class TestLookupUrlKwargs(TestCase):
+    """
+    Ensure the router honors lookup_url_kwarg.
+
+    Setup a deep lookup_field, but map it to a simple URL kwarg.
+    """
+    urls = 'tests.test_routers'
+
+    def setUp(self):
+        RouterTestModel.objects.create(uuid='123', text='foo bar')
+
+    def test_custom_lookup_url_kwarg_route(self):
+        detail_route = kwarged_notes_router.urls[-1]
+        detail_url_pattern = detail_route.regex.pattern
+        self.assertIn('^notes/(?P<text>', detail_url_pattern)
+
+    def test_retrieve_lookup_url_kwarg_detail_view(self):
+        response = self.client.get('/example2/notes/fo/')
+        self.assertEqual(
+            response.data,
+            {
+                "url": "http://testserver/example/notes/123/",
+                "uuid": "123", "text": "foo bar"
+            }
+        )
+
+
 class TestTrailingSlashIncluded(TestCase):
     def setUp(self):
         class NoteViewSet(viewsets.ModelViewSet):

From 2266fec99dd10984e31ac4b50b9d6fed1355565b Mon Sep 17 00:00:00 2001
From: mochawich <noor.syron@gmail.com>
Date: Fri, 13 Mar 2015 17:03:51 +0100
Subject: [PATCH 10/54] fixed missing anchor closing tag

when next_url is none, big part of page html will be rendered under the <a href='#'> as it does not have a closing tag.
---
 .../templates/rest_framework/pagination/previous_and_next.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/templates/rest_framework/pagination/previous_and_next.html b/rest_framework/templates/rest_framework/pagination/previous_and_next.html
index eacbfff45..08c177098 100644
--- a/rest_framework/templates/rest_framework/pagination/previous_and_next.html
+++ b/rest_framework/templates/rest_framework/pagination/previous_and_next.html
@@ -7,6 +7,6 @@
 {% if next_url %}
     <li class="next"><a href="{{ next_url }}">Next &raquo;</a></li>
 {% else %}
-    <li class="next disabled"><a href="#">Next &raquo;</li>
+    <li class="next disabled"><a href="#">Next &raquo;</a></li>
 {% endif %}
 </ul>

From 76ede5beda74c1bb224f038d635ab586416bfca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Padilla?= <jpadilla@webapplicate.com>
Date: Sat, 14 Mar 2015 15:54:11 -0400
Subject: [PATCH 11/54] Simplify test settings

---
 tests/conftest.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 44ed070b1..03b4e3285 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,7 +18,6 @@ def pytest_configure():
         MIDDLEWARE_CLASSES=(
             'django.middleware.common.CommonMiddleware',
             'django.contrib.sessions.middleware.SessionMiddleware',
-            'django.middleware.csrf.CsrfViewMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
             'django.contrib.messages.middleware.MessageMiddleware',
         ),
@@ -27,7 +26,6 @@ def pytest_configure():
             'django.contrib.contenttypes',
             'django.contrib.sessions',
             'django.contrib.sites',
-            'django.contrib.messages',
             'django.contrib.staticfiles',
 
             'rest_framework',
@@ -35,12 +33,7 @@ def pytest_configure():
             'tests',
         ),
         PASSWORD_HASHERS=(
-            'django.contrib.auth.hashers.SHA1PasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-            'django.contrib.auth.hashers.BCryptPasswordHasher',
             'django.contrib.auth.hashers.MD5PasswordHasher',
-            'django.contrib.auth.hashers.CryptPasswordHasher',
         ),
     )
 

From c573e7b4a8b4fedfe70b934571284d84e9a81103 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 16 Mar 2015 11:57:28 +0000
Subject: [PATCH 12/54] Latest translation strings

---
 .../locale/de/LC_MESSAGES/django.mo           | Bin 6575 -> 9184 bytes
 .../locale/de/LC_MESSAGES/django.po           |  69 ++++-----
 .../locale/en_US/LC_MESSAGES/django.mo        | Bin 378 -> 378 bytes
 .../locale/es/LC_MESSAGES/django.mo           | Bin 8906 -> 9201 bytes
 .../locale/es/LC_MESSAGES/django.po           |  12 +-
 .../locale/et/LC_MESSAGES/django.mo           | Bin 2018 -> 8823 bytes
 .../locale/et/LC_MESSAGES/django.po           | 138 +++++++++---------
 .../locale/pl/LC_MESSAGES/django.mo           | Bin 8981 -> 9260 bytes
 .../locale/pl/LC_MESSAGES/django.po           |  11 +-
 .../locale/ru/LC_MESSAGES/django.mo           | Bin 9778 -> 10429 bytes
 .../locale/ru/LC_MESSAGES/django.po           |  15 +-
 .../locale/tr/LC_MESSAGES/django.mo           | Bin 7946 -> 9039 bytes
 .../locale/tr/LC_MESSAGES/django.po           |  21 +--
 13 files changed, 135 insertions(+), 131 deletions(-)

diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo
index 48245c6095528c08ac4ffc8593e2dd3fba459c65..91f102eb198f2839c249c525fa6edbbe010d11db 100644
GIT binary patch
literal 9184
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
Wnt+VTsg_37=1N*$Uu#AZsQ(A3zcP~m

delta 1514
zcmYM!duUr#9Ki8kn;Bi2zLPdLX}h~eTi2~!o7kpChqaG|N`0Vl4j)LGUTo|mn#314
z0u~(TA0me`K^+dZIR$YeqM*+G(V~J1j!p0%#~2Fpula|dFkj!_?PdPp+|N1Zw)dWU
ze!r7T=?@c?i!Ga0g&3iA(7vq^nZ_4=T!?oziEPEAXyY12@MqM&{~Kc%y+NcOM{qaJ
z;W)mI`|tv$G3FN;!yN7xsmL)pNhYr0ZJ4-GB!vak`S)=KFJlYtxoP9Y<G7vi<DM%x
z%=lgG#-H#G^lcWIzzH0{LpX{byW@(;RXTf_=n9B5;G-DD1#kQ^>Wf#g3r}J%euZs#
z6>ap_iO`i^)cH8J<20r*i@Ia)dGlZDnD@&?I=Y3|P+#00<SQ|bx`ng23y<Rvo<j?L
z^&56#oN*FAC4En#erb23$PUb)rtk&48Q=8g*Rc{};#WEe{0HyFcoW--FX4lD8SlZ-
zW|0GU2&eH9-i>{1&lEn7llTRaTk*ASeAvUNDR~w(#cz53*h>EQF%e=FVSEJjfluRI
zcoww=0^A(Kan$h&>iy4<HHe@6)-Q~pj#J3L%8WOk#odfoa2uZT#^>AEe?HnxR3|i%
zFrFy`cppxpK6n-N{wLn}2hTrHi_qdo4C7wRU<niWHEM1Bg_`0Nd9!gpCh@rnof<kC
zHceNj(L>WB)99m7%-4f5xgJ^<e2lvY-XWYuH?)p8Q0}6=lkDz{7Pu}{7eiL1($7Uh
zE1QGh2I-Mn+AXv#G~G%K((2|>`_!0lB4v=KMK(l>(=@a=H8}FJ)9w9#(G#FMth>q%
z^|(JgdTcZ_6%@Byy_zqrR(4qSn8*C->YD#>ZS}<FWR0=v9x!vkkomptxH%cT)ts(B
zV$L<ZZH_c1Ol{LQrqq1F9BsKWHPoLNw1-Ag@#L;SA~2IJmHRWr>~d)_TP_q+c4oe?
zlr7m4^Tm9roOkTo%Y~&eTF#po$Q72V-?cW^)Q=Ymi%xGTH}4efhs>2wpBWCn+T<+T
zcjj`=Q)PSJ$<8@Nb3R<ErrUzG=A%f530sXO-5xR@M1tnuNRQ8%bxg07aXn~Ru5VZ~
z<`-*+2}Fm@E7AMSZ?UL38*4C?Sk+8*Oqhe6XUz9q>t=n+X!qLZvrcg-UoJa~W!^lQ
j)oUrgJZCRB`DMqQ$eSnZGd_mqwXI<j*!HJc*#69a$0X5O

diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po
index 74bee4167..387e916b4 100644
--- a/rest_framework/locale/de/LC_MESSAGES/django.po
+++ b/rest_framework/locale/de/LC_MESSAGES/django.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Fabian Büchler <fabian@buechler.io>, 2015
 # Thomas Tanner, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-03-07 19:50+0000\n"
+"Last-Translator: Fabian Büchler <fabian@buechler.io>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/django-rest-framework/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +81,7 @@ msgstr "Methode \"{method}\" nicht erlaubt."
 
 #: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
-msgstr "Kann den Accept header der Anfrage nicht erfüllen."
+msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen."
 
 #: exceptions.py:121
 msgid "Unsupported media type \"{media_type}\" in request."
@@ -101,7 +102,7 @@ msgstr "Dieses Feld darf nicht Null sein."
 
 #: fields.py:487 fields.py:515
 msgid "\"{input}\" is not a valid boolean."
-msgstr "\"{input}\" ist kein gültiger Boole'scher Wert."
+msgstr "\"{input}\" ist kein gültiger Wahrheitswert."
 
 #: fields.py:550
 msgid "This field may not be blank."
@@ -117,7 +118,7 @@ msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist
 
 #: fields.py:587
 msgid "Enter a valid email address."
-msgstr "Gebe eine gültige E-Mail Adresse an."
+msgstr "Gib eine gültige E-Mail Adresse an."
 
 #: fields.py:604
 msgid "This value does not match the required pattern."
@@ -127,15 +128,15 @@ msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster."
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
-msgstr "Gebe ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein."
+msgstr "Gib ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein."
 
 #: fields.py:627
 msgid "Enter a valid URL."
-msgstr "Gebe eine gültige URL ein."
+msgstr "Gib eine gültige URL ein."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" ist keine gültige UUID."
 
 #: fields.py:657
 msgid "A valid integer is required."
@@ -147,7 +148,7 @@ msgstr "Stelle sicher, dass dieser Wert kleiner oder gleich {max_value} ist."
 
 #: fields.py:659 fields.py:693 fields.py:726
 msgid "Ensure this value is greater than or equal to {min_value}."
-msgstr "Stelle sicher, dass dieser Wert größer oder gleich {max_value} ist."
+msgstr "Stelle sicher, dass dieser Wert größer oder gleich {min_value} ist."
 
 #: fields.py:660 fields.py:694 fields.py:730
 msgid "String value too large."
@@ -174,11 +175,11 @@ msgstr "Stelle sicher, dass es nicht mehr als {max_whole_places} Stellen vor dem
 
 #: fields.py:813
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
-msgstr "Datum- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
+msgstr "Datums- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
 
 #: fields.py:814
 msgid "Expected a datetime but got a date."
-msgstr "Erwarte eine Datum- und Zeitangabe, erhielt aber ein Datum."
+msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum."
 
 #: fields.py:878
 msgid "Date has wrong format. Use one of these formats instead: {format}."
@@ -186,7 +187,7 @@ msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {f
 
 #: fields.py:879
 msgid "Expected a date but got a datetime."
-msgstr "Erwarte ein Datum, erhielt aber eine Datum- und Zeitangabe."
+msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe."
 
 #: fields.py:936
 msgid "Time has wrong format. Use one of these formats instead: {format}."
@@ -207,7 +208,7 @@ msgstr "Es wurde keine Datei übermittelt."
 #: fields.py:1068
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
-msgstr "Die übermittelten Daten sind keine Datei. Prüfe den Kodierungstyp im Formular."
+msgstr "Die übermittelten Daten stellen keine Datei dar. Prüfe den Kodierungstyp im Formular."
 
 #: fields.py:1069
 msgid "No filename could be determined."
@@ -220,53 +221,53 @@ msgstr "Die übermittelte Datei ist leer."
 #: fields.py:1071
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
-msgstr ""
+msgstr "Stelle sicher, dass dieser Dateiname höchstens {max_length} Zeichen lang ist (er hat {length})."
 
 #: fields.py:1113
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr ""
+msgstr "Lade ein gültiges Bild hoch. Die hochgeladene Datei ist entweder kein Bild oder ein beschädigtes Bild."
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
-msgstr ""
+msgstr "Ungültige Seite \"{page_number}\": {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Ungültiger Zeiger"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
-msgstr ""
+msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht."
 
 #: relations.py:134
 msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr ""
+msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}."
 
 #: relations.py:157
 msgid "Invalid hyperlink - No URL match."
-msgstr ""
+msgstr "Ungültiger Hyperlink - entspricht keiner URL."
 
 #: relations.py:158
 msgid "Invalid hyperlink - Incorrect URL match."
-msgstr ""
+msgstr "Ungültiger Hyperlink - URL stimmt nicht überein."
 
 #: relations.py:159
 msgid "Invalid hyperlink - Object does not exist."
-msgstr ""
+msgstr "Ungültiger Hyperlink - Objekt existiert nicht."
 
 #: relations.py:160
 msgid "Incorrect type. Expected URL string, received {data_type}."
-msgstr ""
+msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}."
 
 #: relations.py:295
 msgid "Object with {slug_name}={value} does not exist."
-msgstr ""
+msgstr "Objekt mit {slug_name}={value} existiert nicht."
 
 #: relations.py:296
 msgid "Invalid value."
@@ -278,39 +279,39 @@ msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten."
 
 #: validators.py:22
 msgid "This field must be unique."
-msgstr "Dieses Feld muss eineindeutig sein."
+msgstr "Dieses Feld muss eindeutig sein."
 
 #: validators.py:76
 msgid "The fields {field_names} must make a unique set."
-msgstr ""
+msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden."
 
 #: validators.py:219
 msgid "This field must be unique for the \"{date_field}\" date."
-msgstr ""
+msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Datums eindeutig sein."
 
 #: validators.py:234
 msgid "This field must be unique for the \"{date_field}\" month."
-msgstr ""
+msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Monats eindeutig sein."
 
 #: validators.py:247
 msgid "This field must be unique for the \"{date_field}\" year."
-msgstr ""
+msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein."
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr ""
+msgstr "Ungültige Version in der \"Accept\" Kopfzeile."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
-msgstr ""
+msgstr "Ungültige Version im URL Pfad."
 
 #: versioning.py:138
 msgid "Invalid version in hostname."
-msgstr ""
+msgstr "Ungültige Version im Hostname."
 
 #: versioning.py:160
 msgid "Invalid version in query parameter."
-msgstr ""
+msgstr "Ungültige Version im Anfrageparameter."
 
 #: authtoken/serializers.py:20
 msgid "User account is disabled."
diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo
index eb60d9d7e1123950e713bfcb32e08531629dca0f..8a8b9d55e627769ca4ebed265a5e11b12ae3097c 100644
GIT binary patch
delta 12
Ucmeyx^owc2R3;OHiPIkg03+80j{pDw

delta 12
Ucmeyx^owc2R3;<iiPIkg03+E2kN^Mx

diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo
index 814db7be9869ad30aab02fc08c8b1bec51921dc1..f8a064e3cbd452e12d4b56b79f8fff7c09ae4d3e 100644
GIT binary patch
delta 1872
zcmZA1O>7ip9LMoz+hyBsd2I_)q1}hJ2w3`NZGlos>9$?4Xf;qmn;M;NH_e#sF4>m`
zX-p$rj9fI8#1}9~tci(wVDaLC3sH$L2Z=^B1_F36l3+Y|(1Y>&n^|J?$v*R$=h>NO
zp6CDkXTBKvJ+^S8DtN|FMyMO9xe{X%_*IYt<=K!io6tdvr?4L1#r1dvb>C080sq7n
zTw7+$c8uZx9>ZZQU=07leq$EQK)EqT=s1Nt@JHN@RTciEp1>a3Z=(MH4iDmrFxTJ&
zY67#^h%XoY2sO?%?823m#%#tx)OgR~PM&X;IN3|b4UA&_a${O?3RmK*xD(IgR{Q}K
zk&+e0Jd91K{!whl<EZ=J$31u*HO@K?58`H2yPrcN&o`r-Xa(7#ujmijAEH+H4Jzb6
z;}$Gk#bDTs76*_;nmD#$3ibcn_yB&4n%LK<(Ep8k-tcPTuM6UwsAC?rhp%HdUP6WZ
zZn53C#$Uk%w$YzQ?d=ja<1g5OHOzV(hp`sV7ySeuq5Umh4j5BbP5hha_^ig5hwv_1
ztXk`bv=g;wlNiC1_$Xe$KKvfXa2?B?z$EU&&x=;Dx~FK5;2@quCE;y!aNBy~-^<Bq
zQdwTbBe;xdD-x5q3y-5#d=XpmHY${B*ic1a92J4Hs9d^=qgc)$hwvzBq95Q8mJn`&
zYW6R1qNE$g9z2KbcpbN4MV<dTb)qKXpss%lwW6D-ftpAVUEhUjKZBakF;sG%E&3^H
z{Cl_w7b3*fa<UH<>M3MQ^Ac)+_mI3Z*H90*g-Xs!>nB$mYGN^b8ec?y<|YSyAM_M$
zaV=`xKHPzm*sb^fwPMGYsF0U7_%n>)VcJjP9$Z32=nhU|J+n~G%%kqRfJ&~*7{J|B
zPQC5YeJa}fy;N<b@<`7&<dC;AK1kk&LfsmeEj0a9l_-_mG^J`#^gzA)`>9&JUQ1HK
z3+(~ag#TYE=->tMiXt7NMtHvA`(XH{c(2Z5*hf{-KI+4x@F|onRDxtWsmrJ;1j8%Z
zsuC)1miGn(y<UIo2(wqJIV$v(e$zX;<iUT+Dq6ffUMRPtvYcG>k`25Mias_f<<tT1
z%uh0%_EIfXSw2F&U+Na?Lb1Ar`8g+<PrT4z-K<TebJnqRxYKrQ?7(1QDzq^eo_6Co
zH=S}a&o7<~Zz*KMrvssQK9fyn3V&4o8XD|uY45fjyL!4hn%gPigHATraya9pvPmbG
z&h*&F-I;tMX=CZsi7W3U6DMr%tUE))NzOT${+U_FO%`nRP$2T}WKwCH$l83$n}(g^
rHg`H*h}YZ;F1O4l?#;(dFCMLJEktX73#^WM6S8jV{<R$&-YEMA%jeZ?

delta 1687
zcmY+^S!_&E9LMqhFs3W2YH4k^_Nwl>n9{|lR!Bq)(b9(rVu@<f84?<XNIZHGOK3ci
zSQ5dAw3a6lK@f=-iAYN0Nr*-$B7A>$F5#b?`J8iR?!D*y&;QP+=0{EO*V+E#Mzqi-
z(>4w>i(rqR55ftU<zqfN7{ZCT8TI@9I0;W<5#Gf4IDkuVOp4hu3}Z8%!3KPb>&)Ud
zGu5n`iEgaL1g^l37{uDN<oA1UCF3iYjXzKe7?o}|0}DM@VI|`z&cchR`#i%MOwTZ@
z#}I~iz8$7h%)|rK55C}BEXhpnd_B%%ybm>h9!v2l>bhUJ7>h@;7~F|@*zJu^pcZ%@
zwcv-I?=;WzZ8%qHM{{s025}Cy;&?oS4xU0bVSQMF_r32w;{?VTqmv7pfl754^}rs~
z_kG^@IqJwhV7!V>dR8*Uji~Wn)DEs<2|h-h<qs^xx-n*DxC2|U2Xpa@XBN9DXFLyY
z`^?&LCga>3v)NdO%H)<D@~<;G%EUChfeY{j)?wN>v$fcQZFm+N@tbEY=~>NqKQ6^*
zsA9`uyAj-gi}0@JcU;G~nhI71j!q>13+Y^9LOUJ6V$5MX+HnZA<0Dv)*KrjN;u>5+
znzX<Z*o5yfgyq~lh<mUUuVDec!6MA$Toz(5PDdBSP&?>FvTQ$57mS*c9M_;0vK*DV
z-JWMr4|st2ID`)7QAo;cEiz>h)b(+sT<kLH{_$IMRGkAzb}W^1(8?Ta$2N4Z7fFu2
zM4jaz>c$hCWbIU972^(Xd=A;Hy+SQ;2*X&wDi`AcBtvn#LuVrsUs1&oo}Rq08&yOn
z(TCMEKdptP2kCh90BX*yc5wecbdP_dhQU}GHE6u4Zarw>!)T3q{~bE1H0@5Qsi*x3
zy@uMYg4gwLRMOL{*g&IJ-M0nY$l$Yr#=70mZk1sLdvpt2saK5W`IhE(%_!>sLItGY
zpVF=BIvk-1Vt5kc6?O|xnNp~hlx`KV>PbPZT7ahGRgtSMRD`NCcOmoXaGdTtt$#Xd
z&#eI!nu<m-^;mnLIdLzL=TGEj9P}kFWcCLd%Ze&WowBN6d39kak-jn#jTMEvBD<nH
zBeBk|pcCHK*%664p>18;qp|H<oJFzDjt1H$ZzAzzY?CihG48!Tu{E#XmuQ`QD&;pD
C->B9A

diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po
index 28ef893d4..9c097e768 100644
--- a/rest_framework/locale/es/LC_MESSAGES/django.po
+++ b/rest_framework/locale/es/LC_MESSAGES/django.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # José Padilla <jpadilla@webapplicate.com>, 2015
-# Miguel González <migonzalvar@activitycentral.com>, 2015
+# Miguel González <migonzalvar@gmail.com>, 2015
 # Sergio Infante <rsinfante@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-03-06 19:51+0000\n"
+"Last-Translator: Miguel González <migonzalvar@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/django-rest-framework/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -137,7 +137,7 @@ msgstr "Introduzca una URL válida."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" no es un UUID válido."
 
 #: fields.py:657
 msgid "A valid integer is required."
@@ -232,7 +232,7 @@ msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
@@ -240,7 +240,7 @@ msgstr "Página \"{page_number}\" inválida: {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Cursor inválido"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo
index ca9b6ec4b7616e9efccc29ae0a2b604aa476aef8..74a159d4576f8e3555a3d325ad64f12d72f3bfa4 100644
GIT binary patch
literal 8823
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

delta 702
zcmYMwO-~a+7zgl2L}-iHH(jdKGGMeZwWUY{NkxNEFvNy~Aoq!#(6!qgvNMZlOo)2%
zXnf*Dy%6={!4E(*@$KX{(1S6adhl-I$^UANPx7DN>|}PH+5LI(dvg10rvDM4Qb-<o
zii||_Js411@DjWU=ixh8hkboSv+yj;zz|07--k!w3s{72VRT-%C+#H~#d8i$5^Ylr
zlM)u1@GyMP^Cf(ZW*^}htl!y3RDo~c68r%haAttWf%o7Td<+Y47oq`uh6iDMkmwLB
zz^G3Ro<M(E#w5Bx2y<`;7U3>Le~KgfkzoXPp&=xJ;DZQT=m7GsqQ4kb>@Spr=>Mns
zG2+huYr!`mFUF4Zv6#!x;#=HGOyrjQP3gH!5gHZvvZE$9q%k*i@Gx0&R&3z<>jE1>
zC9KxMlfk-TnX2-u)DYiFm$;iQ^G;@(2eWt2PnD;uVrr&-dbU(WB^uJ$@@gP`<4LQ7
zx>#-Ljx^#zD{zf<m6)@-Gml*BE%2x8uYonC{AS4KoH@Sj6uIjR^OunY9?vb;L|X@e
zYFl54t5+HoT5*jsR*JT2S$9*Y@`lE_Lds^KjH%F?^c3fhj&iI}<@W_A`{B9g3hm>Z
qR%mQ!Jh#nH#`6446nSy{RPM4gp_SKVTl-c=8%^jb8#XyTaq>68GmIMm

diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po
index dec03d4d8..7a4837e8c 100644
--- a/rest_framework/locale/et/LC_MESSAGES/django.po
+++ b/rest_framework/locale/et/LC_MESSAGES/django.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-02-27 16:24+0000\n"
+"Last-Translator: Tõnis Kärdi <tonis.kardi@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/django-rest-framework/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,31 +20,31 @@ msgstr ""
 
 #: authentication.py:69
 msgid "Invalid basic header. No credentials provided."
-msgstr ""
+msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata."
 
 #: authentication.py:72
 msgid "Invalid basic header. Credentials string should not contain spaces."
-msgstr ""
+msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid."
 
 #: authentication.py:78
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
-msgstr ""
+msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud."
 
 #: authentication.py:90
 msgid "Invalid username/password."
-msgstr "Vale kasutajatunnus/salasõna."
+msgstr "Sobimatu kasutajatunnus/salasõna."
 
 #: authentication.py:156
 msgid "Invalid token header. No credentials provided."
-msgstr ""
+msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata."
 
 #: authentication.py:159
 msgid "Invalid token header. Token string should not contain spaces."
-msgstr ""
+msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada tühikuid."
 
 #: authentication.py:168
 msgid "Invalid token."
-msgstr ""
+msgstr "Sobimatu lubakaart."
 
 #: authentication.py:171
 msgid "User inactive or deleted."
@@ -52,43 +52,43 @@ msgstr "Kasutaja on inaktiivne või kustutatud."
 
 #: exceptions.py:38
 msgid "A server error occurred."
-msgstr ""
+msgstr "Viga serveril."
 
 #: exceptions.py:73
 msgid "Malformed request."
-msgstr ""
+msgstr "Väändunud päring."
 
 #: exceptions.py:78
 msgid "Incorrect authentication credentials."
-msgstr ""
+msgstr "Ebakorrektne autentimistunnus."
 
 #: exceptions.py:83
 msgid "Authentication credentials were not provided."
-msgstr ""
+msgstr "Autentimistunnus on esitamata."
 
 #: exceptions.py:88
 msgid "You do not have permission to perform this action."
-msgstr ""
+msgstr "Teil puuduvad piisavad õigused selle tegevuse teostamiseks."
 
 #: exceptions.py:93
 msgid "Not found."
-msgstr ""
+msgstr "Ei leidnud."
 
 #: exceptions.py:98
 msgid "Method \"{method}\" not allowed."
-msgstr ""
+msgstr "Meetod \"{method}\" pole lubatud."
 
 #: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
-msgstr ""
+msgstr "Päringu Accept-päist ei suutnud täita."
 
 #: exceptions.py:121
 msgid "Unsupported media type \"{media_type}\" in request."
-msgstr ""
+msgstr "Meedia tüüpi {media_type} päringus ei toetata."
 
 #: exceptions.py:134
 msgid "Request was throttled."
-msgstr ""
+msgstr "Liiga palju päringuid."
 
 #: fields.py:153 relations.py:132 relations.py:156 validators.py:77
 #: validators.py:155
@@ -101,23 +101,23 @@ msgstr "Väli ei tohi olla tühi."
 
 #: fields.py:487 fields.py:515
 msgid "\"{input}\" is not a valid boolean."
-msgstr ""
+msgstr "\"{input}\" pole kehtiv kahendarv."
 
 #: fields.py:550
 msgid "This field may not be blank."
-msgstr ""
+msgstr "See väli ei tohi olla tühi."
 
 #: fields.py:551 fields.py:1324
 msgid "Ensure this field has no more than {max_length} characters."
-msgstr ""
+msgstr "Veendu, et see väli poleks pikem kui {max_length} tähemärki."
 
 #: fields.py:552
 msgid "Ensure this field has at least {min_length} characters."
-msgstr ""
+msgstr "Veendu, et see väli oleks vähemalt {min_length} tähemärki pikk."
 
 #: fields.py:587
 msgid "Enter a valid email address."
-msgstr "Sisesta kehtiv e-posti aadress."
+msgstr "Sisestage kehtiv e-posti aadress."
 
 #: fields.py:604
 msgid "This value does not match the required pattern."
@@ -127,27 +127,27 @@ msgstr "Väärtus ei ühti etteantud mustriga."
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
-msgstr ""
+msgstr "Sisestage kehtiv \"slug\", mis koosneks tähtedest, numbritest, ala- või sidekriipsudest."
 
 #: fields.py:627
 msgid "Enter a valid URL."
-msgstr "Sisesta korrektne URL."
+msgstr "Sisestage korrektne URL."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" pole kehtiv UUID."
 
 #: fields.py:657
 msgid "A valid integer is required."
-msgstr ""
+msgstr "Sisendiks peab olema täisarv."
 
 #: fields.py:658 fields.py:692 fields.py:725
 msgid "Ensure this value is less than or equal to {max_value}."
-msgstr "Veendu, et väärtus on väiksem kui või võrdne väärtusega {max_value}. "
+msgstr "Veenduge, et väärtus on väiksem kui või võrdne väärtusega {max_value}. "
 
 #: fields.py:659 fields.py:693 fields.py:726
 msgid "Ensure this value is greater than or equal to {min_value}."
-msgstr "Veendu, et väärtus on suurem kui või võrdne väärtusega {min_value}."
+msgstr "Veenduge, et väärtus on suurem kui või võrdne väärtusega {min_value}."
 
 #: fields.py:660 fields.py:694 fields.py:730
 msgid "String value too large."
@@ -155,166 +155,166 @@ msgstr "Sõne on liiga pikk."
 
 #: fields.py:691 fields.py:724
 msgid "A valid number is required."
-msgstr ""
+msgstr "Sisendiks peab olema arv."
 
 #: fields.py:727
 msgid "Ensure that there are no more than {max_digits} digits in total."
-msgstr "Veendu, et kokku pole rohkem kui {max_digits}."
+msgstr "Veenduge, et kokku pole rohkem kui {max_digits} numbit."
 
 #: fields.py:728
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
-msgstr "Veendu, et komakohti pole rohkem kui {max_decimal_places}. "
+msgstr "Veenduge, et komakohti pole rohkem kui {max_decimal_places}. "
 
 #: fields.py:729
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
-msgstr ""
+msgstr "Veenduge, et täiskohti poleks rohkem kui {max_whole_digits}."
 
 #: fields.py:813
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "Valesti formaaditud kuupäev-kellaaeg. Kasutage mõnda neist: {format}."
 
 #: fields.py:814
 msgid "Expected a datetime but got a date."
-msgstr ""
+msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva."
 
 #: fields.py:878
 msgid "Date has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}."
 
 #: fields.py:879
 msgid "Expected a date but got a datetime."
-msgstr ""
+msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja."
 
 #: fields.py:936
 msgid "Time has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}."
 
 #: fields.py:992 fields.py:1036
 msgid "\"{input}\" is not a valid choice."
-msgstr ""
+msgstr "\"{input}\" on sobimatu valik."
 
 #: fields.py:1037 fields.py:1151 serializers.py:482
 msgid "Expected a list of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi."
 
 #: fields.py:1067
 msgid "No file was submitted."
-msgstr ""
+msgstr "Ühtegi faili ei esitatud."
 
 #: fields.py:1068
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
-msgstr ""
+msgstr "Esitatud andmetes ei olnud faili. Kontrollige vormi kodeeringut."
 
 #: fields.py:1069
 msgid "No filename could be determined."
-msgstr ""
+msgstr "Ei suutnud tuvastada failinime."
 
 #: fields.py:1070
 msgid "The submitted file is empty."
-msgstr ""
+msgstr "Esitatud fail oli tühi."
 
 #: fields.py:1071
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
-msgstr ""
+msgstr "Veenduge, et failinimi oleks maksimaalselt {max_length} tähemärki pikk (praegu on {length})."
 
 #: fields.py:1113
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr ""
+msgstr "Laadige üles kehtiv pildifail. Üles laetud fail ei olnud pilt või oli see katki."
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
-msgstr ""
+msgstr "Sobimatu lehekülg \"{page_number}\": {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Sobimatu kursor."
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
-msgstr ""
+msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas."
 
 #: relations.py:134
 msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr ""
+msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}."
 
 #: relations.py:157
 msgid "Invalid hyperlink - No URL match."
-msgstr ""
+msgstr "Sobimatu hüperlink - ei leidnud URLi vastet."
 
 #: relations.py:158
 msgid "Invalid hyperlink - Incorrect URL match."
-msgstr ""
+msgstr "Sobimatu hüperlink - vale URLi vaste."
 
 #: relations.py:159
 msgid "Invalid hyperlink - Object does not exist."
-msgstr ""
+msgstr "Sobimatu hüperlink - objekti ei eksisteeri."
 
 #: relations.py:160
 msgid "Incorrect type. Expected URL string, received {data_type}."
-msgstr ""
+msgstr "Sobimatu andmetüüp. Ootasin URLi sõne, sain {data_type}."
 
 #: relations.py:295
 msgid "Object with {slug_name}={value} does not exist."
-msgstr ""
+msgstr "Objekti {slug_name}={value} ei eksisteeri."
 
 #: relations.py:296
 msgid "Invalid value."
-msgstr ""
+msgstr "Sobimatu väärtus."
 
 #: serializers.py:299
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
-msgstr ""
+msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {datatype}."
 
 #: validators.py:22
 msgid "This field must be unique."
-msgstr ""
+msgstr "Selle välja väärtus peab olema unikaalne."
 
 #: validators.py:76
 msgid "The fields {field_names} must make a unique set."
-msgstr ""
+msgstr "Veerud {field_names} peavad moodustama unikaalse hulga."
 
 #: validators.py:219
 msgid "This field must be unique for the \"{date_field}\" date."
-msgstr ""
+msgstr "Selle välja väärtus peab olema unikaalne veerus \"{date_field}\" märgitud kuupäeval."
 
 #: validators.py:234
 msgid "This field must be unique for the \"{date_field}\" month."
-msgstr ""
+msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud kuul."
 
 #: validators.py:247
 msgid "This field must be unique for the \"{date_field}\" year."
-msgstr ""
+msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud aastal."
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr ""
+msgstr "Sobimatu versioon \"Accept\" päises."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
-msgstr ""
+msgstr "Sobimatu versioon URLi rajas."
 
 #: versioning.py:138
 msgid "Invalid version in hostname."
-msgstr ""
+msgstr "Sobimatu versioon hostinimes."
 
 #: versioning.py:160
 msgid "Invalid version in query parameter."
-msgstr ""
+msgstr "Sobimatu versioon päringu parameetris."
 
 #: authtoken/serializers.py:20
 msgid "User account is disabled."
-msgstr "Kasutajakonto on suletud"
+msgstr "Kasutajakonto on suletud."
 
 #: authtoken/serializers.py:23
 msgid "Unable to log in with provided credentials."
diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo
index 9db72cfb3535780580d2702aae172af4eed6c5d8..a4e0d1f1cc4ca860a66b21e6cbb5143b0970b981 100644
GIT binary patch
delta 1889
zcmZA1TWl0n9LMp~W!d6ZP}_2;y&c+e(RO<Uiz~F-i(3$s1guI;(4j1K+U@RUXKN{q
zHh~8d#i*$b#s|_EdC+K$SxpG>&D0m`185Tg!;=XH9*rhKLj3+_Yc!tpKc91Ey65sg
zXJ#(`+1{BOrNKEv*-umvxqvYVTncibyc{xSGdgJT4A$VsxCy^S{q7g6#J@0t>x+$P
z!anT948}2!19%5x#>|-BHO4&0jWgJZ*YF7}y{|B-XD~|pL)7zSJb-J%{0|PHCNPfm
z_~wcWsD7^CPFz=F%oglN^*4&U7~fo=(#?$<*oQUu8`F%(a2>vfyKo-2<5g5f0&9(V
z6dO?Y4`M5xME(8~+=D-(`q{wcVcddh$GFrpzBx!mEAUo)R}W}^j#}YmRLXzFZMf<I
zI>Sb^*o!RE3}XwXP|wffM*JEzu^&*WzlRzx{vi3+KMYgRjcL>#et?hRSE!WVUTN1q
zR9L|fws3y}wYL|r5r4xrEN9k7Fpd>Czv3lqr~MQDUSv#h8Ts$v#@+J5-n6VYrjGU?
zDpe=30cTMiT|{Nz3aX<!*o6_6`vN9$5EoHfTFL4T;ftuVuz=d)TX+JSH<AB-DsvoV
zc@1C3T1KnJ^Qg>xgIeKL)CyNKyB*kx%0LozCceNPyo`sjjC3Bw5gfzsP~)`IDRVcI
zGgP#Kw{a&fp=KIj^hdA@oADLY{c{+@A5k5Z*A&jk5!7K!B8xZYa4RmL#bvC;KT(Hu
z0}bYAX1b~9!4Mav_7rMnAECD5B642Lb=02UM*1+7w($N(QCoNzmD)FuMVjwX6S;}Z
z)!f4dtRhWMV-G&B_x~L#+M}DO6h|2~f+sMJ@8cf4j(QC%cr}jVA>_||$wlw=GPdGf
zEJ9^V&y~F>p`!k}2`xn1r}6#OD%Hh=wm@Yoq4dNEl|F(qYF4R1(F&FBy~N{$GRM*I
zC$JAS;r|!DTZR|JFPd<OsAYV^_rdT@@ekHh*hQ%D*7++|+BlbfR!EYc?$xM5Qv9OK
z1&C6jhX@iXd@}r3S@klalPFPRrMTM5{}%1F_N|?0A_fS~q<`4J|Dc3bp{yZ#{aWEr
zsk)o6#FNB+;-6AITOAsxuA6?<NlqkQtFx|WQ|X*_EH~Wac5rZCfBsmgDi}WQ4(Hr-
z%E?a6o(^xzd*Qc=Lc<eTFP+W*QF1F3>xi`Oux*{u){e$jO89`|<s#2!os^e!a_MZ;
zX54fxJL-(N<E}GicPA4g>7?U%oo%s^amP*OZQ0qP&Hqj$<tFTC!pqrAI+JxKQ&Z!G
z$$VPA6x{ADo=#7u+%c!gI?05k<5N@PPAY9}-L#v^Oypk5O=Vb4-mTaeD4DX8-k7s^
Mi67)AD(8#;24}3`@c;k-

delta 1687
zcmYk+OGs2v9LMp$I*m1&rM=DUnw6#btbB}S>R1XDlGzI?m|pZY94RYojG#?Hi!j4n
z)FLQ|2&RG{++>IaWzo9mK`n}E5kW-M_jl(K9sJMdoHKgwIsgAT-fZq&8GV)E>or<4
zkwt7tGz;T^j}MyTH_O2sbTEX|aVP5cyKyG=V<FzdMfe^YFg@99CAMJ`UdB3nha1eI
zHg~L91rsN*8e_N$zhV%p$Hl)tf~y(d!VLU{T0mOBEEfwrTW~4k2+qSBsOLPxN(`i!
zEyoasc)y*dQ^dqD>KA_C0xV9A?|c*HGd_-*zlJ6F6!mw1a2XbjXEAsHGx3BszKB}j
zHPnJfJU?ij_gfNwr5)vAHU=>dH{(=1g$`aqHevU%7>B&?zvDE<DHGxg%SENS4fVnS
z)c5zj@pDwkzF@SRPGDj@#r3H1G1LxjV=+EK)$$h>U~RftDel9~IDj+ohv!6gQ^q(S
zzbBY&#l?(UC&x>22KD@#lU08@!%XM_pHVyaPl-RE2x}RKaT8v__4pH2!xqxhisw;h
z=PiaXo9*t#?bwJTo@t!ilZ@BlEPOGY{3}J@n9$C~vkL933bo_?sMCK7>v0s<VFt_J
zhP!b;K0>{yl)P%eM{p_LMJ?<TF2p=uR)lL&^F2{Ib#xw}9`GB<mNl?E9lG_%rmP3&
zV;?#=h_mrE>QMecrF21dd_IKA<PIcRb{6O0Rix}Tgeq<HB^`du$J0oH<)Ug;gG%LL
zWbt+fwUANdUG@=Gx-pK~8qCLy*o7*|C@Q15q^}TLQ2z(IaTyL_rS5+s%i6|7HR_u5
zqweh>mf(9#zzV`gG!x}S1EGa+=G@Z`Zc3G<{~Ir{NrbY>O|=?A8%QMTb^jeYV+rk^
zo8%rWaGO%7U8-?i|25TCSFw)Z%(|%ux25o@46<&wX}8*#8k@EygwBH6RNim=BXgVT
z^nVL_gJe|dYKbx4T#~11xq>M3#wwYzrbE`~&2eVUPjCs`nk&013AZ`EkVSMTr+e~s
z=s1H`Md)CuhHBXtw)&f55B-_G*o>5(gxK}eH~#w4!o?*{X?d`$qM(EpSRIaZ7PfVS
z4@C}yJKH;gPTQXLgW-r1+S9Q&(z$n+Q`6agu#VW_O~ghfolA&yO?m8#9nB0R#`>~)
Glm7xId8fqy

diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po
index 8e51d7545..dbf2a0772 100644
--- a/rest_framework/locale/pl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pl/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Janusz Harkot <jh@blueice.pl>, 2015
+# piotrjakimiak <legolass71@gmail.com>, 2015
 # Maciek Olko <maciej.olko@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-03-04 17:03+0000\n"
+"Last-Translator: piotrjakimiak <legolass71@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/django-rest-framework/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,7 +137,7 @@ msgstr "Wprowadź poprawny adres URL."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" nie jest poprawnym UUID."
 
 #: fields.py:657
 msgid "A valid integer is required."
@@ -231,7 +232,7 @@ msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafik
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Oczekiwano słownika, ale otrzymano  \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
@@ -239,7 +240,7 @@ msgstr "Niepoprawna strona \"{page_number}\": {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Niepoprawny wskaźnik"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo
index d1555f1fbccfba1f8931089d25d9481707249c12..4d5145d34f37811fa8af9e7fe5d0bed884455b4c 100644
GIT binary patch
delta 1973
zcmZA1TTEO<7{Kvat}RdsD^NkI!%~XKrCds_wA!_RZBvXbf)yp=5w^Or?8e;%1K2FI
zF*N~g;s!LP!55nt6AiLfNh^41A2f~j9HWWhfm*5$ni}hqO|;SfcXmrmzhw3|b1pMy
zzM0v%wuOU{WoOEiB3dZLl$}XR8Q7h|5Ajo~QYCm9H72Jibti7Z+p!tty>7e%hp`%`
zunN!NZoGyMVMDr7dvFBZN=4L{R376(@*1V?#V2qFzK;9xTWrFjwekC%*hc$Rbm9`q
z2mFqun2`~;2Bn{NY{b{F49}zV_Zx0!d{vgI)GjVOh0QpFHMoM=n42XJGJCumyHGN6
z6z{=z64x(cE$!<l?^mo->VAA2rJrdm!c&R%=jdd7b&-msbOp=N!P5m;fg0V&$0`H2
zpf7R%ByOM`LmBu2N^1W>$w<rk_<aMVJ&dwM(<mP@hmkE*zM&#(bOS5VougD8`mhUU
zun?~&bml5mPrC}QIh5+bL$nXvrqo`17bV4iqV!*t7te4v$`YT%R{TDX{69&hC|{{T
z9KsR2io^IUY3RVq7{YB#w-?{T9?WJ32GEbPhn5pI^0m{nCsCHHl<6MCHk3UvlW?hs
z{Cl`iKwjiSUcyHF5!*4Fyp5xQFXI)ICG&2i;IFtDA7%ZX#}Skd`vo7y*1ME?1fwW3
zzJmQ&p_wdBMW~EY$zn%s!dFmUd>>_V{f#c%%uf~WLrLKf%D^AsPW%DMs&aA!9>8*}
z!^0>`@Fu>9Utt%z8LR>$Z&8s=cOJLlRjk3%GNtarc07cW7{Q;h5BnHhQvNl5ftpTa
z?N`u^mE`>Z`p|*WcPgcYA{myCBzY103^&t|Xrjnh{Xb;3GBfs);(*xeM;28QMUEE}
zQXGAIN3X{e%FU1r%H$+C6sxh78mF7gF(vkzeLQa7<@nmWn~AQ5q*{XHs0NBGg~SGm
z98HOWIIF*sJ&84x-F8i>w1mkCbDpE}AVt<nVi!f$tD54bNU#@GI)%+`FAW*BgHyK}
zE^4(Dwu}8=!p66c@^+Na(Sg)G8(pJAhHubw#HGC<?GJ>tp}FAg)196BT4Hml#VHwm
z-rle`;5UN9(eKul$Ih*taHRDP219{htTl5ssq(Pb<Le9QQQIEBG2jUu(F22_upTh_
zJ#;we_r5Ub(IHPb`p3G3Jo~x$1J8I8H)E%=3zF*UtLqzdU2W6W+R9oYqs<6~t2=^*
zKjbsQfnbx~?+to=KHXsijgZIRABZ_}FFDc^bBNA3Yf|jbUUuF{%eKbNv*w~XXU<w<
z)@1Zj;ojJV!lfjKjy_$KpJkr0j&Xh5T(ribB|1NLx_C!w<ZWI!Yn`}dF6Kva+5FgC
zuqL$mnKedp-u#5F7r8ZW9knL4`6=U!)8D)~r>${q9WxiGpD}0Ya8lmniFwUi3p{w-
wJT14a6LPUenQ!n|%o>aRRg&q5hFv-3t0S6=+WgR(u*bNyPjfN$ud5;XKfohn9smFU

delta 1544
zcmYk+TS${(7{Kvob6aNCY}v_`ewk$lwRxzyRl1U_Nb`UwRusdEEOq8qR6?tZC=i1b
zi-^b|u)Cly2%?Azx-ja(3hAc9ML`FMF1&~$`aj>6^uYW5-uK(-{hsG}_n_f+P5iCL
zF(gDKV*w-6F4BtW4lYEuQ)CeyMgs?N9^OHH|8w->7c4}VOQZnHa3hAX8gJlc{E8tg
zog&gK5|<bgKR2G?T1-h5*@l%E#6Hy5pJEOEK@V=5n%KZ@T+F&R=`~!<`Ux(<pQzuH
zlO|G*J5V2X5UcoodC8=R8*`^6-cXIpSjSPH{3foz(d7LJ^s&xPPkgQp*Rwu}Gw?oU
z;j`rW6Y7R1FdI{+i{xWI&f)i^j){T$k-f-ST!jPr27HWj@eOXqAE>Dh@N0U%8Fk%-
zT8ci@&yS#%U>sLsmRqD4t5HjQ4CC{ej4@HaVF|i2M4a?N09#mBvi&W130L8J)D&jS
zN|dG^H?cm4JMje`!4;VzCvX^#qj$DQ6Aob%zsx58ZA^Can0xRsMlhGhqB&$B>1Vvi
zIz;DbX~wYub=TT6jY-d=ZeSF(2bNNYM%;y`@fM!JV$!6Uzw71N&csjt4&rsxjifIW
zsl^Vg!+WStm_`8)VLcwj``C-6IU;#@3-xoaP<tlVU|=m4U^n{lDlWy>aVG1S{6?}Q
z0XnV%x1-joA2sC<u@%4La@@+dY7<3q4PL<_9K#m0aU|l{ihJ=5YDO#A<s%$IEor=k
zGZJDljP>{dZRloDW}(@w9S2b(g+Vf`j@PxFF_RI{1)-bL4eF*zrgb7fXr;-}2i8dL
zk#w`rvsuc}G-^$q46<k)C9QcX<6lr-aWL5HWN7v@${75|SPiO~)R@B16F}QoCx)t7
zF-LPmvs%IbgjFM57<&0Hw3eJY>vZ^%_q9BFTr~<4OkTCNR7z-ct2|W23T;Yy&nlJV
z_O^EoesorvRjw?Dc{%Nr&0Ll~VjpndHOJg;dv$SPsm~~06D;ws^bu(_;b^R|sVCeO
z?Fh#rJwc=CK%_GqHL4Euv`1s@`;2w5NN0%Amb_8a7U`@oJ)U<qvmo=A%k1}#+6OZh
U%`z`!mpjc3c^;eDzr>gF7sFzvPXGV_

diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po
index 38489747b..dc2a37c14 100644
--- a/rest_framework/locale/ru/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ru/LC_MESSAGES/django.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Kirill Tarasenko, 2015
 # Mikhail Dmitriev <mktums@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-02-23 10:40+0000\n"
+"Last-Translator: Kirill Tarasenko\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/django-rest-framework/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,7 +136,7 @@ msgstr "Введите корректный URL."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" не является корректным UUID."
 
 #: fields.py:657
 msgid "A valid integer is required."
@@ -230,7 +231,7 @@ msgstr "Загрузите корректное изображение. Загр
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
@@ -238,7 +239,7 @@ msgstr "Недопустимая страница \"{page_number}\": {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Не корректный курсор"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
@@ -278,11 +279,11 @@ msgstr "Недопустимые данные. Ожидался dictionary, но
 
 #: validators.py:22
 msgid "This field must be unique."
-msgstr ""
+msgstr "Это поле должно быть уникально."
 
 #: validators.py:76
 msgid "The fields {field_names} must make a unique set."
-msgstr ""
+msgstr "Поля {field_names} должны производить массив с уникальными значениями."
 
 #: validators.py:219
 msgid "This field must be unique for the \"{date_field}\" date."
diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo
index e6b848cf5b75a891dcca8c469cb348e197915c78..02f0e3a6068d0d38a507ee4f8b6e683445911530 100644
GIT binary patch
delta 2540
zcma*nTWl0n7{Kw<mKNFy2&IBn;Lw67rKM1A7AU>Zf~{htB`Gg>x;ri7&d%1ES!7F0
z6N$zUV<a1bQDO;!5ECKP;*AhZ>=KRFcq2#*i9ro$;)96~_#pnj*+ua};z`c_&Y77#
zm+w0>dmBG(AHFz!!hS{Rq~1vl@|CjiqY3;_9xhU99valR2j}1soQ2~k|N90j@G90|
z`9!4_V=K1cAhzQecHnQ=q|~r#nWWTKF6_Zocmdbo^y2KI9>50rFQDB23cGM}3D4j*
zlm*1G3iswbfilkLxB{n?DzyOHP{w-%S2MplN@G12E@CUrxkag3?87Oz4_D(Myc@qp
ziAerrr553Ql<S+Z4tJsa|7Bc<=TXMFjh{Pk0ZPA#pDN~8n`y`n{G89p4f@AXcK8`e
z$iKsdSTL2ruo^YCAe&SXT!Jpj{g-eizJ{`}k5NMZJIZ|Rw-SGOAVNbf>_*Aq^SBaE
zp@jUWT)%2sb_d&V3D=V-xjl;2co~=C3|8HX?RYyL%6S@>(f<-p=P5O@jQHQhg?DFU
zb8`h{=TpnGE3e1d^gB@^V52PXY21cKuo<sm7dEqPnfO_hR9?>Y7qd&*`BT_~pP+~H
zXA%ES8V5MaGQcI=h;=NRXH*I+aUU+nQ#r4o3^a#?-irZpNu5ABEAQv7=ds#;`fG4I
z9>xbTpK#B`EyFY#Y4})&ucCzZ63U?}WBYQ*)?y6~pe$rR%0wR^*--_AM-Jr-BnxUK
zF2;?y>q*q~51@?uCUTC|@V7MP)A$+h!7`Rb5Y#%90k@(&xC>>cPokvk9h4pafa_33
zZ-YjZ$n8N{*o(-}>Xn=y;tKjdV!gconpxyRH_9LP;wn6hO?Uw%0u|(eKd5$;R1KjV
zw)apLeih{qR&jvxaE-L7wbTZx6!`$Hr%Hq+iZZ_{2N{45Qn(NZcSs6VlXNI@m^hoN
zKsprC7%ocAibO?TONoZ0a1%9*2;NwV=}2m%$cLziI+yts--j^7vYY#;jZ`TTKFP79
zM^YmBCm3NA3Q-E14vXwOpURsRz7e^vcle=^S6NCKRU%s|om{acH#Zi(4dKT_-cvb1
z^4f3~!`wocq7rFPCQ)0$R`yUyb1hX<H&8pN*URkm@xqSTmAiKuCuu!iscm1oi9j38
z1v{#HdN#GCe<^&Tt~HT#qTwyy1h(Iw(!mZ(d)A{#%MWyOBw`H)dWU7AmRGCVOpt!N
zsA=qtqD2KIQ9BaY3D<b3^!LRJ)8~rM_x2gzj$D6Qw|Z98as%5q*|{SL&$A+dlhQnA
ztz51xH<E~2(OR|1&93UE|4&~ntu74jrq7fvDvBgMKjDoXExDFo{!nhIj~Sn(dx;=$
ztmxR`$>$21>uZ+Q>1Fi|E9$E2C?#FS4{EwS<NA&X5?+Je5ckXu-I6)k)zaLn*ILr;
zvz<PZY8r?e+ZlUn+J?M}zk)bmjUTf-$JTwemkr^s(}#L9C;h<6j9A*(e@3j&oE>p8
zqcNUz25jHfDdT2F1HIGoY{!aN-1yrQ4%fBujGq~Gqee#=kLlxO^Com}8Gn7q89x)#
zfjyX=IlOyzBxbp~&x$#gYkShJ+-<vq$zXes8kCIx*W-pYxzWsM`k9$u45zFh#$w#4
z?ZvI@>&c8{Mr(CXY9Q%4$(W9LcEFBhb-ASVC%m``7{=(NJf#y3>*mQs)G=<{#51F3
zM`~3^7%JZ$(l?uC_}}x`ZZ?P#CEb@Ggt7z~o<-Q&mgvW=xaHXYX9C9Wusi}}XIJ`<
z{VefKX5_{tZ!xKU!v*5Q7PTEGQMS(JoQ;fi&$_>$a{M5##rPRAuE&ohV!Gc9IXp{0
PMvezFqt4jD3b)`7vl;K?

delta 1590
zcmX}sOGs2v9LMqhIOZcYQ`0Oh$Fi4Z`AqXM`N&bxm5*LfAQfd~mJWoAnrKnb!WLsK
zBBJO)K~OeDQ0*j$ASw#&0R}-qLAw&#Sl{2BTYot7x#!N@d(Qcv|CyJ8Gyc$Ydh9tP
znrXSTiWsx)*cr<Qad(bcK8~Xg-(WWWMEyP`&MXHDu^0o`gh348Lu|!aY`{Rg*%myF
zRc0ZZ=AxDxSqWwx*o8HC3HgD&$4*R3G)u=_sDY2*avXKNhn4gvaRnyNjlQQ0tLYE8
z-oVxLKVd%OTS5}E=SCswi(V|j<G2p*U_DObJj_itTZ~1hegHL*Uev@!T+h4rBdCc_
z;ZppLt1vNzMKivYa^b@^WK!0T>oJH6@fvDEPp}n#pa!aBbba52>K{OD#cAAtS5X=K
z;P%r~qZ4mOy?+mev{z$X6yX$>qIZ6@1}bq8{j;vOu#El$KJu8&;7a=AEKezahnmnV
zF2Ssf=!z>)6YIuC9K=o>&mjLQwpnhd0JklO4tx={(i!YUf2P?Gj$sGJXGLGojcxQV
zqXzzl%g{ro0t;NX<3{?Us0BSk)x_t8<X>OpP||+v#S$DtrRXWDCVru6WGPP<V>@bq
zqgai%k!08x%*Po_!)yv=Ef%8gZ$%%Dpx%2S#0B+W6Ig(+a1H)K#<V>0rU$E0zuSQu
zaUU{<T|pJ+W893tk;R#xg3yGvpo(sv>nYSJxsK%+`sm(BWyADf3s&JyY`}A<l~1A`
z@bEV6T_vhkPNF7!A5}xs=s{}E$$$!4?^Be~yfi<pkw%0phEL73UR^>*NyVg>DMb{!
zlVWP~e>AvPd9F#QBc%x{i*+>qpPZsomJ~kcGy0*->i^9-|GHH}qXwPOzVc_~6r@gv
zBA%vIDnrzmZK5ftN9SzoI)SFWR*+Pueza8zWl-CvjH$j9wX{SPk3vPIqx3IS#bn$#
z0M1z^t4?U|C=FW|-Wk^#o`^dUIUGOW4KGT15xJQ>6BBum`qtZ6T3lY@E8S32R#j9&
z%<b$O4i@(e^&J{M*cTies`2&g9~|f#_BHPx>K_jF@AcIM2L~ExyWJa+=NT=YaCzpD
X$e+x-*l=+1>&UU(CU4|xUcdJ*8DFB;

diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po
index 5aabbebad..348585d62 100644
--- a/rest_framework/locale/tr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/tr/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Emrah BİLBAY <emrahbilbay@gmail.com>, 2015
 # Ertaç Paprat <epaprat@gmail.com>, 2015
 # Mesut Can Gürle <mesutcang@gmail.com>, 2015
 # Recep KIRMIZI <rkirmizi@gmail.com>, 2015
@@ -12,8 +13,8 @@ msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-03-10 23:50+0000\n"
+"Last-Translator: Emrah BİLBAY <emrahbilbay@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/django-rest-framework/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,15 +24,15 @@ msgstr ""
 
 #: authentication.py:69
 msgid "Invalid basic header. No credentials provided."
-msgstr ""
+msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış."
 
 #: authentication.py:72
 msgid "Invalid basic header. Credentials string should not contain spaces."
-msgstr ""
+msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli."
 
 #: authentication.py:78
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
-msgstr ""
+msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış."
 
 #: authentication.py:90
 msgid "Invalid username/password."
@@ -83,7 +84,7 @@ msgstr "\"{method}\" metoduna izin verilmiyor."
 
 #: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
-msgstr ""
+msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil."
 
 #: exceptions.py:121
 msgid "Unsupported media type \"{media_type}\" in request."
@@ -91,7 +92,7 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"."
 
 #: exceptions.py:134
 msgid "Request was throttled."
-msgstr ""
+msgstr "Üst üste çok fazla istek yapıldı."
 
 #: fields.py:153 relations.py:132 relations.py:156 validators.py:77
 #: validators.py:155
@@ -138,7 +139,7 @@ msgstr "Geçerli bir URL girin."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" geçerli bir UUID değil."
 
 #: fields.py:657
 msgid "A valid integer is required."
@@ -233,7 +234,7 @@ msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bo
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
@@ -241,7 +242,7 @@ msgstr "Geçersiz sayfa \"{page_number}\":{message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Sayfalandırma imleci geçersiz"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."

From 5cd0714dcae2409a05f6aa184afe87f8e9748ed3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 16 Mar 2015 12:05:31 +0000
Subject: [PATCH 13/54] Do not paginate if PAGE_SIZE=None

---
 rest_framework/pagination.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index 5e60448d4..b6be6b7cc 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -388,6 +388,9 @@ class LimitOffsetPagination(BasePagination):
 
     def paginate_queryset(self, queryset, request, view=None):
         self.limit = self.get_limit(request)
+        if self.limit is None:
+            return None
+
         self.offset = self.get_offset(request)
         self.count = _get_count(queryset)
         self.request = request
@@ -491,6 +494,9 @@ class CursorPagination(BasePagination):
     template = 'rest_framework/pagination/previous_and_next.html'
 
     def paginate_queryset(self, queryset, request, view=None):
+        if self.page_size is None:
+            return None
+
         self.base_url = request.build_absolute_uri()
         self.ordering = self.get_ordering(request, queryset, view)
 

From ac44bae90d53004148e28b421803c8c90ce21ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rube=CC=81n=20Dura=CC=81=20Tari=CC=81?=
 <rubendura@gmail.com>
Date: Mon, 16 Mar 2015 14:53:26 +0000
Subject: [PATCH 14/54] Updates ducumentation DEFAULT_PAGE_SIZE left over after
 #2655

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

diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md
index eca468b8b..687e4dc4b 100644
--- a/docs/api-guide/pagination.md
+++ b/docs/api-guide/pagination.md
@@ -196,7 +196,7 @@ The `CursorPagination` class includes a number of attributes that may be overrid
 
 To set these attributes you should override the `CursorPagination` class, and then enable your custom pagination class as above.
 
-* `page_size` = A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key.
+* `page_size` = A numeric value indicating the page size. If set, this overrides the `PAGE_SIZE` setting. Defaults to the same value as the `PAGE_SIZE` settings key.
 * `cursor_query_param` = A string value indicating the name of the "cursor" query parameter. Defaults to `'cursor'`.
 * `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = 'slug'`. Defaults to `-created`. This value may also be overridden by using `OrderingFilter` on the view.
 * `template` = The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/previous_and_next.html"`.

From d655a423fb06ec8b5880a1fb63ed6ad885753a94 Mon Sep 17 00:00:00 2001
From: "Kyle P. Johnson" <kyle@kyle-p-johnson.com>
Date: Mon, 16 Mar 2015 11:17:02 -0400
Subject: [PATCH 15/54] Add necessary imports to final urls.py example

---
 docs/tutorial/5-relationships-and-hyperlinked-apis.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
index 91cdd6f10..46ba4ad81 100644
--- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md
+++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
@@ -104,9 +104,11 @@ If we're going to have a hyperlinked API, we need to make sure we name our URL p
 * Our user serializer includes a field that refers to `'snippet-detail'`.
 * Our snippet and user serializers include `'url'` fields that by default will refer to `'{model_name}-detail'`, which in this case will be `'snippet-detail'` and `'user-detail'`.
 
-After adding all those names into our URLconf, our final `snippets/urls.py` file should look something like this:
+After adding all those names into our URLconf, our final `snippets/urls.py` file should look like this:
 
     from django.conf.urls import url, include
+    from rest_framework.urlpatterns import format_suffix_patterns
+    from snippets import views
 
     # API endpoints
     urlpatterns = format_suffix_patterns([

From 48e1f151c558306c5528bfd012d134f9ea9e7bfc Mon Sep 17 00:00:00 2001
From: Di Wu <dw323@cornell.edu>
Date: Mon, 16 Mar 2015 22:13:07 -0700
Subject: [PATCH 16/54] use SAFE_METHODS and make tuple

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

diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 9069d315a..fcebf0460 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 from django.http import Http404
 from rest_framework.compat import get_model_name
 
-SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS']
+SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS')
 
 
 class BasePermission(object):
@@ -185,7 +185,7 @@ class DjangoObjectPermissions(DjangoModelPermissions):
             # they have read permissions to see 403, or not, and simply see
             # a 404 response.
 
-            if request.method in ('GET', 'OPTIONS', 'HEAD'):
+            if request.method in SAFE_METHODS:
                 # Read permissions already checked and failed, no need
                 # to make another lookup.
                 raise Http404

From 000db8df18930b142e6f9b65213ae70703e8bdb9 Mon Sep 17 00:00:00 2001
From: Aaron Yong <aaron@liftinteractive.com>
Date: Tue, 17 Mar 2015 11:36:02 -0600
Subject: [PATCH 17/54] Fix typo in versioning docs

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

diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md
index 30dfeb2c0..a227a4a3d 100644
--- a/docs/api-guide/versioning.md
+++ b/docs/api-guide/versioning.md
@@ -103,7 +103,7 @@ Your client requests would now look like this:
     Host: example.com
     Accept: application/vnd.megacorp.bookings+json; version=1.0
 
-## URLParameterVersioning
+## URLPathVersioning
 
 This scheme requires the client to specify the version as part of the URL path.
 

From 90280a343746f662ac2e7da4844828a61253c77d Mon Sep 17 00:00:00 2001
From: Ion Scerbatiuc <ion@rover.com>
Date: Thu, 19 Mar 2015 14:14:48 -0700
Subject: [PATCH 18/54] Handle reversal of non-API view_name in
 HyperLinkedRelatedField

---
 rest_framework/versioning.py | 12 +++++++++-
 tests/test_versioning.py     | 44 +++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index 51b886f38..6f7952c03 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -1,6 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import NoReverseMatch
 from rest_framework import exceptions
 from rest_framework.compat import unicode_http_header
 from rest_framework.reverse import _reverse
@@ -122,7 +123,16 @@ class NamespaceVersioning(BaseVersioning):
 
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         if request.version is not None:
-            viewname = self.get_versioned_viewname(viewname, request)
+            versioned_viewname = self.get_versioned_viewname(viewname, request)
+            try:
+                return super(NamespaceVersioning, self).reverse(
+                    versioned_viewname, args, kwargs, request, format, **extra
+                )
+            except NoReverseMatch:
+                # If the versioned viewname lookup fails, fallback to the
+                # default reversal, since it may be a non-API view
+                pass
+
         return super(NamespaceVersioning, self).reverse(
             viewname, args, kwargs, request, format, **extra
         )
diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index 90ad8afd2..88ae56ddf 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -7,6 +7,7 @@ from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.test import APIRequestFactory, APITestCase
 from rest_framework.versioning import NamespaceVersioning
+from rest_framework.relations import PKOnlyObject
 import pytest
 
 
@@ -234,7 +235,7 @@ class TestInvalidVersion:
 
 class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
     included = [
-        url(r'^namespaced/(?P<pk>\d+)/$', dummy_view, name='namespaced'),
+        url(r'^namespaced/(?P<pk>\d+)/$', dummy_pk_view, name='namespaced'),
     ]
 
     urlpatterns = [
@@ -262,3 +263,44 @@ class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
         assert self.field.to_internal_value('/v1/namespaced/3/') == 'object 3'
         with pytest.raises(serializers.ValidationError):
             self.field.to_internal_value('/v2/namespaced/3/')
+
+
+class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(UsingURLPatterns, APITestCase):
+    included = [
+        url(r'^namespaced/(?P<pk>\d+)/$', dummy_pk_view, name='namespaced'),
+    ]
+
+    urlpatterns = [
+        url(r'^v1/', include(included, namespace='v1')),
+        url(r'^v2/', include(included, namespace='v2')),
+        url(r'^non-api/(?P<pk>\d+)/$', dummy_pk_view, name='non-api-view')
+    ]
+
+    def _create_field(self, view_name, version):
+        request = factory.get("/")
+        request.versioning_scheme = NamespaceVersioning()
+        request.version = version
+
+        field = serializers.HyperlinkedRelatedField(
+            view_name=view_name,
+            read_only=True)
+        field._context = {'request': request}
+        return field
+
+    def test_api_url_is_properly_reversed_with_v1(self):
+        field = self._create_field('namespaced', 'v1')
+        assert field.to_representation(PKOnlyObject(3)) == 'http://testserver/v1/namespaced/3/'
+
+    def test_api_url_is_properly_reversed_with_v2(self):
+        field = self._create_field('namespaced', 'v2')
+        assert field.to_representation(PKOnlyObject(5)) == 'http://testserver/v2/namespaced/5/'
+
+    def test_non_api_url_is_properly_reversed_regardless_of_the_version(self):
+        """
+        Regression test for #2711
+        """
+        field = self._create_field('non-api-view', 'v1')
+        assert field.to_representation(PKOnlyObject(10)) == 'http://testserver/non-api/10/'
+
+        field = self._create_field('non-api-view', 'v2')
+        assert field.to_representation(PKOnlyObject(10)) == 'http://testserver/non-api/10/'

From 164be174ea06694eca23a85a6df0a54df11e2a61 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Thu, 19 Mar 2015 23:29:10 +0100
Subject: [PATCH 19/54] Release notes for 3.1.1 and version bump.

---
 docs/topics/release-notes.md | 28 ++++++++++++++++++++++++++++
 rest_framework/__init__.py   |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 84d310c2c..5f32c91f4 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,20 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 3.0.x series
 
+### 3.1.1
+
+**Date**: [19th March 2015][3.1.1-milestone].
+
+* Fix missing anchor closing tag after next button. ([#2691][gh2691])
+* Fix `lookup_url_kwarg` handling in viewsets. ([#2685][gh2685], [#2591][gh2591])
+* Fix problem with imporing `rest_framework.views` in `apps.py` ([#2678][gh2678])
+* LimitOffsetPagination raises Type error if PAGE_SIZE not set ([#2667][gh2667], [#2700][gh2700])
+* German translation for `min_value` field error message references `max_value`. ([#2645][gh2645])
+* Remove `MergeDict`. ([#2640][gh2640])
+* Support serializing unsaved models with related fields. ([#2637][gh2637], [#2641][gh2641])
+* Allow blank/null on radio.html choices. ([#2631][gh2631])
+
+
 ### 3.1.0
 
 **Date**: [5th March 2015][3.1.0-milestone].
@@ -161,6 +175,8 @@ For older release notes, [please see the version 2.x documentation](old-release-
 [3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22
 [3.0.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.4+Release%22
 [3.0.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.5+Release%22
+[3.1.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.0+Release%22
+[3.1.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.1+Release%22
 
 <!-- 3.0.1 -->
 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -259,3 +275,15 @@ For older release notes, [please see the version 2.x documentation](old-release-
 [gh2519]: https://github.com/tomchristie/django-rest-framework/issues/2519
 [gh2524]: https://github.com/tomchristie/django-rest-framework/issues/2524
 [gh2530]: https://github.com/tomchristie/django-rest-framework/issues/2530
+<!-- 3.1.1 -->
+[gh2691]: https://github.com/tomchristie/django-rest-framework/issues/2691
+[gh2685]: https://github.com/tomchristie/django-rest-framework/issues/2685
+[gh2591]: https://github.com/tomchristie/django-rest-framework/issues/2591
+[gh2678]: https://github.com/tomchristie/django-rest-framework/issues/2678
+[gh2667]: https://github.com/tomchristie/django-rest-framework/issues/2667
+[gh2700]: https://github.com/tomchristie/django-rest-framework/issues/2700
+[gh2645]: https://github.com/tomchristie/django-rest-framework/issues/2645
+[gh2640]: https://github.com/tomchristie/django-rest-framework/issues/2640
+[gh2637]: https://github.com/tomchristie/django-rest-framework/issues/2637
+[gh2641]: https://github.com/tomchristie/django-rest-framework/issues/2641
+[gh2631]: https://github.com/tomchristie/django-rest-framework/issues/2631
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index f8bbeee36..62bdd2c59 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.1.0'
+__version__ = '3.1.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2015 Tom Christie'

From fac27853418699116304ad8d77270fe9a20873dc Mon Sep 17 00:00:00 2001
From: Ion Scerbatiuc <ion@rover.com>
Date: Thu, 19 Mar 2015 16:12:28 -0700
Subject: [PATCH 20/54] Handling the fallback in `reverse`

---
 rest_framework/reverse.py    |  9 ++++++++-
 rest_framework/versioning.py | 12 +-----------
 tests/test_reverse.py        | 27 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
index a251d99d6..e6d3f5634 100644
--- a/rest_framework/reverse.py
+++ b/rest_framework/reverse.py
@@ -3,6 +3,7 @@ Provide urlresolver functions that return fully qualified URLs or view names
 """
 from __future__ import unicode_literals
 from django.core.urlresolvers import reverse as django_reverse
+from django.core.urlresolvers import NoReverseMatch
 from django.utils import six
 from django.utils.functional import lazy
 
@@ -15,7 +16,13 @@ def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra
     """
     scheme = getattr(request, 'versioning_scheme', None)
     if scheme is not None:
-        return scheme.reverse(viewname, args, kwargs, request, format, **extra)
+        try:
+            return scheme.reverse(viewname, args, kwargs, request, format, **extra)
+        except NoReverseMatch:
+            # In case the versioning scheme reversal fails, fallback to the
+            # default implementation
+            pass
+
     return _reverse(viewname, args, kwargs, request, format, **extra)
 
 
diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index 6f7952c03..51b886f38 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import NoReverseMatch
 from rest_framework import exceptions
 from rest_framework.compat import unicode_http_header
 from rest_framework.reverse import _reverse
@@ -123,16 +122,7 @@ class NamespaceVersioning(BaseVersioning):
 
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         if request.version is not None:
-            versioned_viewname = self.get_versioned_viewname(viewname, request)
-            try:
-                return super(NamespaceVersioning, self).reverse(
-                    versioned_viewname, args, kwargs, request, format, **extra
-                )
-            except NoReverseMatch:
-                # If the versioned viewname lookup fails, fallback to the
-                # default reversal, since it may be a non-API view
-                pass
-
+            viewname = self.get_versioned_viewname(viewname, request)
         return super(NamespaceVersioning, self).reverse(
             viewname, args, kwargs, request, format, **extra
         )
diff --git a/tests/test_reverse.py b/tests/test_reverse.py
index 675a9d5a0..08c270239 100644
--- a/tests/test_reverse.py
+++ b/tests/test_reverse.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 from django.conf.urls import patterns, url
+from django.core.urlresolvers import NoReverseMatch
 from django.test import TestCase
 from rest_framework.reverse import reverse
 from rest_framework.test import APIRequestFactory
@@ -16,6 +17,18 @@ urlpatterns = patterns(
 )
 
 
+class MockVersioningScheme(object):
+
+    def __init__(self, raise_error=False):
+        self.raise_error = raise_error
+
+    def reverse(self, *args, **kwargs):
+        if self.raise_error:
+            raise NoReverseMatch()
+
+        return 'http://scheme-reversed/view'
+
+
 class ReverseTests(TestCase):
     """
     Tests for fully qualified URLs when using `reverse`.
@@ -26,3 +39,17 @@ class ReverseTests(TestCase):
         request = factory.get('/view')
         url = reverse('view', request=request)
         self.assertEqual(url, 'http://testserver/view')
+
+    def test_reverse_with_versioning_scheme(self):
+        request = factory.get('/view')
+        request.versioning_scheme = MockVersioningScheme()
+
+        url = reverse('view', request=request)
+        self.assertEqual(url, 'http://scheme-reversed/view')
+
+    def test_reverse_with_versioning_scheme_fallback_to_default_on_error(self):
+        request = factory.get('/view')
+        request.versioning_scheme = MockVersioningScheme(raise_error=True)
+
+        url = reverse('view', request=request)
+        self.assertEqual(url, 'http://testserver/view')

From a5506610ad7b497dadbab1ccde471b3d13c614ff Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin@clustree.com>
Date: Fri, 20 Mar 2015 15:17:49 +0100
Subject: [PATCH 21/54] Put the needed import in one example

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

diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md
index a227a4a3d..846698fc1 100644
--- a/docs/api-guide/versioning.md
+++ b/docs/api-guide/versioning.md
@@ -31,6 +31,8 @@ How you vary the API behavior is up to you, but one example you might typically
 
 The `reverse` function included by REST framework ties in with the versioning scheme. You need to make sure to include the current `request` as a keyword argument, like so.
 
+    from rest_framework.reverse import reverse
+
     reverse('bookings-list', request=request)
 
 The above function will apply any URL transformations appropriate to the request version. For example:

From fde02ae6ebfe3414e3f3f305c10f28a7f65ebd3e Mon Sep 17 00:00:00 2001
From: mdoglio <mauro.doglio@gmail.com>
Date: Sun, 22 Mar 2015 11:57:49 +0000
Subject: [PATCH 22/54] AuthTokenSerializer - properly render password field

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

diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 37ade255d..597aeed22 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -6,7 +6,7 @@ from rest_framework import exceptions, serializers
 
 class AuthTokenSerializer(serializers.Serializer):
     username = serializers.CharField()
-    password = serializers.CharField()
+    password = serializers.CharField(style={'input_type': 'password'})
 
     def validate(self, attrs):
         username = attrs.get('username')

From d0126b7e31c69ea7dd5cda4b9a3e931f5b8a8fbf Mon Sep 17 00:00:00 2001
From: mdoglio <mauro.doglio@gmail.com>
Date: Sun, 22 Mar 2015 12:35:56 +0000
Subject: [PATCH 23/54] Set serializer_class on ObtainAuthToken view

---
 rest_framework/authtoken/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py
index b75c2e252..66bbc49b7 100644
--- a/rest_framework/authtoken/views.py
+++ b/rest_framework/authtoken/views.py
@@ -11,9 +11,10 @@ class ObtainAuthToken(APIView):
     permission_classes = ()
     parser_classes = (parsers.FormParser, parsers.MultiPartParser, parsers.JSONParser,)
     renderer_classes = (renderers.JSONRenderer,)
+    serializer_class = AuthTokenSerializer
 
     def post(self, request):
-        serializer = AuthTokenSerializer(data=request.data)
+        serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
         user = serializer.validated_data['user']
         token, created = Token.objects.get_or_create(user=user)

From 77c44d8c63eac49201351dfc2d4b625f872bcb75 Mon Sep 17 00:00:00 2001
From: mdoglio <mauro.doglio@gmail.com>
Date: Sun, 22 Mar 2015 14:36:30 +0000
Subject: [PATCH 24/54] Make BrowsableAPIRenderer use serializer_class when
 present

---
 rest_framework/renderers.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 920d2bc47..2350344c6 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -421,6 +421,14 @@ class BrowsableAPIRenderer(BaseRenderer):
             return False  # Doesn't have permissions
         return True
 
+    def _get_serializer(self, serializer_class, view_instance, request, *args, **kwargs):
+        kwargs['context'] = {
+            'request': request,
+            'format': self.format,
+            'view': view_instance
+        }
+        return serializer_class(*args, **kwargs)
+
     def get_rendered_html_form(self, data, view, method, request):
         """
         Return a string representing a rendered HTML form, possibly bound to
@@ -457,8 +465,11 @@ class BrowsableAPIRenderer(BaseRenderer):
             if method in ('DELETE', 'OPTIONS'):
                 return True  # Don't actually need to return a form
 
+            has_serializer = getattr(view, 'get_serializer', None)
+            has_serializer_class = getattr(view, 'serializer_class', None)
+
             if (
-                not getattr(view, 'get_serializer', None) or
+                (not has_serializer and not has_serializer_class) or
                 not any(is_form_media_type(parser.media_type) for parser in view.parser_classes)
             ):
                 return
@@ -466,10 +477,19 @@ class BrowsableAPIRenderer(BaseRenderer):
             if existing_serializer is not None:
                 serializer = existing_serializer
             else:
-                if method in ('PUT', 'PATCH'):
-                    serializer = view.get_serializer(instance=instance, **kwargs)
+                if has_serializer:
+                    if method in ('PUT', 'PATCH'):
+                        serializer = view.get_serializer(instance=instance, **kwargs)
+                    else:
+                        serializer = view.get_serializer(**kwargs)
                 else:
-                    serializer = view.get_serializer(**kwargs)
+                    # at this point we must have a serializer_class
+                    if method in ('PUT', 'PATCH'):
+                        serializer = self._get_serializer(view.serializer_class, view,
+                                                          request, instance=instance, **kwargs)
+                    else:
+                        serializer = self._get_serializer(view.serializer_class, view,
+                                                          request, **kwargs)
 
             if hasattr(serializer, 'initial_data'):
                 serializer.is_valid()

From 8a58b1a380cb3544d904524e0f040dca44f972de Mon Sep 17 00:00:00 2001
From: Devon Bleibtrey <bleib1dj@gmail.com>
Date: Sun, 22 Mar 2015 13:50:05 -0400
Subject: [PATCH 25/54] Added ability to define backend identification
 attribute

---
 rest_framework/relations.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 3a966c5bf..13668975c 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -166,6 +166,7 @@ class HyperlinkedRelatedField(RelatedField):
         self.lookup_field = kwargs.pop('lookup_field', self.lookup_field)
         self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)
         self.format = kwargs.pop('format', None)
+        self.id_field = kwargs.pop('id_field', 'pk')
 
         # We include this simply for dependency injection in tests.
         # We can't add it as a class attributes or it would expect an
@@ -196,7 +197,7 @@ class HyperlinkedRelatedField(RelatedField):
         attributes are not configured to correctly match the URL conf.
         """
         # Unsaved objects will not yet have a valid URL.
-        if obj.pk is None:
+        if getattr(obj, self.id_field) is None:
             return None
 
         lookup_value = getattr(obj, self.lookup_field)

From 49c04d721884945927ff6b0f6e850b2b2caeec3a Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Mon, 23 Mar 2015 11:20:08 +0100
Subject: [PATCH 26/54] Fix typo.

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

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index aad2236f2..d9ded52f5 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -344,7 +344,7 @@ Here's an example for an `update()` method on our previous `UserSerializer` clas
 
             return instance
 
-Because the behavior of nested creates and updates can be ambiguous, and may require complex dependancies between related models, REST framework 3 requires you to always write these methods explicitly. The default `ModelSerializer` `.create()` and `.update()` methods do not include support for writable nested representations.
+Because the behavior of nested creates and updates can be ambiguous, and may require complex dependencies between related models, REST framework 3 requires you to always write these methods explicitly. The default `ModelSerializer` `.create()` and `.update()` methods do not include support for writable nested representations.
 
 It is possible that a third party package, providing automatic support some kinds of automatic writable nested representations may be released alongside the 3.1 release.
 

From 7872d0acbffeea5f4420aae5627f8767c6418ba3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:20:09 +0000
Subject: [PATCH 27/54] Escape tab switching cookie

---
 rest_framework/static/rest_framework/js/default.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js
index c8812132c..22e5efde5 100644
--- a/rest_framework/static/rest_framework/js/default.js
+++ b/rest_framework/static/rest_framework/js/default.js
@@ -44,6 +44,10 @@ $('a[data-toggle="tab"]').click(function(){
 var selectedTab = null;
 var selectedTabName = getCookie('tabstyle');
 
+if (selectedTabName) {
+    selectedTabName = selectedTabName.replace(/[^a-z-]/g, '');
+}
+
 if (selectedTabName) {
     selectedTab = $('.form-switcher a[name=' + selectedTabName + ']');
 }

From dbb694329823619eb6e4ff55b37f3e1be0d4b06c Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:24:29 +0000
Subject: [PATCH 28/54] Update release notes

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

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 5f32c91f4..535fb4630 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,10 +44,13 @@ You can determine your currently installed version using `pip freeze`:
 
 **Date**: [19th March 2015][3.1.1-milestone].
 
+* **Security fix**: Escape tab switching cookie name in browsable API.
+* Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743](gh2743))
+* Use a password input for the AuthTokenSerializer. ([#2741](gh2741))
 * Fix missing anchor closing tag after next button. ([#2691][gh2691])
 * Fix `lookup_url_kwarg` handling in viewsets. ([#2685][gh2685], [#2591][gh2591])
 * Fix problem with imporing `rest_framework.views` in `apps.py` ([#2678][gh2678])
-* LimitOffsetPagination raises Type error if PAGE_SIZE not set ([#2667][gh2667], [#2700][gh2700])
+* LimitOffsetPagination raises `TypeError` if PAGE_SIZE not set ([#2667][gh2667], [#2700][gh2700])
 * German translation for `min_value` field error message references `max_value`. ([#2645][gh2645])
 * Remove `MergeDict`. ([#2640][gh2640])
 * Support serializing unsaved models with related fields. ([#2637][gh2637], [#2641][gh2641])
@@ -287,3 +290,5 @@ For older release notes, [please see the version 2.x documentation](old-release-
 [gh2637]: https://github.com/tomchristie/django-rest-framework/issues/2637
 [gh2641]: https://github.com/tomchristie/django-rest-framework/issues/2641
 [gh2631]: https://github.com/tomchristie/django-rest-framework/issues/2631
+[gh2741]: https://github.com/tomchristie/django-rest-framework/issues/2641
+[gh2743]: https://github.com/tomchristie/django-rest-framework/issues/2643
\ No newline at end of file

From f7cd7a1c1fca4c7f0e38c5ed1762f5f498bf37a3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:32:28 +0000
Subject: [PATCH 29/54] Latest translation strings

---
 .../locale/fr/LC_MESSAGES/django.mo           | Bin 6975 -> 9198 bytes
 .../locale/fr/LC_MESSAGES/django.po           |  46 +--
 .../locale/pt_PT/LC_MESSAGES/django.mo        | Bin 0 -> 509 bytes
 .../locale/pt_PT/LC_MESSAGES/django.po        | 324 ++++++++++++++++++
 .../locale/vi/LC_MESSAGES/django.mo           | Bin 0 -> 485 bytes
 .../locale/vi/LC_MESSAGES/django.po           | 324 ++++++++++++++++++
 6 files changed, 672 insertions(+), 22 deletions(-)
 create mode 100644 rest_framework/locale/pt_PT/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/pt_PT/LC_MESSAGES/django.po
 create mode 100644 rest_framework/locale/vi/LC_MESSAGES/django.mo
 create mode 100644 rest_framework/locale/vi/LC_MESSAGES/django.po

diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo
index 68519d4539c4e2c1b67a343c83889ea9cadc74df..0b5224a55e281c59ad17fc96a1968aad89f4d599 100644
GIT binary patch
delta 3658
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
Jc*FcJ{s7pQVrKvV

delta 1463
zcmYk*OGs2v7{Kx4_{>LB>S(_5npT>QjblEtB1>xum8i5#D4BG~Asu06Dv4l%7Ojfv
z)TUgtX%k3`DZ*M9^q?eY7rh9x1R)TiD8Ux}zdKj(z?t7UXYRe{-tYU)oM)mw@-;Kz
zmZCM%3+Z3tlsbT;@%+#}Bq&vaAJM=?T!V#)vFq!wfcYVGVgNljip}@~kKp<wr5f-8
zZo`Mzrc^}DGiYLAdvff8bJ))O0cPSqlozw7@DQxRop=aa@CH`ndo0Jq6-v3V8fCo~
zci>fAiEl9<Kb!N2QhykfvXGb>+o-~FFUoo!%8OjawRjsh;yC8uH#BeoH)CF!Qn|Pv
z<wd;c!5b(a^2z%DuguwB+0$botipQc`%pp^vF49a-gpjWgB2M{RpM4WhCa;03CoY@
zX8sGuN#_PWTV8m|u2dPOtcrb@6C>+bILJWWER0UPj$Jr`t>{=yxUmQK;26sKFFb{f
zgh#&cuH`KDGIwRgUhEpm#`m!b-{Eommqq@440^I-Ie&(7L53rivnFh3K7#x4C9<co
z6ZcvyLH1Hz=*9t*6x~7j;wRSnG_t31kQYg51xjsn<P!g41{YY6kdC5+__cN60!p<O
zQu3YHjZ*DnC?S7?61ne|ve>}9$g&F?nO{M<?-k1Pr?Cw)BP8}TgA*t@p5#Z4+YHKs
zlDUf%DvDbX95X%Ct66Xy95Wi6Ftgy~!P4Z*Ty)uZsmU`*ze=DJ46|+FSL)9!IyqX&
z^g3CfNtl*5iIRkPsY#la+6D$>#%yVpLdCN2(vX@oBQ5nnJE5ci)9LcHa(<=7(<Q8%
z=tS1cvE)xeSVWiH+UP{ljGCNlPM@M)&AN~pkXECQCwcVqq>K7eO1XZKvnuLN>9*<C
zv~t~_o~?hU-HRU0NVn;L-4%UgpO4eCtDR9#=I*#%HO^X>QB&XKZm4w8Qro?uu(LDh
z4TJ{0;o)GD(K#?Y<P8}u13`Z%?DrYl!^1<(^ge4LI+@iPr`?XSlEYqq$R7&%&KqX}
zMqqg8WYA~$0^Acc&Uy#^{XRY7=+N^ymC=_uGd6uK->DZ1N_2O@e6+OasZIYZc15d=
Oe4D<xu0yXZo%#=LN3ZJu

diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po
index e8597c305..a942af6df 100644
--- a/rest_framework/locale/fr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/fr/LC_MESSAGES/django.po
@@ -5,13 +5,15 @@
 # Translators:
 # Etienne Desgagné <etienne.desgagne@evimbec.ca>, 2015
 # Martin Maillard <martin.maillard@gmail.com>, 2015
+# Martin Maillard <martin.maillard@gmail.com>, 2015
+# Xavier Ordoquy <xordoquy@linovia.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"PO-Revision-Date: 2015-03-19 22:23+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/django-rest-framework/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +75,7 @@ msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
 #: exceptions.py:93
 msgid "Not found."
-msgstr ""
+msgstr "Pas trouvé."
 
 #: exceptions.py:98
 msgid "Method \"{method}\" not allowed."
@@ -81,15 +83,15 @@ msgstr "Méthode \"{method}\" non autorisée."
 
 #: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
-msgstr ""
+msgstr "L'en-tête « Accept » n'a pas pu être satisfaite."
 
 #: exceptions.py:121
 msgid "Unsupported media type \"{media_type}\" in request."
-msgstr ""
+msgstr "Type de média \"{media_type}\" non supporté."
 
 #: exceptions.py:134
 msgid "Request was throttled."
-msgstr ""
+msgstr "Requête ralentie."
 
 #: fields.py:153 relations.py:132 relations.py:156 validators.py:77
 #: validators.py:155
@@ -136,11 +138,11 @@ msgstr "Saisissez une URL valide."
 
 #: fields.py:638
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" n'est pas un UUID valide."
 
 #: fields.py:657
 msgid "A valid integer is required."
-msgstr "Saisissez un nombre entier valide."
+msgstr "Un nombre entier valide est requis."
 
 #: fields.py:658 fields.py:692 fields.py:725
 msgid "Ensure this value is less than or equal to {max_value}."
@@ -175,23 +177,23 @@ msgstr "Assurez-vous qu'il n'y a pas plus de {max_whole_digits} chiffres avant l
 
 #: fields.py:813
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
 #: fields.py:814
 msgid "Expected a datetime but got a date."
-msgstr ""
+msgstr "Attendait une date + heure mais a reçu une date."
 
 #: fields.py:878
 msgid "Date has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
 #: fields.py:879
 msgid "Expected a date but got a datetime."
-msgstr ""
+msgstr "Attendait une date mais a reçu une date + heure."
 
 #: fields.py:936
 msgid "Time has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
 
 #: fields.py:992 fields.py:1036
 msgid "\"{input}\" is not a valid choice."
@@ -199,7 +201,7 @@ msgstr "\"{input}\" n'est pas un choix valide."
 
 #: fields.py:1037 fields.py:1151 serializers.py:482
 msgid "Expected a list of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"."
 
 #: fields.py:1067
 msgid "No file was submitted."
@@ -231,7 +233,7 @@ msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est
 
 #: fields.py:1188
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"."
 
 #: pagination.py:221
 msgid "Invalid page \"{page_number}\": {message}."
@@ -239,7 +241,7 @@ msgstr "Page \"{page_number}\" non valide : {message}."
 
 #: pagination.py:442
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Curseur non valide"
 
 #: relations.py:133
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
@@ -247,23 +249,23 @@ msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas."
 
 #: relations.py:134
 msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr ""
+msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}."
 
 #: relations.py:157
 msgid "Invalid hyperlink - No URL match."
-msgstr ""
+msgstr "Lien non valide : pas d'URL correspondante."
 
 #: relations.py:158
 msgid "Invalid hyperlink - Incorrect URL match."
-msgstr ""
+msgstr "Lien non valide : URL correspondante incorrecte."
 
 #: relations.py:159
 msgid "Invalid hyperlink - Object does not exist."
-msgstr ""
+msgstr "Lien non valide : l'objet n'existe pas."
 
 #: relations.py:160
 msgid "Incorrect type. Expected URL string, received {data_type}."
-msgstr ""
+msgstr "Type incorrect. Attendait une URL, a reçu {data_type}."
 
 #: relations.py:295
 msgid "Object with {slug_name}={value} does not exist."
@@ -275,7 +277,7 @@ msgstr "Valeur non valide."
 
 #: serializers.py:299
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
-msgstr ""
+msgstr "Donnée non valide. Attendait un dictionnaire, a reçu {datatype}."
 
 #: validators.py:22
 msgid "This field must be unique."
diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..35db0dd706a747f7efcd5c65ab69567389dbe6e6
GIT binary patch
literal 509
zcmZ8d%TB{E5Cp*~N6s7;i9;)Jos@@)OA&>pQl$i<61XDMZbKloBio_yA$$@4!MCt!
zQIQyF<h4AzJLB)2?avLuCUKXzPuwCN5^HpbU-WoJXRTQyG5Q53j*X`50gcVI5-@m?
zD$_6y?^2i<Imd-Iuih9-Z5)ejmQUGLm06Z*0bX*OvTK9VQ7aorhXUGuaKik69r+NP
ziuTcgPaq*1<6B;@_^0#R5cuNwbft@=bu2Yf*+M#P1Pt$^2yXgu2<KtkA4Qk_!GOHo
zU3d}stYn5PML8FckiROc&>}QewJe&@cy_K7oG%uOmaE6+GkkAN^qiNg?3R~&x{S;W
z((ZL+Ui{AIrF%?L-t^*89RB@N(DJ=&tsE*c{83VJhwqM;h0IkKCePAXbiMm@$U1+z
z+QAGB3)MtVbCn6`Jmqd3MZj{GmlTze1siHJw*pkTyxLy73#+o%P_Wm7pxN~{egG}<
BmP`Nu

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
new file mode 100644
index 000000000..9da496fe3
--- /dev/null
+++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
@@ -0,0 +1,324 @@
+# 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-01-30 16:23+0000\n"
+"PO-Revision-Date: 2015-01-02 10:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/django-rest-framework/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:69
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:72
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:78
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:90
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:156
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:159
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token."
+msgstr ""
+
+#: authentication.py:171
+msgid "User inactive or deleted."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:155
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:154
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:487 fields.py:515
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:550
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:551 fields.py:1324
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:552
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:587
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:604
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:615
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:627
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:638
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:657
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:658 fields.py:692 fields.py:725
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:659 fields.py:693 fields.py:726
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:660 fields.py:694 fields.py:730
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:691 fields.py:724
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:727
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:728
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:729
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:813
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:814
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:878
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:879
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:936
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:992 fields.py:1036
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1037 fields.py:1151 serializers.py:482
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1067
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1068
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1069
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1070
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1071
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1113
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1188
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:221
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:442
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:295
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:296
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:299
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:219
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:234
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:247
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:138
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:160
+msgid "Invalid version in query parameter."
+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 ""
diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..dea3a362f399cd36fb817e289f1c706e933e4e81
GIT binary patch
literal 485
zcmZ8d!A=4(6x8TxkDfieg9nY4?t&65VnkUIl3gXZa<A}Mt4q6S3+RXV75<ao;#)A7
zILV}KI(;+K?}Po%9l|d0ka$GgBc2f}w1{7Hc}Z)f*<xtTD^5HcOxYN%Q$`Euy-J-M
z7{!kn%&eT_%GkGHgr%{br7l-fcDu+O%Zz|v_>i$Xi_+6m){`Cu)Whh4g%N9n5H&@;
zaT*dx$VRwSmBl|@ScfPS=go~Sk<PQsO6>~ijTO*;N)ov5rZHT_X?Kv^bbCF@_IMp6
zlyf0-WEsl2fU!caDXv2}e(}B(oUc}^ny+T58NSyhX3on^VaH28UH4=b$#C0~7r#UK
zQt^`@9i;K!&qTE_xHH<LridRUb@lk}d09xM+c0^N)}ik_WqsEA(^d8}v@F&WGgUel
k(0W#W8(zRt1;b)tWx@K!&Yb{Vu8*!0wPCaEgzaGG2P6NE<NyEw

literal 0
HcmV?d00001

diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 000000000..b378e4de5
--- /dev/null
+++ b/rest_framework/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,324 @@
+# 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-01-30 16:23+0000\n"
+"PO-Revision-Date: 2015-01-02 10:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django-rest-framework/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: authentication.py:69
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:72
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:78
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:90
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:156
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:159
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token."
+msgstr ""
+
+#: authentication.py:171
+msgid "User inactive or deleted."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:155
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:154
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:487 fields.py:515
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:550
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:551 fields.py:1324
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:552
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:587
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:604
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:615
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:627
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:638
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:657
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:658 fields.py:692 fields.py:725
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:659 fields.py:693 fields.py:726
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:660 fields.py:694 fields.py:730
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:691 fields.py:724
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:727
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:728
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:729
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:813
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:814
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:878
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:879
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:936
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:992 fields.py:1036
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1037 fields.py:1151 serializers.py:482
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1067
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1068
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1069
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1070
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1071
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1113
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1188
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:221
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:442
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:295
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:296
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:299
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:219
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:234
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:247
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:138
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:160
+msgid "Invalid version in query parameter."
+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 ""

From 35a0cbb911c641027e9123cbbb67a186e8a80072 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:37:12 +0000
Subject: [PATCH 30/54] Add 3.1.x series header

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

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 535fb4630..c84d4e91c 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -38,7 +38,7 @@ You can determine your currently installed version using `pip freeze`:
 
 ---
 
-## 3.0.x series
+## 3.1.x series
 
 ### 3.1.1
 
@@ -63,6 +63,10 @@ You can determine your currently installed version using `pip freeze`:
 
 For full details see the [3.1 release announcement](3.1-announcement.md).
 
+---
+
+## 3.0.x series
+
 ### 3.0.5
 
 **Date**: [10th February 2015][3.0.5-milestone].

From bbaee714fb652a739e2521e03a6cc08c3bc079db Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:38:17 +0000
Subject: [PATCH 31/54] Fix release date

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index c84d4e91c..1a0c0d41f 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -42,7 +42,7 @@ You can determine your currently installed version using `pip freeze`:
 
 ### 3.1.1
 
-**Date**: [19th March 2015][3.1.1-milestone].
+**Date**: [23rd March 2015][3.1.1-milestone].
 
 * **Security fix**: Escape tab switching cookie name in browsable API.
 * Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743](gh2743))

From 98809d12c9bb459c9bd098a1ec6c67f0c915c190 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 11:45:19 +0000
Subject: [PATCH 32/54] Typo

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 1a0c0d41f..661156e8a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -49,7 +49,7 @@ You can determine your currently installed version using `pip freeze`:
 * Use a password input for the AuthTokenSerializer. ([#2741](gh2741))
 * Fix missing anchor closing tag after next button. ([#2691][gh2691])
 * Fix `lookup_url_kwarg` handling in viewsets. ([#2685][gh2685], [#2591][gh2591])
-* Fix problem with imporing `rest_framework.views` in `apps.py` ([#2678][gh2678])
+* Fix problem with importing `rest_framework.views` in `apps.py` ([#2678][gh2678])
 * LimitOffsetPagination raises `TypeError` if PAGE_SIZE not set ([#2667][gh2667], [#2700][gh2700])
 * German translation for `min_value` field error message references `max_value`. ([#2645][gh2645])
 * Remove `MergeDict`. ([#2640][gh2640])

From 5e29724146feafccfee6f9bcdc4995575f97e8c9 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 14:23:43 +0000
Subject: [PATCH 33/54] Update flake8 dependancy

---
 requirements/requirements-codestyle.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt
index 4e2be24c3..4eb86d2f4 100644
--- a/requirements/requirements-codestyle.txt
+++ b/requirements/requirements-codestyle.txt
@@ -1,3 +1,3 @@
 # PEP8 code linting, which we run on all commits.
-flake8==2.3.0
+flake8==2.4.0
 pep8==1.6.2

From 79ea0945445bd3562b143870a4c8500fe0a71365 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 14:28:47 +0000
Subject: [PATCH 34/54] Downgrade pep8 requirement, due to versioning clash

---
 requirements/requirements-codestyle.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt
index 4eb86d2f4..88f61fdfc 100644
--- a/requirements/requirements-codestyle.txt
+++ b/requirements/requirements-codestyle.txt
@@ -1,3 +1,3 @@
 # PEP8 code linting, which we run on all commits.
 flake8==2.4.0
-pep8==1.6.2
+pep8==1.5.7

From 7ac3c3fff7ae029a331ae0b6c149ac5ab97357fc Mon Sep 17 00:00:00 2001
From: Devon Bleibtrey <bleib1dj@gmail.com>
Date: Mon, 23 Mar 2015 10:42:42 -0400
Subject: [PATCH 35/54] Added enhancement for pk reference in many=True
 relations

---
 rest_framework/relations.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 13668975c..7483a9390 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -341,6 +341,7 @@ class ManyRelatedField(Field):
         assert child_relation is not None, '`child_relation` is a required argument.'
         super(ManyRelatedField, self).__init__(*args, **kwargs)
         self.child_relation.bind(field_name='', parent=self)
+        self.id_field = kwargs.pop('id_field', 'pk')
 
     def get_value(self, dictionary):
         # We override the default field access in order to support
@@ -362,7 +363,7 @@ class ManyRelatedField(Field):
 
     def get_attribute(self, instance):
         # Can't have any relationships if not created
-        if not instance.pk:
+        if getattr(instance, self.id_field) is None:
             return []
 
         relationship = get_attribute(instance, self.source_attrs)

From b1c1867b162c8eb9b7c2807029397d27a01ce19c Mon Sep 17 00:00:00 2001
From: Devon Bleibtrey <bleib1dj@gmail.com>
Date: Mon, 23 Mar 2015 11:40:33 -0400
Subject: [PATCH 36/54] Swapping to hassattr logic for pk attribute references
 in relations

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

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 7483a9390..00a4a2656 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -166,7 +166,6 @@ class HyperlinkedRelatedField(RelatedField):
         self.lookup_field = kwargs.pop('lookup_field', self.lookup_field)
         self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)
         self.format = kwargs.pop('format', None)
-        self.id_field = kwargs.pop('id_field', 'pk')
 
         # We include this simply for dependency injection in tests.
         # We can't add it as a class attributes or it would expect an
@@ -197,7 +196,7 @@ class HyperlinkedRelatedField(RelatedField):
         attributes are not configured to correctly match the URL conf.
         """
         # Unsaved objects will not yet have a valid URL.
-        if getattr(obj, self.id_field) is None:
+        if hasattr(obj, 'pk') and obj.pk is None:
             return None
 
         lookup_value = getattr(obj, self.lookup_field)
@@ -341,7 +340,6 @@ class ManyRelatedField(Field):
         assert child_relation is not None, '`child_relation` is a required argument.'
         super(ManyRelatedField, self).__init__(*args, **kwargs)
         self.child_relation.bind(field_name='', parent=self)
-        self.id_field = kwargs.pop('id_field', 'pk')
 
     def get_value(self, dictionary):
         # We override the default field access in order to support
@@ -363,7 +361,7 @@ class ManyRelatedField(Field):
 
     def get_attribute(self, instance):
         # Can't have any relationships if not created
-        if getattr(instance, self.id_field) is None:
+        if hasattr(instance, 'pk') and instance.pk is None:
             return []
 
         relationship = get_attribute(instance, self.source_attrs)

From 331f48054c64c24508a4a933bbc8a61f3540be60 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 23 Mar 2015 15:59:18 +0000
Subject: [PATCH 37/54] Try to resolve pep8 versioning clash.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index c986250c5..4f2d8183d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,8 +20,8 @@ deps =
 
 [testenv:py27-flake8]
 deps =
-       -rrequirements/requirements-testing.txt
        -rrequirements/requirements-codestyle.txt
+       -rrequirements/requirements-testing.txt
 commands = ./runtests.py --lintonly
 
 [testenv:py27-docs]

From 197027c87b71b4c06e208313b7f0d7fc47e22e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Mon, 23 Mar 2015 12:15:27 -0400
Subject: [PATCH 38/54] Fix older release notes link

Closes #2756
---
 docs/topics/release-notes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 661156e8a..270a3360d 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -163,7 +163,7 @@ For full details see the [3.0 release announcement](3.0-announcement.md).
 
 ---
 
-For older release notes, [please see the version 2.x documentation](old-release-notes).
+For older release notes, [please see the version 2.x documentation][old-release-notes].
 
 [cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html
 [deprecation-policy]: #deprecation-policy
@@ -295,4 +295,4 @@ For older release notes, [please see the version 2.x documentation](old-release-
 [gh2641]: https://github.com/tomchristie/django-rest-framework/issues/2641
 [gh2631]: https://github.com/tomchristie/django-rest-framework/issues/2631
 [gh2741]: https://github.com/tomchristie/django-rest-framework/issues/2641
-[gh2743]: https://github.com/tomchristie/django-rest-framework/issues/2643
\ No newline at end of file
+[gh2743]: https://github.com/tomchristie/django-rest-framework/issues/2643

From 87208021e289d56eeed7fc4a9802ba8dacb3d30b Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Tue, 24 Mar 2015 21:31:35 -0400
Subject: [PATCH 39/54] Metadata should detect null boolean field type.

---
 rest_framework/metadata.py | 1 +
 tests/test_metadata.py     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
index bf3611aa3..b2c48b816 100644
--- a/rest_framework/metadata.py
+++ b/rest_framework/metadata.py
@@ -36,6 +36,7 @@ class SimpleMetadata(BaseMetadata):
     label_lookup = ClassLookupDict({
         serializers.Field: 'field',
         serializers.BooleanField: 'boolean',
+        serializers.NullBooleanField: 'boolean',
         serializers.CharField: 'string',
         serializers.URLField: 'url',
         serializers.EmailField: 'email',
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 3a435f02f..731aedba3 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from rest_framework import exceptions, serializers, status, views, versioning
+from rest_framework import exceptions, metadata, serializers, status, views, versioning
 from rest_framework.request import Request
 from rest_framework.renderers import BrowsableAPIRenderer
 from rest_framework.test import APIRequestFactory
@@ -207,3 +207,8 @@ class TestMetadata:
         scheme = versioning.QueryParameterVersioning
         view = ExampleView.as_view(versioning_class=scheme)
         view(request=request)
+
+    def test_null_boolean_field_info_type(self):
+        options = metadata.SimpleMetadata()
+        field_info = options.get_field_info(serializers.NullBooleanField())
+        assert field_info['type'] == 'boolean'

From 55ee588f6e7aaf31202302783f3e93936ea56702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Wed, 25 Mar 2015 13:27:47 -0400
Subject: [PATCH 40/54] Use default reason phrases from HTTP standard.

Closes #2763
---
 rest_framework/response.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest_framework/response.py b/rest_framework/response.py
index c21c60a2e..9319e708e 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -5,7 +5,7 @@ it is initialized with unrendered data, instead of a pre-rendered string.
 The appropriate renderer is called during Django's template response rendering.
 """
 from __future__ import unicode_literals
-from django.core.handlers.wsgi import STATUS_CODE_TEXT
+from django.utils.six.moves.http_client import responses
 from django.template.response import SimpleTemplateResponse
 from django.utils import six
 
@@ -77,7 +77,7 @@ class Response(SimpleTemplateResponse):
         """
         # TODO: Deprecate and use a template tag instead
         # TODO: Status code text for RFC 6585 status codes
-        return STATUS_CODE_TEXT.get(self.status_code, '')
+        return responses.get(self.status_code, '')
 
     def __getstate__(self):
         """

From 6cb6b028115b36d9cac265039bbf0e2541b5d42d Mon Sep 17 00:00:00 2001
From: Christoffer <ckaalund@gmail.com>
Date: Thu, 26 Mar 2015 15:51:48 +0100
Subject: [PATCH 41/54] Reference typos in fields.md

---
 docs/api-guide/fields.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 5edc997ab..c87db7854 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -434,7 +434,7 @@ A field class that does not take a value based on user input, but instead takes
 
 For example, to include a field that always provides the current time as part of the serializer validated data, you would use the following:
 
-    modified = serializer.HiddenField(default=timezone.now)
+    modified = serializers.HiddenField(default=timezone.now)
 
 The `HiddenField` class is usually only needed if you have some validation that needs to run based on some pre-provided field values, but you do not want to expose all of those fields to the end user.
 
@@ -481,7 +481,7 @@ If you want to create a custom field, you'll need to subclass `Field` and then o
 
 The `.to_representation()` method is called to convert the initial datatype into a primitive, serializable datatype.
 
-The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. This method should raise a `serializer.ValidationError` if the data is invalid.
+The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. This method should raise a `serializers.ValidationError` if the data is invalid.
 
 Note that the `WritableField` class that was present in version 2.x no longer exists. You should subclass `Field` and override `to_internal_value()` if the field supports data input.
 

From 56ec7b152e0d88933973ae4da84b563c446042a6 Mon Sep 17 00:00:00 2001
From: Michael Blatherwick <michael.blatherwick@exeter.oxon.org>
Date: Fri, 27 Mar 2015 18:00:19 +0000
Subject: [PATCH 42/54] Fixed docstring typo

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

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index a80862e8c..bea773001 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -339,7 +339,7 @@ class Field(object):
         * Raise `ValidationError`, indicating invalid data.
         * Raise `SkipField`, indicating that the field should be ignored.
         * Return (True, data), indicating an empty value that should be
-          returned without any furhter validation being applied.
+          returned without any further validation being applied.
         * Return (False, data), indicating a non-empty value, that should
           have validation applied as normal.
         """

From 911da8a2b92840f88f16266c162c4791d93422ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Sun, 29 Mar 2015 17:04:23 -0400
Subject: [PATCH 43/54] `query_params` in favor of `QUERY_PARAMS`

---
 docs/api-guide/filtering.md     | 2 +-
 docs/api-guide/generic-views.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index b16b6be55..50c3f2cf8 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -72,7 +72,7 @@ We can override `.get_queryset()` to deal with URLs such as `http://example.com/
             by filtering against a `username` query parameter in the URL.
             """
             queryset = Purchase.objects.all()
-            username = self.request.QUERY_PARAMS.get('username', None)
+            username = self.request.query_params.get('username', None)
             if username is not None:
                 queryset = queryset.filter(purchaser__username=username)
             return queryset
diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index 7df3d6ff8..ccf84592b 100644
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -133,9 +133,9 @@ May be overridden to provide more complex behavior with filters, such as using d
 For example:
 
     def get_filter_backends(self):
-        if "geo_route" in self.request.QUERY_PARAMS:
+        if "geo_route" in self.request.query_params:
             return (GeoRouteFilter, CategoryFilter)
-        elif "geo_point" in self.request.QUERY_PARAMS:
+        elif "geo_point" in self.request.query_params:
             return (GeoPointFilter, CategoryFilter)
 
         return (CategoryFilter,)

From fbd8c18abd0e35595db81b8054d948a15196b73c Mon Sep 17 00:00:00 2001
From: Alex Tsai <AlexT@airg.com>
Date: Tue, 31 Mar 2015 17:30:04 -0700
Subject: [PATCH 44/54] Should use "ordering" in model Meta, not order_by

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

diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index 093bbdd05..31d59e1f8 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -46,7 +46,7 @@ In order to explain the various types of relational fields, we'll use a couple o
 
         class Meta:
             unique_together = ('album', 'order')
-            order_by = 'order'
+            ordering = ['order']
 
         def __unicode__(self):
             return '%d: %s' % (self.order, self.title)

From 596093d4941a14ea7443811450c9262c87bcdbd4 Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin <maryokhin@gmail.com>
Date: Thu, 2 Apr 2015 01:15:51 +0200
Subject: [PATCH 45/54] Django 1.8 released

---
 .travis.yml | 9 +++++----
 tox.ini     | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3eb89dc4f..71cec7beb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,10 @@ sudo: false
 env:
     - TOX_ENV=py27-flake8
     - TOX_ENV=py27-docs
+    - TOX_ENV=py34-django18
+    - TOX_ENV=py33-django18
+    - TOX_ENV=py32-django18
+    - TOX_ENV=py27-django18
     - TOX_ENV=py34-django17
     - TOX_ENV=py33-django17
     - TOX_ENV=py32-django17
@@ -21,10 +25,7 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-django14
     - TOX_ENV=py26-django14
-    - TOX_ENV=py34-django18beta
-    - TOX_ENV=py33-django18beta
-    - TOX_ENV=py32-django18beta
-    - TOX_ENV=py27-django18beta
+
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 4f2d8183d..befef744a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18beta}
+       {py27,py32,py33,py34}-django{17,18}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -14,7 +14,7 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
-       django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
+       django18: Django==1.8  # Should track maximum supported
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt
 

From 7228a0df75128cc2f46008199142eb25d7c183c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Sat, 4 Apr 2015 22:07:11 -0400
Subject: [PATCH 46/54] Test against Django's master branch

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

diff --git a/.travis.yml b/.travis.yml
index 71cec7beb..2134a144f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,18 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-django14
     - TOX_ENV=py26-django14
+    - 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:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index befef744a..ea1118167 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18}
+       {py27,py32,py33,py34}-django{17,18,master}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -15,6 +15,7 @@ deps =
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
        django18: Django==1.8  # Should track maximum supported
+       djangomaster: https://github.com/django/django/zipball/master
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt
 

From 9844f652a9985a1cafa712c708c62efda0c3f583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Sat, 4 Apr 2015 22:18:52 -0400
Subject: [PATCH 47/54] Workaround for bug in pip

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index ea1118167..f91f8b3ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
        django18: Django==1.8  # Should track maximum supported
-       djangomaster: https://github.com/django/django/zipball/master
+       djangomaster: https://github.com/django/django/archive/master.tar.gz
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt
 

From b0dd1fffbf311f9ad21a392159b45dfe532a50bc Mon Sep 17 00:00:00 2001
From: Oleg Marshev <oleh.marshev@gmail.com>
Date: Tue, 7 Apr 2015 19:40:23 +0300
Subject: [PATCH 48/54] Fix typo.

---
 docs/tutorial/1-serialization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index ceb23a020..09a124d38 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -124,7 +124,7 @@ The first part of the serializer class defines the fields that get serialized/de
 
 A serializer class is very similar to a Django `Form` class, and includes similar validation flags on the various fields, such as `required`, `max_length` and `default`.
 
-The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `{'base_template': 'textarea.html'}` flag above is equivelent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial.
+The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `{'base_template': 'textarea.html'}` flag above is equivalent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial.
 
 We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit.
 

From d8a19f79abd9e750c9d2b11565a59fc931acda1e Mon Sep 17 00:00:00 2001
From: Brett Koonce <koonce@gmail.com>
Date: Tue, 7 Apr 2015 22:06:25 -0700
Subject: [PATCH 49/54] more sp fixes

---
 docs/api-guide/generic-views.md | 2 +-
 docs/api-guide/renderers.md     | 2 +-
 docs/api-guide/serializers.md   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index ccf84592b..3ca77c3ef 100644
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -128,7 +128,7 @@ Note that if your API doesn't include any object level permissions, you may opti
 
 Returns the classes that should be used to filter the queryset. Defaults to returning the `filter_backends` attribute.
 
-May be overridden to provide more complex behavior with filters, such as using different (or even exlusive) lists of filter_backends depending on different criteria.
+May be overridden to provide more complex behavior with filters, such as using different (or even exclusive) lists of filter_backends depending on different criteria.
 
 For example:
 
diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 83ded849d..993a3ea2f 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -110,7 +110,7 @@ An example of a view that uses `TemplateHTMLRenderer`:
 
     class UserDetail(generics.RetrieveAPIView):
         """
-        A view that returns a templated HTML representations of a given user.
+        A view that returns a templated HTML representation of a given user.
         """
         queryset = User.objects.all()
         renderer_classes = (TemplateHTMLRenderer,)
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index d9ded52f5..2adea513f 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -812,7 +812,7 @@ There are four methods that can be overridden, depending on what functionality y
 
 * `.to_representation()` - Override this to support serialization, for read operations.
 * `.to_internal_value()` - Override this to support deserialization, for write operations.
-* `.create()` and `.update()` - Overide either or both of these to support saving instances.
+* `.create()` and `.update()` - Override either or both of these to support saving instances.
 
 Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class based views exactly as you would for a regular `Serializer` or `ModelSerializer`.
 

From 22e8357a4b91f64eec30b9c3c536127f5736f01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Stiasny?= <pawelstiasny@gmail.com>
Date: Wed, 8 Apr 2015 13:53:49 +0200
Subject: [PATCH 50/54] Update serializers documentation (removed feature)

It seems that allow_add_remove was removed from 3.x, yet the docs still mention it. Updating to avoid confusion.
---
 docs/api-guide/serializers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 2adea513f..2f13bd2a4 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -478,7 +478,7 @@ The default `ModelSerializer` uses primary keys for relationships, but you can a
 
 The `depth` option should be set to an integer value that indicates the depth of relationships that should be traversed before reverting to a flat representation.
 
-If you want to customize the way the serialization is done (e.g. using `allow_add_remove`) you'll need to define the field yourself.
+If you want to customize the way the serialization is done you'll need to define the field yourself.
 
 ## Specifying fields explicitly
 

From e6308155dd01a5ac51d2c6b7266db04c244c7976 Mon Sep 17 00:00:00 2001
From: Rob Hudson <robhudson@mozilla.com>
Date: Wed, 8 Apr 2015 21:38:02 -0700
Subject: [PATCH 51/54] Update example of nested data

---
 docs/topics/writable-nested-serializers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/topics/writable-nested-serializers.md b/docs/topics/writable-nested-serializers.md
index ed614bd24..cab700e5b 100644
--- a/docs/topics/writable-nested-serializers.md
+++ b/docs/topics/writable-nested-serializers.md
@@ -28,11 +28,11 @@ Some example output from our serializer.
 
     {
         'title': 'Leaving party preperations',
-        'items': {
+        'items': [
             {'text': 'Compile playlist', 'is_completed': True},
             {'text': 'Send invites', 'is_completed': False},
             {'text': 'Clean house', 'is_completed': False}
-        }
+        ]
     }
 
 Let's take a look at updating our nested one-to-many data structure.

From 1ddfef12121d6a92658daf08c375659993dc37ec Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin <maryokhin@gmail.com>
Date: Sun, 12 Apr 2015 17:12:01 +0200
Subject: [PATCH 52/54] Removed deprecated '.model' attribute check

---
 rest_framework/permissions.py | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index fcebf0460..8215957e6 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -77,7 +77,7 @@ class DjangoModelPermissions(BasePermission):
     `add`/`change`/`delete` permissions on the model.
 
     This permission can only be applied against view classes that
-    provide a `.model` or `.queryset` attribute.
+    provide a `.queryset` attribute.
     """
 
     # Map methods into required permission codes.
@@ -107,24 +107,19 @@ class DjangoModelPermissions(BasePermission):
         return [perm % kwargs for perm in self.perms_map[method]]
 
     def has_permission(self, request, view):
-        # Note that `.model` attribute on views is deprecated, although we
-        # enforce the deprecation on the view `get_serializer_class()` and
-        # `get_queryset()` methods, rather than here.
-        model_cls = getattr(view, 'model', None)
         queryset = getattr(view, 'queryset', None)
 
-        if model_cls is None and queryset is not None:
-            model_cls = queryset.model
-
         # Workaround to ensure DjangoModelPermissions are not applied
         # to the root view when using DefaultRouter.
-        if model_cls is None and getattr(view, '_ignore_model_permissions', False):
+        if queryset is None and getattr(view, '_ignore_model_permissions', False):
             return True
 
-        assert model_cls, ('Cannot apply DjangoModelPermissions on a view that'
-                           ' does not have `.model` or `.queryset` property.')
+        assert queryset, (
+            'Cannot apply DjangoModelPermissions on a view that '
+            'does not have `.queryset` property.'
+        )
 
-        perms = self.get_required_permissions(request.method, model_cls)
+        perms = self.get_required_permissions(request.method, queryset.model)
 
         return (
             request.user and
@@ -150,7 +145,7 @@ class DjangoObjectPermissions(DjangoModelPermissions):
     `add`/`change`/`delete` permissions on the object using .has_perms.
 
     This permission can only be applied against view classes that
-    provide a `.model` or `.queryset` attribute.
+    provide a `.queryset` attribute.
     """
 
     perms_map = {
@@ -171,14 +166,10 @@ class DjangoObjectPermissions(DjangoModelPermissions):
         return [perm % kwargs for perm in self.perms_map[method]]
 
     def has_object_permission(self, request, view, obj):
-        model_cls = getattr(view, 'model', None)
-        queryset = getattr(view, 'queryset', None)
-
-        if model_cls is None and queryset is not None:
-            model_cls = queryset.model
+        model_cls = view.queryset.model
+        user = request.user
 
         perms = self.get_required_object_permissions(request.method, model_cls)
-        user = request.user
 
         if not user.has_perms(perms, obj):
             # If the user does not have permissions we need to determine if

From 3abbeadfaf9f5bd338bb216583f1f8c2f9242e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Tue, 14 Apr 2015 11:32:15 -0400
Subject: [PATCH 53/54] Django 1.8 is no longer in beta

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5044ee0f3..64e1927d3 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,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.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7+, 1.8)
 
 # Installation
 
diff --git a/docs/index.md b/docs/index.md
index 13f4d0c49..a8da1946b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,7 +50,7 @@ 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.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7+, 1.8)
 
 The following packages are optional:
 

From 0f5082d9b8dda924d263659f3a1f38c771d3bf2f Mon Sep 17 00:00:00 2001
From: Teddy Wing <git@teddywing.com>
Date: Thu, 16 Apr 2015 15:47:53 -0400
Subject: [PATCH 54/54] docs/renderers: `StaticHTMLRenderer` instead of
 `TemplateHTMLRenderer`

The `StaticHTMLRenderer` section referred to `TemplateHTMLRenderer`
instead of `StaticHTMLRenderer`.
---
 docs/api-guide/renderers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 993a3ea2f..751465e9a 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -135,7 +135,7 @@ See also: `StaticHTMLRenderer`
 
 A simple renderer that simply returns pre-rendered HTML.  Unlike other renderers, the data passed to the response object should be a string representing the content to be returned.
 
-An example of a view that uses `TemplateHTMLRenderer`:
+An example of a view that uses `StaticHTMLRenderer`:
 
     @api_view(('GET',))
     @renderer_classes((StaticHTMLRenderer,))
@@ -143,7 +143,7 @@ An example of a view that uses `TemplateHTMLRenderer`:
         data = '<html><body><h1>Hello, world</h1></body></html>'
         return Response(data)
 
-You can use `TemplateHTMLRenderer` either to return regular HTML pages using REST framework, or to return both HTML and API responses from a single endpoint.
+You can use `StaticHTMLRenderer` either to return regular HTML pages using REST framework, or to return both HTML and API responses from a single endpoint.
 
 **.media_type**: `text/html`