diff --git a/.travis.yml b/.travis.yml
index 87db5e046..e8561a7ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ sudo: false
env:
- TOX_ENV=py27-lint
- TOX_ENV=py27-docs
+ - TOX_ENV=py35-django19
+ - TOX_ENV=py34-django19
+ - TOX_ENV=py27-django19
- TOX_ENV=py34-django18
- TOX_ENV=py33-django18
- TOX_ENV=py32-django18
@@ -13,28 +16,12 @@ env:
- TOX_ENV=py33-django17
- TOX_ENV=py32-django17
- TOX_ENV=py27-django17
- - TOX_ENV=py34-django16
- - TOX_ENV=py33-django16
- - TOX_ENV=py32-django16
- - TOX_ENV=py27-django16
- - TOX_ENV=py26-django16
- - TOX_ENV=py34-django15
- - TOX_ENV=py33-django15
- - TOX_ENV=py32-django15
- - TOX_ENV=py27-django15
- - TOX_ENV=py26-django15
- - TOX_ENV=py27-djangomaster
- - TOX_ENV=py32-djangomaster
- - TOX_ENV=py33-djangomaster
- - TOX_ENV=py34-djangomaster
matrix:
+ # Python 3.5 not yet available on travis, watch this to see when it is.
fast_finish: true
allow_failures:
- - env: TOX_ENV=py27-djangomaster
- - env: TOX_ENV=py32-djangomaster
- - env: TOX_ENV=py33-djangomaster
- - env: TOX_ENV=py34-djangomaster
+ - env: TOX_ENV=py35-django19
install:
- pip install tox
diff --git a/README.md b/README.md
index b183e14df..f9bd1f439 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ There is a live example API for testing purposes, [available here][sandbox].
# Requirements
-* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.5.6+, 1.6.3+, 1.7, 1.8)
+* Python (2.7, 3.2, 3.3, 3.4, 3.5)
+* Django (1.7, 1.8, 1.9)
# Installation
diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 7fda98e67..3ade3a661 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -360,6 +360,10 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a
[Django-rest-auth][django-rest-auth] library provides a set of REST API endpoints for registration, authentication (including social media authentication), password reset, retrieve and update user details, etc. By having these API endpoints, your client apps such as AngularJS, iOS, Android, and others can communicate to your Django backend site independently via REST APIs for user management.
+## django-rest-framework-social-oauth2
+
+[Django-rest-framework-social-oauth2][django-rest-framework-social-oauth2] library provides an easy way to integrate social plugins (facebook, twitter, google, etc.) to your authentication system and an easy oauth2 setup. With this library, you will be able to authenticate users based on external tokens (e.g. facebook access token), convert these tokens to "in-house" oauth2 tokens and use and generate oauth2 tokens to authenticate your users.
+
## django-rest-knox
[Django-rest-knox][django-rest-knox] library provides models and views to handle token based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into).
@@ -404,4 +408,5 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a
[mac]: http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token-05
[djoser]: https://github.com/sunscrapers/djoser
[django-rest-auth]: https://github.com/Tivix/django-rest-auth
+[django-rest-framework-social-oauth2]: https://github.com/PhilipGarnero/django-rest-framework-social-oauth2
[django-rest-knox]: https://github.com/James1345/django-rest-knox
diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index 2fbb84c03..f8be0c1b9 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -459,6 +459,14 @@ You can also use the declarative style, as with `ListField`. For example:
class DocumentField(DictField):
child = CharField()
+## JSONField
+
+A field class that validates that the incoming data structure consists of valid JSON primitives. In its alternate binary mode, it will represent and validate JSON-encoded binary strings.
+
+**Signature**: `JSONField(binary)`
+
+- `binary` - If set to `True` then the field will output and validate a JSON encoded string, rather that a primitive data structure. Defaults to `False`.
+
---
# Miscellaneous fields
diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md
index 35dbcd39c..13717b05f 100644
--- a/docs/api-guide/format-suffixes.md
+++ b/docs/api-guide/format-suffixes.md
@@ -69,6 +69,16 @@ If using the `i18n_patterns` function provided by Django, as well as `format_suf
---
+## Query parameter formats
+
+An alternative to the format suffixes is to include the requested format in a query parameter. REST framework provides this option by default, and it is used in the browsable API to switch between differing available representations.
+
+To select a representation using its short format, use the `format` query parameter. For example: `http://example.com/organizations/?format=csv`.
+
+The name of this query parameter can be modified using the `URL_FORMAT_OVERRIDE` setting. Set the value to `None` to disable this behavior.
+
+---
+
## Accept headers vs. format suffixes
There seems to be a view among some of the Web community that filename extensions are not a RESTful pattern, and that `HTTP Accept` headers should always be used instead.
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index fd53acbc8..4b77fa3a5 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -255,7 +255,7 @@ For example, the following serializer:
class TrackSerializer(serializers.ModelSerializer):
class Meta:
model = Track
- fields = ('order', 'title')
+ fields = ('order', 'title', 'duration')
class AlbumSerializer(serializers.ModelSerializer):
tracks = TrackSerializer(many=True, read_only=True)
@@ -293,7 +293,7 @@ Be default nested serializers are read-only. If you want to to support write-ope
class TrackSerializer(serializers.ModelSerializer):
class Meta:
model = Track
- fields = ('order', 'title')
+ fields = ('order', 'title', 'duration')
class AlbumSerializer(serializers.ModelSerializer):
tracks = TrackSerializer(many=True)
@@ -405,13 +405,15 @@ In this case we'd need to override `HyperlinkedRelatedField` to get the behavior
def get_url(self, obj, view_name, request, format):
url_kwargs = {
'organization_slug': obj.organization.slug,
- 'customer_pk': obj.pk
}
+ 'customer_pk': obj.pk
+ }
return reverse(view_name, url_kwargs, request=request, format=format)
def get_object(self, view_name, view_args, view_kwargs):
lookup_kwargs = {
'organization__slug': view_kwargs['organization_slug'],
- 'pk': view_kwargs['customer_pk']
}
+ 'pk': view_kwargs['customer_pk']
+ }
return self.get_queryset().get(**lookup_kwargs)
Note that if you wanted to use this style together with the generic views then you'd also need to override `.get_object` on the view in order to get the correct lookup behavior.
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index ca540a13b..63189b966 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -438,6 +438,7 @@ Declaring a `ModelSerializer` looks like this:
class AccountSerializer(serializers.ModelSerializer):
class Meta:
model = Account
+ fields = ('id', 'account_name', 'users', 'created')
By default, all the model fields on the class will be mapped to a corresponding serializer fields.
@@ -459,7 +460,7 @@ To do so, open the Django shell, using `python manage.py shell`, then import the
## Specifying which fields to include
-If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`.
+If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`. It is strongly recommended that you explicitly set all fields that should be serialized using the `fields` attribute. This will make it less likely to result in unintentionally exposing data when your models change.
For example:
@@ -468,7 +469,27 @@ For example:
model = Account
fields = ('id', 'account_name', 'users', 'created')
-The names in the `fields` option will normally map to model fields on the model class.
+You can also set the `fields` attribute to the special value `'__all__'` to indicate that all fields in the model should be used.
+
+For example:
+
+ class AccountSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = Account
+ fields = '__all__'
+
+You can set the `exclude` attribute of the to a list of fields to be excluded from the serializer.
+
+For example:
+
+ class AccountSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = Account
+ exclude = ('users',)
+
+In the example above, if the `Account` model had 3 fields `account_name`, `users`, and `created`, this will result in the fields `account_name` and `created` to be serialized.
+
+The names in the `fields` and `exclude` attributes will normally map to model fields on the model class.
Alternatively names in the `fields` options can map to properties or methods which take no arguments that exist on the model class.
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 13d23a69e..23691dec1 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -249,47 +249,23 @@ Default:
---
-## Browser overrides
-
-*The following settings provide URL or form-based overrides of the default browser behavior.*
-
-#### FORM_METHOD_OVERRIDE
-
-The name of a form field that may be used to override the HTTP method of the form.
-
-If the value of this setting is `None` then form method overloading will be disabled.
-
-Default: `'_method'`
-
-#### FORM_CONTENT_OVERRIDE
-
-The name of a form field that may be used to override the content of the form payload. Must be used together with `FORM_CONTENTTYPE_OVERRIDE`.
-
-If either setting is `None` then form content overloading will be disabled.
-
-Default: `'_content'`
-
-#### FORM_CONTENTTYPE_OVERRIDE
-
-The name of a form field that may be used to override the content type of the form payload. Must be used together with `FORM_CONTENT_OVERRIDE`.
-
-If either setting is `None` then form content overloading will be disabled.
-
-Default: `'_content_type'`
-
-#### URL_ACCEPT_OVERRIDE
-
-The name of a URL parameter that may be used to override the HTTP `Accept` header.
-
-If the value of this setting is `None` then URL accept overloading will be disabled.
-
-Default: `'accept'`
+## Content type controls
#### URL_FORMAT_OVERRIDE
-The name of a URL parameter that may be used to override the default `Accept` header based content negotiation.
+The name of a URL parameter that may be used to override the default content negotiation `Accept` header behavior, by using a `format=…` query parameter in the request URL.
-If the value of this setting is `None` then URL format overloading will be disabled.
+For example: `http://example.com/organizations/?format=csv`
+
+If the value of this setting is `None` then URL format overrides will be disabled.
+
+Default: `'format'`
+
+#### FORMAT_SUFFIX_KWARG
+
+The name of a parameter in the URL conf that may be used to provide a format suffix. This setting is applied when using `format_suffix_patterns` to include suffixed URL patterns.
+
+For example: `http://example.com/organizations.csv/`
Default: `'format'`
@@ -451,12 +427,6 @@ A string representing the key that should be used for the URL fields generated b
Default: `'url'`
-#### FORMAT_SUFFIX_KWARG
-
-The name of a parameter in the URL conf that may be used to provide a format suffix.
-
-Default: `'format'`
-
#### NUM_PROXIES
An integer of 0 or more, that may be used to specify the number of application proxies that the API runs behind. This allows throttling to more accurately identify client IP addresses. If set to `None` then less strict IP matching will be used by the throttle classes.
diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index 57bce54e7..36753aafc 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -184,7 +184,7 @@ If the `.wait()` method is implemented and the request is throttled, then a `Ret
The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests.
- class RandomRateThrottle(throttles.BaseThrottle):
+ class RandomRateThrottle(throttling.BaseThrottle):
def allow_request(self, request, view):
return random.randint(1, 10) == 1
diff --git a/docs/index.md b/docs/index.md
index 37f192094..4617d0bcc 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -52,8 +52,8 @@ Some reasons you might want to use REST framework:
REST framework requires the following:
-* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.5.6+, 1.6.3+, 1.7+, 1.8)
+* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4, 3.5)
+* Django (1.7+, 1.8, 1.9)
The following packages are optional:
diff --git a/docs/topics/browser-enhancements.md b/docs/topics/browser-enhancements.md
index 5a1726201..e1977e826 100644
--- a/docs/topics/browser-enhancements.md
+++ b/docs/topics/browser-enhancements.md
@@ -4,58 +4,36 @@
>
> — [RESTful Web Services][cite], Leonard Richardson & Sam Ruby.
+In order to allow the browsable API to function, there are a couple of browser enhancements that REST framework needs to provide.
+
+As of version 3.3.0 onwards these are enabled with javascript, using the [ajax-form][ajax-form] library.
+
## Browser based PUT, DELETE, etc...
-REST framework supports browser-based `PUT`, `DELETE` and other methods, by
-overloading `POST` requests using a hidden form field.
+The [AJAX form library][ajax-form] supports browser-based `PUT`, `DELETE` and other methods on HTML forms.
-Note that this is the same strategy as is used in [Ruby on Rails][rails].
+After including the library, use the `data-method` attribute on the form, like so:
-For example, given the following form:
-
-
-`request.method` would return `"DELETE"`.
-
-## HTTP header based method overriding
-
-REST framework also supports method overriding via the semi-standard `X-HTTP-Method-Override` header. This can be useful if you are working with non-form content such as JSON and are working with an older web server and/or hosting provider that doesn't recognise particular HTTP methods such as `PATCH`. For example [Amazon Web Services ELB][aws_elb].
-
-To use it, make a `POST` request, setting the `X-HTTP-Method-Override` header.
-
-For example, making a `PATCH` request via `POST` in jQuery:
-
- $.ajax({
- url: '/myresource/',
- method: 'POST',
- headers: {'X-HTTP-Method-Override': 'PATCH'},
- ...
- });
+Note that prior to 3.3.0, this support was server-side rather than javascript based. The method overloading style (as used in [Ruby on Rails][rails]) is no longer supported due to subtle issues that it introduces in request parsing.
## Browser based submission of non-form content
-Browser-based submission of content types other than form are supported by
-using form fields named `_content` and `_content_type`:
+Browser-based submission of content types such as JSON are supported by the [AJAX form library][ajax-form], using form fields with `data-override='content-type'` and `data-override='content'` attributes.
-For example, given the following form:
+For example:
-
+
-`request.content_type` would return `"application/json"`, and
-`request.stream` would return `"{'count': 1}"`
-
-## URL based accept headers
-
-REST framework can take `?accept=application/json` style URL parameters,
-which allow the `Accept` header to be overridden.
-
-This can be useful for testing the API from a web browser, where you don't
-have any control over what is sent in the `Accept` header.
+Note that prior to 3.3.0, this support was server-side rather than javascript based.
## URL based format suffixes
@@ -63,8 +41,37 @@ REST framework can take `?format=json` style URL parameters, which can be a
useful shortcut for determining which content type should be returned from
the view.
-This is a more concise than using the `accept` override, but it also gives
-you less control. (For example you can't specify any media type parameters)
+This behavior is controlled using the `URL_FORMAT_OVERRIDE` setting.
+
+## HTTP header based method overriding
+
+Prior to version 3.3.0 the semi extension header `X-HTTP-Method-Override` was supported for overriding the request method. This behavior is no longer in core, but can be adding if needed using middleware.
+
+For example:
+
+ METHOD_OVERRIDE_HEADER = 'HTTP_X_HTTP_METHOD_OVERRIDE'
+
+ class MethodOverrideMiddleware(object):
+ def process_view(self, request, callback, callback_args, callback_kwargs):
+ if request.method != 'POST':
+ return
+ if METHOD_OVERRIDE_HEADER not in request.META:
+ return
+ request.method = request.META[METHOD_OVERRIDE_HEADER]
+
+## URL based accept headers
+
+Until version 3.3.0 REST framework included built-in support for `?accept=application/json` style URL parameters, which would allow the `Accept` header to be overridden.
+
+Since the introduction of the content negotiation API this behavior is no longer included in core, but may be added using a custom content negotiation class, if needed.
+
+For example:
+
+ class AcceptQueryParamOverride()
+ def get_accept_list(self, request):
+ header = request.META.get('HTTP_ACCEPT', '*/*')
+ header = request.query_params.get('_accept', header)
+ return [token.strip() for token in header.split(',')]
## Doesn't HTML5 support PUT and DELETE forms?
@@ -74,7 +81,7 @@ was later [dropped from the spec][html5]. There remains
as well as how to support content types other than form-encoded data.
[cite]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260
+[ajax-form]: https://github.com/tomchristie/ajax-form
[rails]: http://guides.rubyonrails.org/form_helpers.html#how-do-forms-with-put-or-delete-methods-work
[html5]: http://www.w3.org/TR/html5-diff/#changes-2010-06-24
[put_delete]: http://amundsen.com/examples/put-delete-forms/
-[aws_elb]: https://forums.aws.amazon.com/thread.jspa?messageID=400724
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 5eb241a07..e744d2fef 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,8 +44,26 @@ You can determine your currently installed version using `pip freeze`:
---
+## 3.3.x series
+
+### 3.3.0
+
+**Date**: NOT YET RELEASED
+
+* Removed support for Django Versions 1.5 & 1.6 ([#3421][gh3421], [#3429][gh3429])
+
## 3.2.x series
+### 3.2.4
+
+**Date**: [21th September 2015][3.2.4-milestone].
+
+* Don't error on missing `ViewSet.search_fields` attribute.([#3324][gh3324], [#3323][gh3323])
+* Fix `allow_empty` not working on serializers with `many=True`. ([#3361][gh3361], [#3364][gh3364])
+* Let `DurationField` accepts integers. ([#3359][gh3359])
+* Multi-level dictionaries not supported in multipart requests. ([#3314][gh3314])
+* Fix `ListField` truncation on HTTP PATCH ([#3415][gh3415], [#2761][gh2761])
+
### 3.2.3
**Date**: [24th August 2015][3.2.3-milestone].
@@ -305,6 +323,7 @@ For older release notes, [please see the version 2.x documentation][old-release-
[3.2.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.1+Release%22
[3.2.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.2+Release%22
[3.2.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.3+Release%22
+[3.2.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.2.4+Release%22
[gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -519,6 +538,16 @@ For older release notes, [please see the version 2.x documentation][old-release-
[gh3318]: https://github.com/tomchristie/django-rest-framework/issues/3318
[gh3321]: https://github.com/tomchristie/django-rest-framework/issues/3321
+
+[gh2761]: https://github.com/tomchristie/django-rest-framework/issues/2761
+[gh3314]: https://github.com/tomchristie/django-rest-framework/issues/3314
+[gh3323]: https://github.com/tomchristie/django-rest-framework/issues/3323
+[gh3324]: https://github.com/tomchristie/django-rest-framework/issues/3324
+[gh3359]: https://github.com/tomchristie/django-rest-framework/issues/3359
+[gh3361]: https://github.com/tomchristie/django-rest-framework/issues/3361
+[gh3364]: https://github.com/tomchristie/django-rest-framework/issues/3364
+[gh3415]: https://github.com/tomchristie/django-rest-framework/issues/3415
-
-
+
+[gh3421]: https://github.com/tomchristie/django-rest-framework/pulls/3421
+[gh3429]: https://github.com/tomchristie/django-rest-framework/pull/3429
diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md
index 9c302f77e..bef3effc7 100644
--- a/docs/topics/third-party-resources.md
+++ b/docs/topics/third-party-resources.md
@@ -246,6 +246,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
* [django-versatileimagefield][django-versatileimagefield] - Provides a drop-in replacement for Django's stock `ImageField` that makes it easy to serve images in multiple sizes/renditions from a single field. For DRF-specific implementation docs, [click here][django-versatileimagefield-drf-docs].
* [drf-tracking][drf-tracking] - Utilities to track requests to DRF API views.
* [django-rest-framework-braces][django-rest-framework-braces] - Collection of utilities for working with Django Rest Framework. The most notable ones are [FormSerializer](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#formserializer) and [SerializerForm](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#serializerform), which are adapters between DRF serializers and Django forms.
+* [drf-haystack][drf-haystack] - Haystack search for Django Rest Framework
## Other Resources
@@ -345,3 +346,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
[django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces
[dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions
[django-url-filter]: https://github.com/miki725/django-url-filter
+[drf-haystack]: http://drf-haystack.readthedocs.org/en/latest/
diff --git a/docs_theme/base.html b/docs_theme/base.html
index 93b687cfc..369927b41 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -136,7 +136,7 @@
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index add4fc8ed..b7bb1e3e7 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____ __
"""
__title__ = 'Django REST framework'
-__version__ = '3.2.3'
+__version__ = '3.2.4'
__author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2015 Tom Christie'
diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 597aeed22..8a295c03e 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -1,7 +1,7 @@
from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _
-from rest_framework import exceptions, serializers
+from rest_framework import serializers
class AuthTokenSerializer(serializers.Serializer):
@@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer):
if user:
if not user.is_active:
msg = _('User account is disabled.')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
else:
msg = _('Unable to log in with provided credentials.')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
else:
msg = _('Must include "username" and "password".')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
attrs['user'] = user
return attrs
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b603b190a..c1a8bcaed 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -77,16 +77,6 @@ def distinct(queryset, base):
return queryset.distinct()
-# OrderedDict only available in Python 2.7.
-# This will always be the case in Django 1.7 and above, as these versions
-# no longer support Python 2.6.
-# For Django <= 1.6 and Python 2.6 fall back to SortedDict.
-try:
- from collections import OrderedDict
-except ImportError:
- from django.utils.datastructures import SortedDict as OrderedDict
-
-
# contrib.postgres only supported from 1.8 onwards.
try:
from django.contrib.postgres import fields as postgres_fields
@@ -94,23 +84,19 @@ except ImportError:
postgres_fields = None
+# JSONField is only supported from 1.9 onwards
+try:
+ from django.contrib.postgres.fields import JSONField
+except ImportError:
+ JSONField = None
+
+
# django-filter is optional
try:
import django_filters
except ImportError:
django_filters = None
-if django.VERSION >= (1, 6):
- def clean_manytomany_helptext(text):
- return text
-else:
- # Up to version 1.5 many to many fields automatically suffix
- # the `help_text` attribute with hardcoded text.
- def clean_manytomany_helptext(text):
- if text.endswith(' Hold down "Control", or "Command" on a Mac, to select more than one.'):
- text = text[:-69]
- return text
-
# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
# Fixes (#1712). We keep the try/except for the test suite.
guardian = None
@@ -121,14 +107,6 @@ except ImportError:
pass
-def get_model_name(model_cls):
- try:
- return model_cls._meta.model_name
- except AttributeError:
- # < 1.6 used module_name instead of model_name
- return model_cls._meta.module_name
-
-
# MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+
if django.VERSION >= (1, 8):
from django.core.validators import MinValueValidator, MaxValueValidator
@@ -164,32 +142,6 @@ else:
super(MaxLengthValidator, self).__init__(*args, **kwargs)
-# URLValidator only accepts `message` in 1.6+
-if django.VERSION >= (1, 6):
- from django.core.validators import URLValidator
-else:
- from django.core.validators import URLValidator as DjangoURLValidator
-
-
- class URLValidator(DjangoURLValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(URLValidator, self).__init__(*args, **kwargs)
-
-
-# EmailValidator requires explicit regex prior to 1.6+
-if django.VERSION >= (1, 6):
- from django.core.validators import EmailValidator
-else:
- from django.core.validators import EmailValidator as DjangoEmailValidator
- from django.core.validators import email_re
-
-
- class EmailValidator(DjangoEmailValidator):
- def __init__(self, *args, **kwargs):
- super(EmailValidator, self).__init__(email_re, *args, **kwargs)
-
-
# PATCH method is not implemented by Django
if 'patch' not in View.http_method_names:
View.http_method_names = View.http_method_names + ['patch']
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 7c48c621e..0d4a51152 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -5,13 +5,17 @@ import copy
import datetime
import decimal
import inspect
+import json
import re
import uuid
+from collections import OrderedDict
from django.conf import settings
from django.core.exceptions import ValidationError as DjangoValidationError
from django.core.exceptions import ObjectDoesNotExist
-from django.core.validators import RegexValidator, ip_address_validators
+from django.core.validators import (
+ EmailValidator, RegexValidator, URLValidator, ip_address_validators
+)
from django.forms import FilePathField as DjangoFilePathField
from django.forms import ImageField as DjangoImageField
from django.utils import six, timezone
@@ -23,9 +27,9 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import ISO_8601
from rest_framework.compat import (
- EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
- MinValueValidator, OrderedDict, URLValidator, duration_string,
- parse_duration, unicode_repr, unicode_to_repr
+ MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+ MinValueValidator, duration_string, parse_duration, unicode_repr,
+ unicode_to_repr
)
from rest_framework.exceptions import ValidationError
from rest_framework.settings import api_settings
@@ -885,12 +889,11 @@ class DecimalField(Field):
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
- coerce_to_string = api_settings.COERCE_DECIMAL_TO_STRING
-
def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, **kwargs):
self.max_digits = max_digits
self.decimal_places = decimal_places
- self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string
+ if coerce_to_string is not None:
+ self.coerce_to_string = coerce_to_string
self.max_value = max_value
self.min_value = min_value
@@ -970,12 +973,14 @@ class DecimalField(Field):
return value
def to_representation(self, value):
+ coerce_to_string = getattr(self, 'coerce_to_string', api_settings.COERCE_DECIMAL_TO_STRING)
+
if not isinstance(value, decimal.Decimal):
value = decimal.Decimal(six.text_type(value).strip())
quantized = self.quantize(value)
- if not self.coerce_to_string:
+ if not coerce_to_string:
return quantized
return '{0:f}'.format(quantized)
@@ -997,15 +1002,15 @@ class DateTimeField(Field):
'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'),
'date': _('Expected a datetime but got a date.'),
}
- format = api_settings.DATETIME_FORMAT
- input_formats = api_settings.DATETIME_INPUT_FORMATS
- default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None
datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
- self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
+ if default_timezone is not None:
+ self.timezone = default_timezone
super(DateTimeField, self).__init__(*args, **kwargs)
def enforce_timezone(self, value):
@@ -1013,21 +1018,28 @@ class DateTimeField(Field):
When `self.default_timezone` is `None`, always return naive datetimes.
When `self.default_timezone` is not `None`, always return aware datetimes.
"""
- if (self.default_timezone is not None) and not timezone.is_aware(value):
- return timezone.make_aware(value, self.default_timezone)
- elif (self.default_timezone is None) and timezone.is_aware(value):
+ field_timezone = getattr(self, 'timezone', self.default_timezone())
+
+ if (field_timezone is not None) and not timezone.is_aware(value):
+ return timezone.make_aware(value, field_timezone)
+ elif (field_timezone is None) and timezone.is_aware(value):
return timezone.make_naive(value, timezone.UTC())
return value
+ def default_timezone(self):
+ return timezone.get_default_timezone() if settings.USE_TZ else None
+
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS)
+
if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime):
self.fail('date')
if isinstance(value, datetime.datetime):
return self.enforce_timezone(value)
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_datetime(value)
except (ValueError, TypeError):
@@ -1037,25 +1049,27 @@ class DateTimeField(Field):
return self.enforce_timezone(parsed)
else:
try:
- parsed = self.datetime_parser(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return self.enforce_timezone(parsed)
- humanized_format = humanize_datetime.datetime_formats(self.input_formats)
+ humanized_format = humanize_datetime.datetime_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
- if self.format is None:
+ output_format = getattr(self, 'format', api_settings.DATETIME_FORMAT)
+
+ if output_format is None:
return value
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
value = value.isoformat()
if value.endswith('+00:00'):
value = value[:-6] + 'Z'
return value
- return value.strftime(self.format)
+ return value.strftime(output_format)
class DateField(Field):
@@ -1063,24 +1077,26 @@ class DateField(Field):
'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'),
'datetime': _('Expected a date but got a datetime.'),
}
- format = api_settings.DATE_FORMAT
- input_formats = api_settings.DATE_INPUT_FORMATS
datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
super(DateField, self).__init__(*args, **kwargs)
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.DATE_INPUT_FORMATS)
+
if isinstance(value, datetime.datetime):
self.fail('datetime')
if isinstance(value, datetime.date):
return value
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_date(value)
except (ValueError, TypeError):
@@ -1090,20 +1106,22 @@ class DateField(Field):
return parsed
else:
try:
- parsed = self.datetime_parser(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return parsed.date()
- humanized_format = humanize_datetime.date_formats(self.input_formats)
+ humanized_format = humanize_datetime.date_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
+ output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
+
if not value:
return None
- if self.format is None:
+ if output_format is None:
return value
# Applying a `DateField` to a datetime value is almost always
@@ -1115,33 +1133,35 @@ class DateField(Field):
'read-only field and deal with timezone issues explicitly.'
)
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
if (isinstance(value, str)):
value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
return value.isoformat()
- return value.strftime(self.format)
+ return value.strftime(output_format)
class TimeField(Field):
default_error_messages = {
'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'),
}
- format = api_settings.TIME_FORMAT
- input_formats = api_settings.TIME_INPUT_FORMATS
datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
super(TimeField, self).__init__(*args, **kwargs)
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.TIME_INPUT_FORMATS)
+
if isinstance(value, datetime.time):
return value
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_time(value)
except (ValueError, TypeError):
@@ -1151,17 +1171,19 @@ class TimeField(Field):
return parsed
else:
try:
- parsed = self.datetime_parser(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return parsed.time()
- humanized_format = humanize_datetime.time_formats(self.input_formats)
+ humanized_format = humanize_datetime.time_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
- if self.format is None:
+ output_format = getattr(self, 'format', api_settings.TIME_FORMAT)
+
+ if output_format is None:
return value
# Applying a `TimeField` to a datetime value is almost always
@@ -1173,9 +1195,9 @@ class TimeField(Field):
'read-only field and deal with timezone issues explicitly.'
)
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
return value.isoformat()
- return value.strftime(self.format)
+ return value.strftime(output_format)
class DurationField(Field):
@@ -1265,14 +1287,13 @@ class MultipleChoiceField(ChoiceField):
super(MultipleChoiceField, self).__init__(*args, **kwargs)
def get_value(self, dictionary):
+ if self.field_name not in dictionary:
+ if getattr(self.root, 'partial', False):
+ return empty
# We override the default field access in order to support
# lists in HTML forms.
if html.is_html_input(dictionary):
- ret = dictionary.getlist(self.field_name)
- if getattr(self.root, 'partial', False) and not ret:
- ret = empty
- return ret
-
+ return dictionary.getlist(self.field_name)
return dictionary.get(self.field_name, empty)
def to_internal_value(self, data):
@@ -1319,12 +1340,12 @@ class FileField(Field):
'empty': _('The submitted file is empty.'),
'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'),
}
- use_url = api_settings.UPLOADED_FILES_USE_URL
def __init__(self, *args, **kwargs):
self.max_length = kwargs.pop('max_length', None)
self.allow_empty_file = kwargs.pop('allow_empty_file', False)
- self.use_url = kwargs.pop('use_url', self.use_url)
+ if 'use_url' in kwargs:
+ self.use_url = kwargs.pop('use_url')
super(FileField, self).__init__(*args, **kwargs)
def to_internal_value(self, data):
@@ -1345,10 +1366,12 @@ class FileField(Field):
return data
def to_representation(self, value):
+ use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
+
if not value:
return None
- if self.use_url:
+ if use_url:
if not getattr(value, 'url', None):
# If the file has not been saved it may not have a URL.
return None
@@ -1419,6 +1442,9 @@ class ListField(Field):
self.child.bind(field_name='', parent=self)
def get_value(self, dictionary):
+ if self.field_name not in dictionary:
+ if getattr(self.root, 'partial', False):
+ return empty
# We override the default field access in order to support
# lists in HTML forms.
if html.is_html_input(dictionary):
@@ -1497,6 +1523,37 @@ class DictField(Field):
])
+class JSONField(Field):
+ default_error_messages = {
+ 'invalid': _('Value must be valid JSON.')
+ }
+
+ def __init__(self, *args, **kwargs):
+ self.binary = kwargs.pop('binary', False)
+ super(JSONField, self).__init__(*args, **kwargs)
+
+ def to_internal_value(self, data):
+ try:
+ if self.binary:
+ if isinstance(data, six.binary_type):
+ data = data.decode('utf-8')
+ return json.loads(data)
+ else:
+ json.dumps(data)
+ except (TypeError, ValueError):
+ self.fail('invalid')
+ return data
+
+ def to_representation(self, value):
+ if self.binary:
+ value = json.dumps(value)
+ # On python 2.x the return type for json.dumps() is underspecified.
+ # On python 3.x json.dumps() returns unicode strings.
+ if isinstance(value, six.text_type):
+ value = bytes(value.encode('utf-8'))
+ return value
+
+
# Miscellaneous field types...
class ReadOnlyField(Field):
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 90c19aba0..c1e0ae054 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -11,9 +11,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.db import models
from django.utils import six
-from rest_framework.compat import (
- distinct, django_filters, get_model_name, guardian
-)
+from rest_framework.compat import distinct, django_filters, guardian
from rest_framework.settings import api_settings
FilterSet = django_filters and django_filters.FilterSet or None
@@ -202,7 +200,7 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend):
model_cls = queryset.model
kwargs = {
'app_label': model_cls._meta.app_label,
- 'model_name': get_model_name(model_cls)
+ 'model_name': model_cls._meta.model_name
}
permission = self.perm_format % kwargs
if guardian.VERSION >= (1, 3):
diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo
index 4111cf0e6..1d1fa1cb9 100644
Binary files a/rest_framework/locale/ar/LC_MESSAGES/django.mo and b/rest_framework/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.po b/rest_framework/locale/ar/LC_MESSAGES/django.po
index 3b7df4337..58197d962 100644
--- a/rest_framework/locale/ar/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ar/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Arabic (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "اسم المستخدم/كلمة السر غير صحيحين."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "المستخدم غير مفعل او تم حذفه."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -87,11 +87,12 @@ msgstr "لم يتم تزويد بيانات الدخول."
msgid "You do not have permission to perform this action."
msgstr "ليس لديك صلاحية للقيام بهذا الإجراء."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "غير موجود."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -107,209 +109,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "هذا الحقل مطلوب."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" ليس قيمة منطقية."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "لا يمكن لهذا الحقل ان يكون فارغاً."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "تأكد ان الحقل {min_length} محرف على الاقل."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "عليك ان تدخل بريد إلكتروني صالح."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "هذه القيمة لا تطابق النمط المطلوب."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "الرجاء إدخال رابط إلكتروني صالح."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "الرجاء إدخال رقم صحيح صالح."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "تأكد ان القيمة أقل أو تساوي {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "الرجاء إدخال رقم صالح."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "لم يتم إرسال أي ملف."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "الملف الذي تم إرساله فارغ."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "قيمة غير صالحة."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -361,6 +396,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/be/LC_MESSAGES/django.mo b/rest_framework/locale/be/LC_MESSAGES/django.mo
index a844185f0..97fb40795 100644
Binary files a/rest_framework/locale/be/LC_MESSAGES/django.mo and b/rest_framework/locale/be/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po
index 0ba69266e..77295d606 100644
--- a/rest_framework/locale/be/LC_MESSAGES/django.po
+++ b/rest_framework/locale/be/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Belarusian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/be/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..a3fe77afb
Binary files /dev/null and b/rest_framework/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.po b/rest_framework/locale/ca/LC_MESSAGES/django.po
new file mode 100644
index 000000000..4d7cf9c20
--- /dev/null
+++ b/rest_framework/locale/ca/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
+"Language-Team: Catalan (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr "Header Basic invàlid. No hi ha disponibles les credencials."
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr "Header Basic invàlid. Les credencials no poden contenir espais."
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64."
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr "Usuari/Contrasenya incorrectes."
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr "Usuari inactiu o esborrat."
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr "Token header invàlid. No s'han indicat les credencials."
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr "Token header invàlid. El token no ha de contenir espais."
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr "Token header invàlid. El token no pot contenir caràcters invàlids."
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr "Token invàlid."
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Compte d'usuari desactivat."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "No es possible loguejar-se amb les credencials introduïdes."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "S'ha d'incloure \"username\" i \"password\"."
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr "S'ha produït un error en el servidor."
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr "Request amb format incorrecte."
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr "Credencials d'autenticació incorrectes."
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr "Credencials d'autenticació no disponibles."
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr "No té permisos per realitzar aquesta acció."
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr "No trobat."
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr "Mètode \"{method}\" no permès."
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr "No s'ha pogut satisfer l'Accept header de la petició."
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr "Media type \"{media_type}\" no suportat."
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr "La petició ha estat limitada pel número màxim de peticions definit."
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr "Aquest camp és obligatori."
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr "Aquest camp no pot ser nul."
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr "\"{input}\" no és un booleà."
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr "Aquest camp no pot estar en blanc."
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr "Aquest camp no pot tenir més de {max_length} caràcters."
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr "Aquest camp ha de tenir un mínim de {min_length} caràcters."
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr "Introdueixi una adreça de correu vàlida."
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr "Aquest valor no compleix el patró requerit."
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr "Introdueix un \"slug\" vàlid consistent en lletres, números, guions o guions baixos."
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr "Introdueixi una URL vàlida."
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr "\"{value}\" no és un UUID vàlid."
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introdueixi una adreça IPv4 o IPv6 vàlida."
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr "Es requereix un nombre enter vàlid."
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr "Aquest valor ha de ser menor o igual a {max_value}."
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr "Aquest valor ha de ser més gran o igual a {min_value}."
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr "Valor del text massa gran."
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr "Es requereix un nombre vàlid."
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr "No pot haver-hi més de {max_digits} dígits en total."
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr "No pot haver-hi més de {max_decimal_places} decimals."
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr "No pot haver-hi més de {max_whole_digits} dígits abans del punt decimal."
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr "El Datetime té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr "S'espera un Datetime però s'ha rebut un Date."
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr "El Date té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr "S'espera un Date però s'ha rebut un Datetime."
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr "El Time té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr "La durada té un format incorrecte. Utilitzi un d'aquests formats: {format}."
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr "\"{input}\" no és una opció vàlida."
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr "S'espera una llista d'ítems però s'ha rebut el tipus \"{input_type}\"."
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr "Aquesta selecció no pot estar buida."
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr "\"{input}\" no és un path vàlid."
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr "No s'ha enviat cap fitxer."
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr "Les dades enviades no són un fitxer. Comproveu l'encoding type del formulari."
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr "No s'ha pogut determinar el nom del fitxer."
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr "El fitxer enviat està buit."
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr "El nom del fitxer ha de tenir com a màxim {max_length} caràcters (en té {length})."
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "Envieu una imatge vàlida. El fitxer enviat no és una imatge o és una imatge corrompuda."
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr "Aquesta llista no pot estar buida."
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr "S'espera un diccionari però s'ha rebut el tipus \"{input_type}\"."
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr "Pàgina invàlida \"{page_number}\": {message}."
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr "Cursor invàlid."
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr "PK invàlida \"{pk_value}\" - l'objecte no existeix."
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr "Tipus incorrecte. S'espera el valor d'una PK, s'ha rebut {data_type}."
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr "Hyperlink invàlid - Cap match d'URL."
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr "Hyperlink invàlid - Match d'URL incorrecta."
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr "Hyperlink invàlid - L'objecte no existeix."
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr "Tipus incorrecte. S'espera una URL, s'ha rebut {data_type}."
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr "L'objecte amb {slug_name}={value} no existeix."
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr "Valor invàlid."
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr "Dades invàlides. S'espera un diccionari però s'ha rebut {datatype}."
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr "Cap"
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr "Cap opció seleccionada."
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr "Aquest camp ha de ser únic."
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr "Aquests camps {field_names} han de constituir un conjunt únic."
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr "Aquest camp ha de ser únic per a la data \"{date_field}\"."
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr "Aquest camp ha de ser únic per al mes \"{date_field}\"."
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"."
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr "Versió invàlida al header \"Accept\"."
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr "Versió invàlida a la URL."
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr "Versió invàlida al hostname."
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr "Versió invàlida al paràmetre de consulta."
+
+#: views.py:88
+msgid "Permission denied."
+msgstr "Permís denegat."
diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..2aa79c8fb
Binary files /dev/null and b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po
new file mode 100644
index 000000000..711ba24f9
--- /dev/null
+++ b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr ""
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr ""
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr ""
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr ""
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:88
+msgid "Permission denied."
+msgstr ""
diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo
index ad9e69676..cc186d881 100644
Binary files a/rest_framework/locale/cs/LC_MESSAGES/django.mo and b/rest_framework/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po
index e959c00ea..320c034a2 100644
--- a/rest_framework/locale/cs/LC_MESSAGES/django.po
+++ b/rest_framework/locale/cs/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Czech (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Chybná hlavička. Přihlašovací údaje by neměly obsahovat mezery."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Chybná hlavička. Přihlašovací údaje nebyly správně zakódovány pomocí base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Chybné uživatelské jméno nebo heslo."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Uživatelský účet je neaktivní nebo byl smazán."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Chybná hlavička tokenu. Přihlašovací údaje by neměly obsahovat mezery."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Chybný token."
@@ -88,11 +88,12 @@ msgstr "Nebyly zadány přihlašovací údaje."
msgid "You do not have permission to perform this action."
msgstr "K této akci nemáte oprávnění."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Nenalezeno."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Metoda \"{method}\" není povolena."
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Nelze vyhovět požadavku v hlavičce Accept."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Nepodporovaný media type \"{media_type}\" v požadavku."
@@ -108,209 +110,238 @@ msgstr "Nepodporovaný media type \"{media_type}\" v požadavku."
msgid "Request was throttled."
msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Toto pole je vyžadováno."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Toto pole nesmí být prázdné (null)."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" nelze použít jako typ boolean."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Toto pole nesmí být prázdné."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Vložte platnou e-mailovou adresu."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Vložte platnou \"zkrácenou formu\" obsahující pouze malá písmena, čísla, spojovník nebo podtržítko."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Vložte platný odkaz."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" není platné UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Je vyžadováno celé číslo."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Zkontrolujte, že hodnota je větší nebo rovna {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Řetězec je příliš dlouhý."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Je vyžadováno číslo."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Zkontrolujte, že číslo neobsahuje více než {max_digits} čislic."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Zkontrolujte, že číslo nemá více než {max_decimal_places} desetinných míst."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Zkontrolujte, že číslo neobsahuje více než {max_whole_digits} čislic před desetinnou čárkou."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Chybný formát data a času. Použijte jeden z těchto formátů: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Bylo zadáno pouze datum bez času."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Chybný formát data. Použijte jeden z těchto formátů: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Bylo zadáno datum a čas, místo samotného data."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Chybný formát času. Použijte jeden z těchto formátů: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" není platnou možností."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Byl očekáván seznam položek ale nalezen \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Nebyl zaslán žádný soubor."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Zaslaná data neobsahují soubor. Zkontrolujte typ kódování ve formuláři."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Nebylo možné zjistit jméno souboru."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Zaslaný soubor je prázdný."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Zajistěte, aby jméno souboru obsahovalo maximálně {max_length} znaků (teď má {length} znaků)."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Chybné čislo stránky \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Chybný kurzor."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Chybný typ. Byl přijat typ {data_type} místo hodnoty primárního klíče."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Chybný odkaz - nebyla nalezena žádní shoda."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Chybný odkaz - byla nalezena neplatná shoda."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Chybný odkaz - objekt neexistuje."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Chybný typ. Byl přijat typ {data_type} místo očekávaného odkazu."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objekt s {slug_name}={value} neexistuje."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Chybná hodnota."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Chybná data. Byl přijat typ {datatype} místo očekávaného slovníku."
@@ -331,18 +362,22 @@ msgid "This field must be unique."
msgstr "Tato položka musí být unikátní."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Položka {field_names} musí tvořit unikátní množinu."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Tato položka musí být pro datum \"{date_field}\" unikátní."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Tato položka musí být pro měsíc \"{date_field}\" unikátní."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní."
@@ -362,6 +397,6 @@ msgstr "Chybné číslo verze v hostname."
msgid "Invalid version in query parameter."
msgstr "Chybné čislo verze v URL parametru."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo
index 45cae5551..a8eb68ece 100644
Binary files a/rest_framework/locale/da/LC_MESSAGES/django.mo and b/rest_framework/locale/da/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po
index ab9e37d2e..6b37ac313 100644
--- a/rest_framework/locale/da/LC_MESSAGES/django.po
+++ b/rest_framework/locale/da/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Danish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Ugyldig basic header. Ingen legitimation angivet."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Ugyldigt brugernavn/kodeord."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Inaktiv eller slettet bruger."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Ugyldig token header."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Ugyldigt token."
@@ -87,11 +87,12 @@ msgstr "Legitimation til autentificering blev ikke angivet."
msgid "You do not have permission to perform this action."
msgstr "Du har ikke lov til at udføre denne handling."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Ikke fundet."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Metoden \"{method}\" er ikke tilladt."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Kunne ikke efterkomme forespørgslens Accept header."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
@@ -107,209 +109,238 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
msgid "Request was throttled."
msgstr "Forespørgslen blev neddroslet."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Dette felt er påkrævet."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Dette felt må ikke være null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" er ikke en tilladt boolsk værdi."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Dette felt må ikke være tomt."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Tjek at dette felt ikke indeholder flere end {max_length} tegn."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Tjek at dette felt indeholder mindst {min_length} tegn."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Angiv en gyldig e-mailadresse."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Denne værdi passer ikke med det påkrævede mønster."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Indtast en gyldig \"slug\", bestående af bogstaver, tal, bund- og bindestreger."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Indtast en gyldig URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" er ikke et gyldigt UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Et gyldigt heltal er påkrævet."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Tjek at værdien er mindre end eller lig med {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Tjek at værdien er større end eller lig med {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Strengværdien er for stor."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Et gyldigt tal er påkrævet."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Tjek at der ikke er flere end {max_digits} cifre i alt."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Tjek at der ikke er flere end {max_decimal_places} cifre efter kommaet."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Tjek at der ikke er flere end {max_whole_digits} cifre før kommaet."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datotid har et forkert format. Brug i stedet et af disse formater: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Forventede en datotid, men fik en dato."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Dato har et forkert format. Brug i stedet et af disse formater: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Forventede en dato men fik en datotid."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Klokkeslæt har forkert format. Brug i stedet et af disse formater: {format}. "
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" er ikke et gyldigt valg."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Ingen medsendt fil."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Det medsendte data var ikke en fil. Tjek typen af indkodning på formularen."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Filnavnet kunne ikke afgøres."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Den medsendte fil er tom."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Sørg for at filnavnet er højst {max_length} langt (det er {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Medsend et gyldigt billede. Den medsendte fil var enten ikke et billede eller billedfilen var ødelagt."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Ugyldig side \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Ugyldig cursor"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Ugyldig type. Forventet værdi er primærnøgle, fik {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Ugyldigt hyperlink - intet URL match."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Ugyldigt hyperlink - forkert URL match."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Ugyldigt hyperlink - objektet findes ikke."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Forkert type. Forventede en URL-streng, fik {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Object med {slug_name}={value} findes ikke."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Ugyldig værdi."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Dette felt skal være unikt."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Felterne {field_names} skal udgøre et unikt sæt."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Dette felt skal være unikt for \"{date_field}\"-måneden."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Dette felt skal være unikt for \"{date_field}\"-året."
@@ -361,6 +396,6 @@ msgstr "Ugyldig version i hostname."
msgid "Invalid version in query parameter."
msgstr "Ugyldig version i forespørgselsparameteren."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Adgang nægtet."
diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo
index b16b04d0b..0def3e0c5 100644
Binary files a/rest_framework/locale/de/LC_MESSAGES/django.mo and b/rest_framework/locale/de/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po
index ef6e16232..4b5863f41 100644
--- a/rest_framework/locale/de/LC_MESSAGES/django.po
+++ b/rest_framework/locale/de/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: German (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Ungültiger Benutzername/Passwort"
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Benutzer inaktiv oder gelöscht."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Ungültiger token header. Keine Zugangsdaten angegeben."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Ungültiges Token"
@@ -90,11 +90,12 @@ msgstr "Anmeldedaten fehlen."
msgid "You do not have permission to perform this action."
msgstr "Sie sind nicht berechtigt, diese Aktion durchzuführen."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Nicht gefunden."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Methode \"{method}\" nicht erlaubt."
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
@@ -110,209 +112,238 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
msgid "Request was throttled."
msgstr "Die Anfrage wurde gedrosselt."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Dieses Feld ist erforderlich."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Dieses Feld darf nicht Null sein."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" ist kein gültiger Wahrheitswert."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Dieses Feld darf nicht leer sein."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Stelle sicher, dass dieses Feld nicht mehr als {max_length} Zeichen lang ist."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Gib eine gültige E-Mail Adresse an."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Gib ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Gib eine gültige URL ein."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" ist keine gültige UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Eine gültige Ganzzahl ist erforderlich."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Stelle sicher, dass dieser Wert kleiner oder gleich {max_value} ist."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Stelle sicher, dass dieser Wert größer oder gleich {min_value} ist."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Zeichenkette zu lang."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Eine gültige Zahl ist erforderlich."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Stelle sicher, dass es insgesamt nicht mehr als {max_digits} Ziffern lang ist."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Stelle sicher, dass es nicht mehr als {max_decimal_places} Nachkommastellen lang ist."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Stelle sicher, dass es nicht mehr als {max_whole_digits} Stellen vor dem Komma lang ist."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datums- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Laufzeit hat das falsche Format. Benutze stattdessen eines dieser Formate {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" ist keine gültige Option."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Erwarte eine Liste von Elementen, erhielt aber den Typ \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Es wurde keine Datei übermittelt."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Die übermittelten Daten stellen keine Datei dar. Prüfe den Kodierungstyp im Formular."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Der Dateiname konnte nicht ermittelt werden."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Die übermittelte Datei ist leer."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Stelle sicher, dass dieser Dateiname höchstens {max_length} Zeichen lang ist (er hat {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Lade ein gültiges Bild hoch. Die hochgeladene Datei ist entweder kein Bild oder ein beschädigtes Bild."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Ungültige Seite \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Ungültiger Zeiger"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Ungültiger Hyperlink - entspricht keiner URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Ungültiger Hyperlink - URL stimmt nicht überein."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Ungültiger Hyperlink - Objekt existiert nicht."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objekt mit {slug_name}={value} existiert nicht."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Ungültiger Wert."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten."
@@ -333,18 +364,22 @@ msgid "This field must be unique."
msgstr "Dieses Feld muss eindeutig sein."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Datums eindeutig sein."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Monats eindeutig sein."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein."
@@ -364,6 +399,6 @@ msgstr "Ungültige Version im Hostname."
msgid "Invalid version in query parameter."
msgstr "Ungültige Version im Anfrageparameter."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Zugriff verweigert."
diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo
index 0d3211365..a76764b22 100644
Binary files a/rest_framework/locale/en/LC_MESSAGES/django.mo and b/rest_framework/locale/en/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po
index 6c398f04b..40280f9ad 100644
--- a/rest_framework/locale/en/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Invalid basic header. No credentials provided."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Invalid basic header. Credentials string should not contain spaces."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Invalid basic header. Credentials not correctly base64 encoded."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Invalid username/password."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "User inactive or deleted."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Invalid token header. No credentials provided."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Invalid token header. Token string should not contain spaces."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr "Invalid token header. Token string should not contain invalid characters."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Invalid token."
@@ -86,11 +86,12 @@ msgstr "Authentication credentials were not provided."
msgid "You do not have permission to perform this action."
msgstr "You do not have permission to perform this action."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Not found."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Method \"{method}\" not allowed."
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Could not satisfy the request Accept header."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Unsupported media type \"{media_type}\" in request."
@@ -106,209 +108,238 @@ msgstr "Unsupported media type \"{media_type}\" in request."
msgid "Request was throttled."
msgstr "Request was throttled."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "This field is required."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "This field may not be null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" is not a valid boolean."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "This field may not be blank."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Ensure this field has no more than {max_length} characters."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Ensure this field has at least {min_length} characters."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Enter a valid email address."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "This value does not match the required pattern."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Enter a valid URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" is not a valid UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Enter a valid IPv4 or IPv6 address."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "A valid integer is required."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Ensure this value is less than or equal to {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Ensure this value is greater than or equal to {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "String value too large."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "A valid number is required."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Ensure that there are no more than {max_digits} digits in total."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Ensure that there are no more than {max_decimal_places} decimal places."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Ensure that there are no more than {max_whole_digits} digits before the decimal point."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datetime has wrong format. Use one of these formats instead: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Expected a datetime but got a date."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Date has wrong format. Use one of these formats instead: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Expected a date but got a datetime."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Time has wrong format. Use one of these formats instead: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Duration has wrong format. Use one of these formats instead: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" is not a valid choice."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr "More than {count} items..."
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Expected a list of items but got type \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr "This selection may not be empty."
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr "\"{input}\" is not a valid path choice."
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "No file was submitted."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "The submitted data was not a file. Check the encoding type on the form."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "No filename could be determined."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "The submitted file is empty."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Ensure this filename has at most {max_length} characters (it has {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr "This list may not be empty."
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Expected a dictionary of items but got type \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Invalid page \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Invalid cursor"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Invalid pk \"{pk_value}\" - object does not exist."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Incorrect type. Expected pk value, received {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Invalid hyperlink - No URL match."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Invalid hyperlink - Incorrect URL match."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Invalid hyperlink - Object does not exist."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Incorrect type. Expected URL string, received {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Object with {slug_name}={value} does not exist."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Invalid value."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Invalid data. Expected a dictionary, but got {datatype}."
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr "This field must be unique."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "The fields {field_names} must make a unique set."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "This field must be unique for the \"{date_field}\" date."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "This field must be unique for the \"{date_field}\" month."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "This field must be unique for the \"{date_field}\" year."
@@ -360,6 +395,6 @@ msgstr "Invalid version in hostname."
msgid "Invalid version in query parameter."
msgstr "Invalid version in query parameter."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Permission denied."
diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo
index 63cbeacd7..61db1951b 100644
Binary files a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo and b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po
index cff2f6aa7..49436f2a3 100644
--- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en_CA/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: English (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_CA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: en_CA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo
index 078860de7..2060cb51f 100644
Binary files a/rest_framework/locale/en_US/LC_MESSAGES/django.mo and b/rest_framework/locale/en_US/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po
index 3bde67f2c..846e5366a 100644
--- a/rest_framework/locale/en_US/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,40 +17,40 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,207 +108,236 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid "Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid "The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -327,18 +358,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -358,6 +393,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo
index 089525c32..875788154 100644
Binary files a/rest_framework/locale/es/LC_MESSAGES/django.mo and b/rest_framework/locale/es/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po
index f0e9df792..5a296364e 100644
--- a/rest_framework/locale/es/LC_MESSAGES/django.po
+++ b/rest_framework/locale/es/LC_MESSAGES/django.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Spanish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,40 +22,40 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Cabecera básica inválida. La cadena con las credenciales no debe contener espacios."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Nombre de usuario/contraseña inválidos."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Usuario inactivo o borrado."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Cabecera token inválida. Las credenciales no fueron suministradas."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Cabecera token inválida. La cadena token no debe contener espacios."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr "Cabecera token inválida. La cadena token no debe contener caracteres inválidos."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Token inválido."
@@ -91,11 +91,12 @@ msgstr "Las credenciales de autenticación no se proveyeron."
msgid "You do not have permission to perform this action."
msgstr "Usted no tiene permiso para realizar esta acción."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "No encontrado."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Método \"{method}\" no permitido."
@@ -104,6 +105,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
@@ -111,209 +113,238 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
msgid "Request was throttled."
msgstr "Solicitud fue regulada (throttled)."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Este campo es requerido."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Este campo no puede ser nulo."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" no es un booleano válido."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Este campo no puede estar en blanco."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Asegúrese de que este campo no tenga más de {max_length} caracteres."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Asegúrese de que este campo tenga al menos {min_length} caracteres."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Este valor no coincide con el patrón requerido."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Introduzca un \"slug\" válido consistente en letras, números, guiones o guiones bajos."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" no es un UUID válido."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Introduzca una dirección IPv4 o IPv6 válida."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Introduzca un número entero válido."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Asegúrese de que este valor es menor o igual a {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Asegúrese de que este valor es mayor o igual a {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Cadena demasiado larga."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Se requiere un número válido."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Asegúrese de que no haya más de {max_digits} dígitos en total."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Asegúrese de que no haya más de {max_decimal_places} decimales."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Asegúrese de que no haya más de {max_whole_digits} dígitos en la parte entera."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Fecha/hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Se esperaba un fecha/hora en vez de una fecha."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Fecha con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Se esperaba una fecha en vez de una fecha/hora."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Duración con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" no es una elección válida."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Se esperaba una lista de elementos en vez del tipo \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
-msgstr ""
+msgstr "Esta selección no puede estar vacía."
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" no es una elección de ruta válida."
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "La información enviada no era un archivo. Compruebe el tipo de codificación del formulario."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "No se pudo determinar un nombre de archivo."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "El archivo enviado está vació."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Asegúrese de que el nombre de archivo no tenga más de {max_length} caracteres (tiene {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o bien está dañado."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
-msgstr ""
+msgstr "Esta lista no puede estar vacía."
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Página \"{page_number}\" inválida: {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Cursor inválido"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Tipo incorrecto. Se esperaba valor de clave primaria y se recibió {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Hiperenlace inválido - No hay URL coincidentes."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Hiperenlace inválido - Coincidencia incorrecta de la URL."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Hiperenlace inválido - Objeto no existe."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Tipo incorrecto. Se esperaba una URL y se recibió {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objeto con {slug_name}={value} no existe."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Valor inválido."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Datos inválidos. Se esperaba un diccionario pero es un {datatype}."
@@ -334,18 +365,22 @@ msgid "This field must be unique."
msgstr "Este campo debe ser único."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Los campos {field_names} deben formar un conjunto único."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Este campo debe ser único para el día \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Este campo debe ser único para el mes \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Este campo debe ser único para el año \"{date_field}\"."
@@ -365,6 +400,6 @@ msgstr "Versión inválida en el nombre de host."
msgid "Invalid version in query parameter."
msgstr "Versión inválida en el parámetro de consulta."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Permiso denegado."
diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo
index 931ab9bdb..880d55b24 100644
Binary files a/rest_framework/locale/et/LC_MESSAGES/django.mo and b/rest_framework/locale/et/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po
index 597b15c6e..e642aaf0d 100644
--- a/rest_framework/locale/et/LC_MESSAGES/django.po
+++ b/rest_framework/locale/et/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Estonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Sobimatu kasutajatunnus/salasõna."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Kasutaja on inaktiivne või kustutatud."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada tühikuid."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Sobimatu lubakaart."
@@ -87,11 +87,12 @@ msgstr "Autentimistunnus on esitamata."
msgid "You do not have permission to perform this action."
msgstr "Teil puuduvad piisavad õigused selle tegevuse teostamiseks."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Ei leidnud."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Meetod \"{method}\" pole lubatud."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Päringu Accept-päist ei suutnud täita."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Meedia tüüpi {media_type} päringus ei toetata."
@@ -107,209 +109,238 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata."
msgid "Request was throttled."
msgstr "Liiga palju päringuid."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Väli on kohustuslik."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Väli ei tohi olla tühi."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" pole kehtiv kahendarv."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "See väli ei tohi olla tühi."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Veendu, et see väli poleks pikem kui {max_length} tähemärki."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Veendu, et see väli oleks vähemalt {min_length} tähemärki pikk."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Sisestage kehtiv e-posti aadress."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Väärtus ei ühti etteantud mustriga."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Sisestage kehtiv \"slug\", mis koosneks tähtedest, numbritest, ala- või sidekriipsudest."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Sisestage korrektne URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" pole kehtiv UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Sisendiks peab olema täisarv."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Veenduge, et väärtus on väiksem kui või võrdne väärtusega {max_value}. "
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Veenduge, et väärtus on suurem kui või võrdne väärtusega {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Sõne on liiga pikk."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Sisendiks peab olema arv."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Veenduge, et kokku pole rohkem kui {max_digits} numbit."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Veenduge, et komakohti pole rohkem kui {max_decimal_places}. "
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Veenduge, et täiskohti poleks rohkem kui {max_whole_digits}."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Valesti formaaditud kuupäev-kellaaeg. Kasutage mõnda neist: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" on sobimatu valik."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Ühtegi faili ei esitatud."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Esitatud andmetes ei olnud faili. Kontrollige vormi kodeeringut."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Ei suutnud tuvastada failinime."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Esitatud fail oli tühi."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Veenduge, et failinimi oleks maksimaalselt {max_length} tähemärki pikk (praegu on {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Laadige üles kehtiv pildifail. Üles laetud fail ei olnud pilt või oli see katki."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Sobimatu lehekülg \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Sobimatu kursor."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Sobimatu hüperlink - ei leidnud URLi vastet."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Sobimatu hüperlink - vale URLi vaste."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Sobimatu hüperlink - objekti ei eksisteeri."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Sobimatu andmetüüp. Ootasin URLi sõne, sain {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objekti {slug_name}={value} ei eksisteeri."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Sobimatu väärtus."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {datatype}."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Selle välja väärtus peab olema unikaalne."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Veerud {field_names} peavad moodustama unikaalse hulga."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Selle välja väärtus peab olema unikaalne veerus \"{date_field}\" märgitud kuupäeval."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud kuul."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud aastal."
@@ -361,6 +396,6 @@ msgstr "Sobimatu versioon hostinimes."
msgid "Invalid version in query parameter."
msgstr "Sobimatu versioon päringu parameetris."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo
index d7be0d93c..9626fd354 100644
Binary files a/rest_framework/locale/fr/LC_MESSAGES/django.mo and b/rest_framework/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po
index 35ba5db5e..383d968c7 100644
--- a/rest_framework/locale/fr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/fr/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:58+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: French (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "En-tête « basic » non valide. Informations d'identification non fournies."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "En-tête « basic » non valide. Les informations d'identification ne doivent pas contenir d'espaces."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "En-tête « basic » non valide. Encodage base64 des informations d'identification incorrect."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Utilisateur inactif ou supprimé."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "En-tête « token » non valide. Informations d'identification non fournies."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "En-tête « token » non valide. Un token ne doit pas contenir d'espaces."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
-msgstr ""
+msgstr "En-tête « token » non valide. Un token ne doit pas contenir de caractères invalides."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Token non valide."
@@ -90,11 +90,12 @@ msgstr "Informations d'authentification non fournies."
msgid "You do not have permission to perform this action."
msgstr "Vous n'avez pas la permission d'effectuer cette action."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Pas trouvé."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Méthode \"{method}\" non autorisée."
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "L'en-tête « Accept » n'a pas pu être satisfaite."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Type de média \"{media_type}\" non supporté."
@@ -110,209 +112,238 @@ msgstr "Type de média \"{media_type}\" non supporté."
msgid "Request was throttled."
msgstr "Requête ralentie."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Ce champ est obligatoire."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Ce champ ne peut être null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" n'est pas un booléen valide."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Ce champ ne peut être vide."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Saisissez une adresse email valable."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Cette valeur ne satisfait pas le motif imposé."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Saisissez une URL valide."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" n'est pas un UUID valide."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Saisissez une adresse IPv4 ou IPv6 valide."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Un nombre entier valide est requis."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Assurez-vous que cette valeur est inférieure ou égale à {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Assurez-vous que cette valeur est supérieure ou égale à {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Chaîne de caractères trop longue."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Un nombre valide est requis."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Assurez-vous qu'il n'y a pas plus de {max_digits} chiffres au total."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Assurez-vous qu'il n'y a pas plus de {max_decimal_places} chiffres après la virgule."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Assurez-vous qu'il n'y a pas plus de {max_whole_digits} chiffres avant la virgule."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Attendait une date + heure mais a reçu une date."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Attendait une date mais a reçu une date + heure."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" n'est pas un choix valide."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr "Plus de {count} éléments..."
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
-msgstr ""
+msgstr "Cette sélection ne peut être vide."
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" n'est pas un choix de chemin valide."
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Aucun fichier n'a été soumis."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "La donnée soumise n'est pas un fichier. Vérifiez le type d'encodage du formulaire."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Le nom de fichier n'a pu être déterminé."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Le fichier soumis est vide."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est pas une image, ou il est corrompu."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
-msgstr ""
+msgstr "Cette liste ne peut pas être vide."
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Page \"{page_number}\" non valide : {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Curseur non valide"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Lien non valide : pas d'URL correspondante."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Lien non valide : URL correspondante incorrecte."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Lien non valide : l'objet n'existe pas."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Type incorrect. Attendait une URL, a reçu {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "L'object avec {slug_name}={value} n'existe pas."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Valeur non valide."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Donnée non valide. Attendait un dictionnaire, a reçu {datatype}."
@@ -333,18 +364,22 @@ msgid "This field must be unique."
msgstr "Ce champ doit être unique."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Les champs {field_names} doivent former un ensemble unique."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Ce champ doit être unique pour la date \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Ce champ doit être unique pour le mois \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Ce champ doit être unique pour l'année \"{date_field}\"."
@@ -364,6 +399,6 @@ msgstr "Version non valide dans le nom d'hôte."
msgid "Invalid version in query parameter."
msgstr "Version non valide dans le paramètre de requête."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Permission refusée."
diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo
index f534447cf..4f1c6c5a5 100644
Binary files a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo and b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
index 90fe8446c..11ec107ea 100644
--- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
+++ b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: French (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.mo b/rest_framework/locale/gl/LC_MESSAGES/django.mo
index 1ddc93214..7446c524a 100644
Binary files a/rest_framework/locale/gl/LC_MESSAGES/django.mo and b/rest_framework/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po
index 8ec8f26c7..526f8d706 100644
--- a/rest_framework/locale/gl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/gl/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Galician (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo
index 8031c173b..3bce3c307 100644
Binary files a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo and b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
index e61aac266..c34d39523 100644
--- a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
+++ b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Galician (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: gl_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -87,11 +87,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -107,209 +109,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Valor non válido."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -361,6 +396,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Permiso denegado."
diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo
index a69d70656..79f7c7329 100644
Binary files a/rest_framework/locale/hu/LC_MESSAGES/django.mo and b/rest_framework/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po
index 3cd341314..6f7f67d7a 100644
--- a/rest_framework/locale/hu/LC_MESSAGES/django.po
+++ b/rest_framework/locale/hu/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Hungarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Érvénytelen basic fejlécmező. Az azonosító karakterlánc nem tartalmazhat szóközöket."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Érvénytelen basic fejlécmező. Az azonosítók base64 kódolása nem megfelelő."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Érvénytelen felhasználónév/jelszó."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "A felhasználó nincs aktiválva vagy törölve lett."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Érvénytelen token fejlécmező. A token karakterlánc nem tartalmazhat szóközöket."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Érvénytelen token."
@@ -87,11 +87,12 @@ msgstr "Nem voltak megadva azonosítók."
msgid "You do not have permission to perform this action."
msgstr "Nincs jogosultsága a művelet végrehajtásához."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Nem található."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "A \"{method}\" metódus nem megengedett."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Nem támogatott média típus \"{media_type}\" a kérésben."
@@ -107,209 +109,238 @@ msgstr "Nem támogatott média típus \"{media_type}\" a kérésben."
msgid "Request was throttled."
msgstr "A kérés korlátozva lett."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Ennek a mezőnek a megadása kötelező."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Ez a mező nem lehet null értékű."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "Az \"{input}\" nem egy érvényes logikai érték."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Ez a mező nem lehet üres."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Bizonyosodjon meg arról, hogy ez a mező legfeljebb {max_length} karakterből áll."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Bizonyosodjon meg arról, hogy ez a mező legalább {min_length} karakterből áll."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Adjon meg egy érvényes e-mail címet!"
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Ez az érték nem illeszkedik a szükséges mintázatra."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket tartalmazhat."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Adjon meg egy érvényes URL-t!"
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Egy érvényes egész szám megadása szükséges."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Bizonyosodjon meg arról, hogy ez az érték legfeljebb {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Bizonyosodjon meg arról, hogy ez az érték legalább {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "A karakterlánc túl hosszú."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Egy érvényes szám megadása szükséges."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Bizonyosodjon meg arról, hogy a számjegyek száma összesen legfeljebb {max_digits}."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Bizonyosodjon meg arról, hogy a tizedes tört törtrészében levő számjegyek száma összesen legfeljebb {max_decimal_places}."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Bizonyosodjon meg arról, hogy a tizedes tört egész részében levő számjegyek száma összesen legfeljebb {max_whole_digits}."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Időt is tartalmazó dátum helyett egy időt nem tartalmazó dátum lett elküldve."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Időt nem tartalmazó dátum helyett egy időt is tartalmazó dátum lett elküldve."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Az idő formátuma hibás. Használja ezek valamelyikét helyette: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "Az \"{input}\" nem egy érvényes elem."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Elemek listája helyett \"{input_type}\" lett elküldve."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Semmilyen fájl sem került feltöltésre."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Az elküldött adat nem egy fájl volt. Ellenőrizze a kódolás típusát az űrlapon!"
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "A fájlnév nem megállapítható."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "A küldött fájl üres."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb {max_length} karakterből áll (jelenlegi hossza: {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Töltsön fel egy érvényes képfájlt! A feltöltött fájl nem kép volt, vagy megsérült."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Érvénytelen oldal \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Érvénytelen pk \"{pk_value}\" - az objektum nem létezik."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Helytelen típus. pk érték helyett {data_type} lett elküldve."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Érvénytelen link - Nem illeszkedő URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Érvénytelen link. - Eltérő URL illeszkedés."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Érvénytelen link - Az objektum nem létezik."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Helytelen típus. URL karakterlánc helyett {data_type} lett elküldve."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Érvénytelen érték."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Érvénytelen adat. Egy dictionary helyett {datatype} lett elküldve."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Ennek a mezőnek egyedinek kell lennie."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" dátumra."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" hónapra."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre."
@@ -361,6 +396,6 @@ msgstr "Érvénytelen verzió a hosztnévben."
msgid "Invalid version in query parameter."
msgstr "Érvénytelen verzió a lekérdezési paraméterben."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo
index 2b3c1dde9..0324ef541 100644
Binary files a/rest_framework/locale/id/LC_MESSAGES/django.mo and b/rest_framework/locale/id/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po
index 03c8b66df..dac92dd57 100644
--- a/rest_framework/locale/id/LC_MESSAGES/django.po
+++ b/rest_framework/locale/id/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Indonesian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo
index 29ba49ed8..6e7625826 100644
Binary files a/rest_framework/locale/it/LC_MESSAGES/django.mo and b/rest_framework/locale/it/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po
index 009303dcb..da519aa59 100644
--- a/rest_framework/locale/it/LC_MESSAGES/django.po
+++ b/rest_framework/locale/it/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Italian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,40 +21,40 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Header di base invalido. Credenziali non fornite."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Credenziali non correttamente codificate in base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Nome utente/password non validi"
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Utente inattivo o eliminato."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Header del token non valido. Credenziali non fornite."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Header del token non valido. Il contenuto del token non dovrebbe contenere spazi."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Token invalido."
@@ -90,11 +90,12 @@ msgstr "Non sono state immesse le credenziali di autenticazione."
msgid "You do not have permission to perform this action."
msgstr "Non hai l'autorizzazione per eseguire questa azione."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Non trovato."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Metodo \"{method}\" non consentito"
@@ -103,6 +104,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Tipo di media \"{media_type}\"non supportato."
@@ -110,209 +112,238 @@ msgstr "Tipo di media \"{media_type}\"non supportato."
msgid "Request was throttled."
msgstr "La richiesta è stata limitata (throttled)."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Campo obbligatorio."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Il campo non può essere nullo."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" non è un valido valore booleano."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Questo campo non può essere omesso."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Assicurati che questo campo non abbia più di {max_length} caratteri."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Inserisci un indirizzo email valido."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Questo valore non corrisponde alla sequenza richiesta."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Immetti uno \"slug\" valido che consista di lettere, numeri, underscore o trattini."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Inserisci un URL valido"
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" non è un UUID valido."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "È richiesto un numero intero valido."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Assicurati che il valore sia minore o uguale a {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Assicurati che il valore sia maggiore o uguale a {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Stringa troppo lunga."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "È richiesto un numero valido."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Assicurati che non ci siano più di {max_digits} cifre in totale."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Assicurati che non ci siano più di {max_decimal_places} cifre decimali."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Assicurati che non ci siano più di {max_whole_digits} cifre prima del separatore decimale."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "L'oggetto di tipo datetime è in un formato errato. Usa uno dei seguenti formati: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "La data è in un formato errato. Usa uno dei seguenti formati: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "L'orario ha un formato errato. Usa uno dei seguenti formati: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "La durata è in un formato errato. Usa uno dei seguenti formati: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" non è una scelta valida."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Attesa una lista di oggetti ma l'oggetto ricevuto è di tipo \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Non è stato inviato alcun file."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Il nome del file non può essere determinato."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Il file inviato è vuoto."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Pagina \"{page_number}\" non valida: {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Cursore non valido"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Collegamento non valido - Nessuna corrispondenza di URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Collegamento non valido - Corrispondenza di URL non corretta."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Collegamento non valido - L'oggetto non esiste."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "L'oggetto con {slug_name}={value} non esiste."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Valore non valido."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Dati non validi. Era atteso un dizionario, ma si è ricevuto {datatype}."
@@ -333,18 +364,22 @@ msgid "This field must be unique."
msgstr "Questo campo deve essere unico."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "I campi {field_names} devono costituire un insieme unico."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Questo campo deve essere unico per la data \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Questo campo deve essere unico per il mese \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"."
@@ -364,6 +399,6 @@ msgstr "Versione non valida nel nome dell'host."
msgid "Invalid version in query parameter."
msgstr "Versione non valida nel parametro della query."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Permesso negato."
diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..9f92c5652
Binary files /dev/null and b/rest_framework/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po
new file mode 100644
index 000000000..c8148e269
--- /dev/null
+++ b/rest_framework/locale/ja/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
+"Language-Team: Japanese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr "不正な基本ヘッダです。認証情報が含まれていません。"
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。"
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。"
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr "ユーザ名かパスワードが違います。"
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr "ユーザが無効か削除されています。"
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr "不正なトークンヘッダです。認証情報が含まれていません。"
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。"
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。"
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr "不正なトークンです。"
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "ユーザアカウントが無効化されています。"
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "提供された認証情報でログインできません。"
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "\"username\"と\"password\"を含まなければなりません。"
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr "サーバエラーが発生しました。"
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr "不正な形式のリクエストです。"
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr "認証情報が正しくありません。"
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr "認証情報が含まれていません。"
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr "このアクションを実行する権限がありません。"
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr "見つかりませんでした。"
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr "メソッド \"{method}\" は許されていません。"
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr "リクエストのAcceptヘッダを満たすことができませんでした。"
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr "リクエストのメディアタイプ \"{media_type}\" はサポートされていません。"
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr "リクエストの処理は絞られました。"
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr "この項目は必須です。"
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr "この項目はnullにできません。"
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr "\"{input}\" は有効なブーリアンではありません。"
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr "この項目は空にできません。"
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr "この項目が{max_length}文字より長くならないようにしてください。"
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr "この項目は少なくとも{min_length}文字以上にしてください。"
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr "有効なメールアドレスを入力してください。"
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr "この値は所要のパターンにマッチしません。"
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr "文字、数字、アンダースコア、またはハイフンから成る有効な \"slug\" を入力してください。"
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr "有効なURLを入力してください。"
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr "\"{value}\" は有効なUUIDではありません。"
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "有効なIPv4またはIPv6アドレスを入力してください。"
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr "有効な整数を入力してください。"
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr "この値は{max_value}以下にしてください。"
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr "この値は{min_value}以上にしてください。"
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr "文字列が長過ぎます。"
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr "有効な数値を入力してください。"
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr "合計で最大{max_digits}桁以下になるようにしてください。"
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr "小数点以下の桁数を{max_decimal_places}を超えないようにしてください。"
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr "整数部の桁数を{max_whole_digits}を超えないようにしてください。"
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr "日時の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr "日付ではなく日時を入力してください。"
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr "日時ではなく日付を入力してください。"
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。"
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr "\"{input}\"は有効な選択肢ではありません。"
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。"
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr "空でない項目を選択してください。"
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr "\"{input}\"は有効なパスの選択肢ではありません。"
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr "ファイルが添付されていません。"
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。"
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr "ファイル名が取得できませんでした。"
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr "添付ファイルの中身が空でした。"
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。"
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。"
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr "リストは空ではいけません。"
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。"
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr "ページ番号 \"{page_number}\" は不正です: {message}。"
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr "カーソルが不正です。"
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。"
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。"
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr "ハイパーリンクが不正です - URLにマッチしません。"
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr "ハイパーリンクが不正です - 不正なURLにマッチします。"
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr "ハイパーリンクが不正です - リンク先が存在しません。"
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。"
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr "{slug_name}={value} のデータが存在しません。"
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr "不正な値です。"
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr "不正なデータです。{datatype} 型ではなく辞書を入力してください。"
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr "なし"
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr "選択する項目がありません。"
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr "この項目は一意でなければなりません。"
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr "項目 {field_names} は一意な組でなければなりません。"
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr "この項目は \"{date_field}\" の日に対して一意でなければなりません。"
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr "この項目は \"{date_field}\" の月に対して一意でなければなりません。"
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr "この項目は \"{date_field}\" の年に対して一意でなければなりません。"
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr "\"Accept\" 内のバージョンが不正です。"
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr "URLパス内のバージョンが不正です。"
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr "ホスト名内のバージョンが不正です。"
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr "クエリパラメータ内のバージョンが不正です。"
+
+#: views.py:88
+msgid "Permission denied."
+msgstr "権限がありません。"
diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo
index 59699a217..8e97250aa 100644
Binary files a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo and b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
index 720db8695..87388145d 100644
--- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "아이디/비밀번호가 유효하지 않습니다."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "계정이 중지되었거나 삭제되었습니다."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "토큰이 유효하지 않습니다."
@@ -87,11 +87,12 @@ msgstr "자격 인증데이터(authentication credentials)가 제공되지 않
msgid "You do not have permission to perform this action."
msgstr "이 작업을 "
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "찾을 수 없습니다."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Accept header 요청을 만족할 수 없습니다."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다."
@@ -107,209 +109,238 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니
msgid "Request was throttled."
msgstr "요청이 지연(throttled)되었습니다."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "이 항목을 채워주십시오."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "이 칸은 null일 수 없습니다."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "이 칸은 blank일 수 없습니다."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "유효한 이메일 주소를 입력하십시오."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "형식에 맞지 않는 값입니다."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "유효한 URL을 입력하십시오."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\"가 유효하지 않은 UUID 입니다."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "유효한 IPv4 또는 IPv6 주소를 입력하십시오."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "유효한 정수(integer)를 넣어주세요."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "문자열 값이 너무 큽니다."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "유효한 숫자를 넣어주세요."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "소수점 자릿수가 {max_decimal_places} 이하인지 확인하십시오."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "예상된 datatime 대신 date를 받았습니다."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "예상된 date 대신 datetime을 받았습니다."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "파일이 제출되지 않았습니다."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "파일명을 알 수 없습니다."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "제출된 파일이 비어있습니다."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "유효하지 않은 page \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "커서(cursor)가 유효하지 않습니다."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "유효하지 않은 하이퍼링크 - 일치하는 URL이 없습니다."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "유효하지 않은 하이퍼링크 - URL이 일치하지 않습니다."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "{slug_name}={value} 객체가 존재하지 않습니다."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "값이 유효하지 않습니다."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "이 칸은 반드시 고유해야 합니다."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -361,6 +396,6 @@ msgstr "hostname내 버전이 유효하지 않습니다."
msgid "Invalid version in query parameter."
msgstr "쿼리 파라메터내 버전이 유효하지 않습니다."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo
index f934c65c6..a788d7fe4 100644
Binary files a/rest_framework/locale/mk/LC_MESSAGES/django.mo and b/rest_framework/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po
index e03207335..b6655f58c 100644
--- a/rest_framework/locale/mk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/mk/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Macedonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Невалиден основен header. Не се внесени податоци за автентикација."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Невалидно корисничко име/лозинка."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Корисникот е деактивиран или избришан."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Невалиден токен header. Не се внесени податоци за најава."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Невалиден токен во header. Токенот не треба да содржи празни места."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Невалиден токен."
@@ -87,11 +87,12 @@ msgstr "Не се внесени податоци за најава."
msgid "You do not have permission to perform this action."
msgstr "Немате дозвола да го сторите ова."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Не е пронајдено ништо."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Методата \"{method}\" не е дозволена."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Не може да се исполни барањето на Accept header-от."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Media типот „{media_type}“ не е поддржан."
@@ -107,209 +109,238 @@ msgstr "Media типот „{media_type}“ не е поддржан."
msgid "Request was throttled."
msgstr "Request-от е забранет заради ограничувања."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Ова поле е задолжително."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Ова поле не смее да биде недефинирано."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" не е валиден boolean."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Ова поле не смее да биде празно."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Ова поле не смее да има повеќе од {max_length} знаци."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Ова поле мора да има барем {min_length} знаци."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Внесете валидна email адреса."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Ова поле не е по правилната шема/барање."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Внесете валиден URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Задолжителен е валиден цел број."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Вредноста треба да биде помала или еднаква на {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Вредноста треба да биде поголема или еднаква на {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Вредноста е преголема."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Задолжителен е валиден број."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Не смее да има повеќе од {max_digits} цифри вкупно."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Не смее да има повеќе од {max_decimal_places} децимални места."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Очекувано беше дата и време, а внесено беше само дата."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Датата е со погрешен формат. Користете го овој формат: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Очекувана беше дата, а внесени беа и дата и време."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Времето е со погрешен формат. Користете го овој формат: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "„{input}“ не е валиден избор."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Очекувана беше листа, а внесено беше „{input_type}“."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Ниеден фајл не е качен (upload-иран)."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Не може да се открие име на фајлот."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Качениот (upload-иран) фајл е празен."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Невалидна страна „{page_number}“: {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Невалиден pk „{pk_value}“ - објектот не постои."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Невалиден хиперлинк - не е внесен URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Невалиден хиперлинк - внесен е неправилен URL."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Невалиден хиперлинк - Објектот не постои."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Објектот со {slug_name}={value} не постои."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Невалидна вредност."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Ова поле мора да биде уникатно."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Полињата {field_names} заедно мора да формираат уникатен збир."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината."
@@ -361,6 +396,6 @@ msgstr "Невалидна верзија во hostname-от."
msgid "Invalid version in query parameter."
msgstr "Невалидна верзија во query параметарот."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo
index 968e11e9f..8bf83c644 100644
Binary files a/rest_framework/locale/nb/LC_MESSAGES/django.mo and b/rest_framework/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.po b/rest_framework/locale/nb/LC_MESSAGES/django.po
index bada69e64..6462590d2 100644
--- a/rest_framework/locale/nb/LC_MESSAGES/django.po
+++ b/rest_framework/locale/nb/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo
index c5546beda..aedfef2c5 100644
Binary files a/rest_framework/locale/nl/LC_MESSAGES/django.mo and b/rest_framework/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po
index f11859920..11d2c080e 100644
--- a/rest_framework/locale/nl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/nl/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Dutch (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Ongeldige basic header. Geen login gegevens opgegeven."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Ongeldige basic header. login gegevens kunnen geen spaties bevatten."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Ongeldige basic header. login gegevens zijn niet correct base64 versleuteld."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Ongeldige gebruikersnaam/wachtwoord."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Gebruiker inactief of verwijderd."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Ongeldige token header. Geen login gegevens opgegeven"
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Ongeldige token header. Token kan geen spaties bevatten."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Ongeldige token."
@@ -87,11 +87,12 @@ msgstr "Authenticatie gegevens zijn niet opgegeven."
msgid "You do not have permission to perform this action."
msgstr "Je hebt geen toegang om deze actie uit te voeren."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Niet gevonden."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Methode \"{method}\" niet toegestaan."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Kan niet voldoen aan de opgegeven \"Accept\" header."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Ongeldig media type \"{media_type}\" in aanvraag."
@@ -107,209 +109,238 @@ msgstr "Ongeldig media type \"{media_type}\" in aanvraag."
msgid "Request was throttled."
msgstr "Aanvraag was verstikt."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Dit veld is verplicht."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Dit veld mag niet leeg zijn."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" is een ongeldige boolean waarde."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Dit veld mag niet leeg zijn."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Zorg ervoor dat dit veld niet meer dan {max_length} karakters bevat."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Zorg ervoor dat dit veld minimaal {min_length} karakters bevat."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Voer een geldig e-mailadres in."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Deze waarde voldoet niet aan het benodigde formaat."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Voer een geldige \"slug\" in bestaande uit letters, cijfers, underscore of streepjes."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Voer een geldige URL in."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" in een ongeldige UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Een geldig getal is vereist."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Zorg ervoor dat deze waarde minder of gelijk is aan {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Zorg ervoor dat deze waarde groter of gelijk is aan {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Tekstuele waarde is te lang."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Een geldig nummer is verplicht."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Zorg ervoor dat er niet meer dan {max_digits} getallen zijn in totaal."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "zorg ervoor dat er niet meer dan {max_decimal_places} getallen achter de komma zijn."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} getallen voor de komma zijn."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datetime heeft een ongeldig formaat, gebruik 1 van de volgende formaten: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Verwacht een datetime, in plaats kreeg een date."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Date heeft het verkeerde formaat, gebruik 1 van de onderstaande formaten: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Verwacht een date, in plaats kreeg een datetime"
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Time heeft het verkeerde formaat, gebruik 1 van onderstaande formaten: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Tijdsduur heeft een verkeerd formaat, gebruik 1 van onderstaande formaten: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" is een ongeldige keuze."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Verwacht een lijst met items, kreeg een type \"{input_type}\" in plaats."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Er is geen bestand opgestuurd"
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "De verstuurde data was geen bestand. Controleer de encoding type op het formulier."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Bestandsnaam kan niet vastgesteld worden."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Het verstuurde bestand is leeg."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Zorg ervoor dat deze bestandsnaam minstens {max_length} karakters heeft (momenteel {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of mogelijk corrupt geraakt,"
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Verwacht een dictionary van items, in plaats kreeg een type \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Ongeldige pagina \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Ongeldige cursor."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Ongeldig type. Verwacht een pk waarde, ontving {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Ongeldige hyperlink - Geen overeenkomende URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Ongeldige hyperlink - Ongeldige URL"
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Ongeldige hyperlink - Object bestaat niet."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Object met {slug_name}={value} bestaat niet."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Ongeldige waarde."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Ongeldige data. Verwacht een dictionary, kreeg een {datatype}."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Dit veld moet uniek zijn."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "De velden {field_names} moeten een unieke set zijn."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" datum."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" maand."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year."
@@ -361,6 +396,6 @@ msgstr "Ongeldige versie in host naam."
msgid "Invalid version in query parameter."
msgstr "Ongeldige versie in query parameter."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Toegang niet toegestaan."
diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo
index c23926d26..90b5b93d7 100644
Binary files a/rest_framework/locale/pl/LC_MESSAGES/django.mo and b/rest_framework/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po
index 482b34c49..c9b3798cc 100644
--- a/rest_framework/locale/pl/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pl/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +20,40 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Niepoprawny podstawowy nagłówek. Ciąg znaków danych uwierzytelniających nie powinien zawierać spacji."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Użytkownik nieaktywny lub usunięty."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Niepoprawny nagłówek tokena. Token nie może zawierać odstępów."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Niepoprawny token."
@@ -89,11 +89,12 @@ msgstr "Nie podano danych uwierzytelniających."
msgid "You do not have permission to perform this action."
msgstr "Nie masz uprawnień, by wykonać tę czynność."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Nie znaleziono."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Niedozwolona metoda \"{method}\"."
@@ -102,6 +103,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Nie można zaspokoić nagłówka Accept żądania."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
@@ -109,209 +111,238 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
msgid "Request was throttled."
msgstr "Żądanie zostało zdławione."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "To pole jest wymagane."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Pole nie może mieć wartości null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" nie jest poprawną wartością logiczną."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "To pole nie może być puste."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Upewnij się, że to pole ma nie więcej niż {max_length} znaków."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Podaj poprawny adres e-mail."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Ta wartość nie pasuje do wymaganego wzorca."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Wprowadź poprawną wartość pola typu \"slug\", składającą się ze znaków łacińskich, cyfr, podkreślenia lub myślnika."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Wprowadź poprawny adres URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" nie jest poprawnym UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Wymagana poprawna liczba całkowita."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Upewnij się, że ta wartość jest mniejsza lub równa {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Upewnij się, że ta wartość jest większa lub równa {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Za długi ciąg znaków."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Wymagana poprawna liczba."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Upewnij się, że liczba ma nie więcej niż {max_digits} cyfr."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Upewnij się, że liczba ma nie więcej niż {max_decimal_places} cyfr dziesiętnych."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Upewnij się, że liczba ma nie więcej niż {max_whole_digits} cyfr całkowitych."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Wartość daty z czasem ma zły format. Użyj jednego z dostępnych formatów: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Oczekiwano datę z czasem, otrzymano tylko datę."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Data ma zły format. Użyj jednego z tych formatów: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Oczekiwano daty a otrzymano datę z czasem."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Błędny format czasu. Użyj jednego z dostępnych formatów: {format}"
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Czas trwania ma zły format. Użyj w zamian jednego z tych formatów: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" nie jest poprawnym wyborem."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Nie przesłano pliku."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Przesłane dane nie były plikiem. Sprawdź typ kodowania formatki."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Nie można określić nazwy pliku."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Przesłany plik jest pusty."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Upewnij się, że nazwa pliku ma długość co najwyżej {max_length} znaków (aktualnie ma {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafiką lub jest uszkodzony."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Oczekiwano słownika, ale otrzymano \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Niepoprawna strona \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Niepoprawny wskaźnik"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Błędny klucz główny \"{pk_value}\" - obiekt nie istnieje."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Błędny typ danych. Oczekiwano wartość klucza głównego, otrzymano {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Błędny hyperlink - nie znaleziono pasującego adresu URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Błędny hyperlink - błędne dopasowanie adresu URL."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Błędny hyperlink - obiekt nie istnieje."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Błędny typ danych. Oczekiwano adresu URL, otrzymano {data_type}"
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Obiekt z polem {slug_name}={value} nie istnieje"
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Niepoprawna wartość."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano {datatype}."
@@ -332,18 +363,22 @@ msgid "This field must be unique."
msgstr "Wartość dla tego pola musi być unikalna."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Pola {field_names} muszą tworzyć unikalny zestaw."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "To pole musi mieć unikalną wartość dla jednej daty z pola \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "To pole musi mieć unikalną wartość dla konkretnego miesiąca z pola \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{date_field}\"."
@@ -363,6 +398,6 @@ msgstr "Błędna wersja w nazwie hosta."
msgid "Invalid version in query parameter."
msgstr "Błędna wersja w parametrach zapytania."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Brak uprawnień."
diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo
index b7c95f60a..84ad8acc7 100644
Binary files a/rest_framework/locale/pt/LC_MESSAGES/django.mo and b/rest_framework/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po
index 4e1399619..213d0fdc9 100644
--- a/rest_framework/locale/pt/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Portuguese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo
index a977651fd..fc203d9bb 100644
Binary files a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo and b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
index f3080b9ff..7fdefbd5c 100644
--- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po
@@ -4,14 +4,16 @@
#
# Translators:
# Craig Blaszczyk , 2015
+# Ederson Mota Pereira , 2015
# Filipe Rinaldi , 2015
+# Hugo Leonardo Chalhoub Mendonça , 2015
msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,46 +21,46 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Cabeçalho básico inválido. Credenciais não fornecidas."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
-msgstr "Usário ou senha inválido."
+msgstr "Usuário ou senha inválido."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Usuário inativo ou removido."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Cabeçalho de token inválido. Credenciais não fornecidas."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
-msgstr ""
+msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Token inválido."
#: authtoken/serializers.py:20
msgid "User account is disabled."
-msgstr "Conta de usário desabilitada."
+msgstr "Conta de usuário desabilitada."
#: authtoken/serializers.py:23
msgid "Unable to log in with provided credentials."
@@ -86,13 +88,14 @@ msgstr "As credenciais de autenticação não foram fornecidas."
#: exceptions.py:99
msgid "You do not have permission to perform this action."
-msgstr "Você não tem persmissao para executar essa ação."
+msgstr "Você não tem permissão para executar essa ação."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Não encontrado."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Método \"{method}\" não é permitido."
@@ -101,218 +104,248 @@ msgid "Could not satisfy the request Accept header."
msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
-msgstr "Media type \"{media_type}\" no pedido não é suportado."
+msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado."
#: exceptions.py:145
msgid "Request was throttled."
msgstr "Pedido foi limitado."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Este campo é obrigatório."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Este campo não pode ser nulo."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" não é um valor boleano válido."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Este campo não pode ser em branco."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Certifique-se de que este campo tenha mais de {min_length} caracteres."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Insira um endereço de email válido."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Este valor não corresponde ao padrão exigido."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Entrar um \"slug\" válido que consista de letras, números, sublinhados ou hífens."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Entrar um URL válido."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
-msgstr "\"{value}\" não é um UUID valid."
+msgstr "\"{value}\" não é um UUID válido."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Informe um endereço IPv4 ou IPv6 válido."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Um número inteiro válido é exigido."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Certifique-se de que este valor seja inferior ou igual a {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Certifque-se de que este valor seja maior ou igual a {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Valor da string é muito grande."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Um número válido é necessário."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Certifique-se de que não haja mais de {max_digits} dígitos no total."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Certifique-se de que não haja mais de {max_decimal_places} casas decimais."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Certifique-se de que não haja mais de {max_whole_digits} dígitos antes do ponto decimal."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
-msgstr "Data e hora são necessários mas apenas data foi encontrada."
+msgstr "Necessário uma data e hora mas recebeu uma data."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Necessário uma data mas recebeu uma data e hora."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
-msgstr "Tempo tem formato errado. Usa um desses em vez disso: {format}."
+msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
-msgstr ""
+msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" não é um escolha válido."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
-msgstr ""
+msgstr "Esta seleção não pode estar vazia."
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
-msgstr ""
+msgstr "\"{input}\" não é uma escolha válida para um caminho."
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
-msgstr "Ficheiro não foi submetido."
+msgstr "Nenhum arquivo foi submetido."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
-msgstr "Os dados submetidos nao foram um ficheiro. Certifique-se do tipo de codificação no formulário."
+msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Nome do arquivo não pode ser determinado."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
-msgstr "O arquivo submetido ésta vázio."
+msgstr "O arquivo submetido está vázio."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
-msgstr "Certifique-se de que o nome do ficheiro tem menos de {max_length} caracteres (tem {length})."
+msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
-msgstr "Fazer upload de um imagem válido. O arquivo mandou não foi um imagem ou foi corrupto."
+msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
-msgstr ""
+msgstr "Esta lista não pode estar vazia."
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr "Esperou um dicionário de itens mas recebeu tipo \"{input_type}\"."
+msgstr "Esperado um dicionário de itens mas recebeu tipo \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
-msgstr "Página inválido \"{page_number}\": {message}."
+msgstr "Página inválida \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
-msgstr "Cursor invalído"
+msgstr "Cursor inválido"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Pk inválido \"{pk_value}\" - objeto não existe."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr "Tipo incorreto. Necessário valor pk, recebeu {data_type}."
+msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
-msgstr "Hyperlink inválido - URL não combinou."
+msgstr "Hyperlink inválido - Sem combinação para a URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
-msgstr "Hyperlink inválido - URL combinou errado."
+msgstr "Hyperlink inválido - Combinação URL incorreta."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
-msgstr "Hyperlink inválido - objeto não existe."
+msgstr "Hyperlink inválido - Objeto não existe."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objeto com {slug_name}={value} não existe."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Valor inválido."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
-msgstr "Data inválido. Necessário um dicionário mas recebeu {datatype}."
+msgstr "Dado inválido. Necessário um dicionário mas recebeu {datatype}."
#: templates/rest_framework/horizontal/radio.html:2
#: templates/rest_framework/inline/radio.html:2
@@ -324,44 +357,48 @@ msgstr "Nenhum(a/as)"
#: templates/rest_framework/inline/select_multiple.html:2
#: templates/rest_framework/vertical/select_multiple.html:2
msgid "No items to select."
-msgstr "Nenhum itens para escholher."
+msgstr "Nenhum item para escholher."
#: validators.py:24
msgid "This field must be unique."
-msgstr "Esse campo deve ser unico."
+msgstr "Esse campo deve ser único."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
-msgstr "Os campos {field_names} devem criar um set unico."
+msgstr "Os campos {field_names} devem criar um set único."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
-msgstr "O campo deve ser unico pela data \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para a data."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
-msgstr "O campo deve ser unico pelo anô \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para o mês."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
-msgstr "O campo deve ser unico pela mês \"{date_field}\"."
+msgstr "O campo \"{date_field}\" deve ser único para o ano."
#: versioning.py:42
msgid "Invalid version in \"Accept\" header."
-msgstr "Versão inválido no cabeçalho \"Accept\"."
+msgstr "Versão inválida no cabeçalho \"Accept\"."
#: versioning.py:73 versioning.py:115
msgid "Invalid version in URL path."
-msgstr "Versão inválido no caminho de URL."
+msgstr "Versão inválida no caminho de URL."
#: versioning.py:144
msgid "Invalid version in hostname."
-msgstr "Versão inválido no hostname."
+msgstr "Versão inválida no hostname."
#: versioning.py:166
msgid "Invalid version in query parameter."
msgstr "Versão inválida no parâmetro de query."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
-msgstr "Permissão negado."
+msgstr "Permissão negada."
diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo
index 66b750547..18198f016 100644
Binary files a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo and b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
index 33cb7ea14..45c8fe2d3 100644
--- a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
+++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo
index e6a12ef6d..cf41cba12 100644
Binary files a/rest_framework/locale/ru/LC_MESSAGES/django.mo and b/rest_framework/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po
index a016e84e9..9a2fb7c02 100644
--- a/rest_framework/locale/ru/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ru/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Russian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +20,40 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Недопустимый заголовок. Не предоставлены учетные данные."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Недопустимые имя пользователя или пароль."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Пользователь неактивен или удален."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Недопустимый токен."
@@ -89,11 +89,12 @@ msgstr "Учетные данные не были предоставлены."
msgid "You do not have permission to perform this action."
msgstr "У вас нет прав для выполнения этой операции."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Не найдено."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Метод \"{method}\" не разрешен."
@@ -102,6 +103,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе."
@@ -109,209 +111,238 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в
msgid "Request was throttled."
msgstr "Запрос был проигнорирован."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Это поле обязательно."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Это поле не может быть null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" не является корректным булевым значением."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Это поле не может быть пустым."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Убедитесь что в этом поле не больше {max_length} символов."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Убедитесь что в этом поле как минимум {min_length} символов."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Введите корректный адрес электронной почты."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Значение не соответствует требуемому паттерну."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Введите корректный URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" не является корректным UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Требуется целочисленное значение."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Убедитесь что значение меньше или равно {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Убедитесь что значение больше или равно {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Слишком длинное значение."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Требуется численное значение."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Убедитесь что в числе не больше {max_digits} знаков."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Убедитесь что в цисле не больше {max_whole_digits} знаков в целой части."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Неправильный формат datetime. Используйте один из этих форматов: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Ожидался datetime, но был получен date."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Неправильный формат date. Используйте один из этих форматов: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Ожидался date, но был получен datetime."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" не является корректным значением."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Ожидался list со значениями, но был получен \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Не был загружен файл."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Загруженный файл не является корректным файлом. "
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Невозможно определить имя файла."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Загруженный файл пуст."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Недопустимая страница \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Не корректный курсор"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Недопустимая ссылка - нет совпадения по URL."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Недопустимая ссылка - некорректное совпадение по URL,"
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Недопустимая ссылка - объект не существует."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Некорректный тип. Ожидался URL, получен {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Объект с {slug_name}={value} не существует."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Недопустимое значение."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}."
@@ -332,18 +363,22 @@ msgid "This field must be unique."
msgstr "Это поле должно быть уникально."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Поля {field_names} должны производить массив с уникальными значениями."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Это поле должно быть уникально для даты \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Это поле должно быть уникально для месяца \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Это поле должно быть уникально для года \"{date_field}\"."
@@ -363,6 +398,6 @@ msgstr "Недопустимая версия в имени хоста."
msgid "Invalid version in query parameter."
msgstr "Недопустимая версия в параметре запроса."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo
index 47bb7b62a..f80b9568a 100644
Binary files a/rest_framework/locale/sk/LC_MESSAGES/django.mo and b/rest_framework/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po
index 7ac9f5686..ee171b51d 100644
--- a/rest_framework/locale/sk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/sk/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Slovak (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,40 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Nesprávne prihlasovacie údaje."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Daný používateľ je neaktívny, alebo zmazaný."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Nesprávny token."
@@ -87,11 +87,12 @@ msgstr "Prihlasovacie údaje neboli zadané."
msgid "You do not have permission to perform this action."
msgstr "K danej akcii nemáte oprávnenie."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Nebolo nájdené."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Metóda \"{method}\" nie je povolená."
@@ -100,6 +101,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"."
@@ -107,209 +109,238 @@ msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"."
msgid "Request was throttled."
msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Toto pole je povinné."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Toto pole nemôže byť nulové."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" je validný boolean."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Toto pole nemože byť prázdne."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Uistite sa, že toto pole nemá viac ako {max_length} znakov."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Uistite sa, že toto pole má viac ako {min_length} znakov."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Vložte správnu emailovú adresu."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Toto pole nezodpovedá požadovanému formátu."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Zadajte platný \"slug\", ktorý obsahuje len malé písmená, čísla, spojovník alebopodtržítko."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Zadajte platnú URL adresu."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" nie je platné UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Je vyžadované celé číslo."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Uistite sa, že hodnota je menšia alebo rovná {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Uistite sa, že hodnota je väčšia alebo rovná {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Zadaný textový reťazec je príliš dlhý."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Je vyžadované číslo."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_digits} cifier."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_decimal_places} desatinných miest."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_whole_digits} cifier pred desatinnou čiarkou."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Nesprávny formát dátumu a času. Prosím použite jeden z nasledujúcich formátov: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Vložený len dátum - date namiesto dátumu a času - datetime."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Nesprávny formát dátumu. Prosím použite jeden z nasledujúcich formátov: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Nesprávny formát času. Prosím použite jeden z nasledujúcich formátov: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" je nesprávny výber z daných možností."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Bol očakávaný zoznam položiek, no namiesto toho bol nájdený \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Nebol odoslaný žiadny súbor."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Odoslané dáta neobsahujú súbor. Prosím skontrolujte kódovanie - encoding type daného formuláru."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Nebolo možné určiť meno súboru."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Odoslaný súbor je prázdny."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Uistite sa, že meno súboru neobsahuje viac ako {max_length} znakov. (V skutočnosti ich má {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Uploadujte prosím obrázok. Súbor, ktorý ste uploadovali buď nie je obrázok, alebo daný obrázok je poškodený."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Nesprávne číslo stránky \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Nesprávny kurzor."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Nesprávny primárny kľúč \"{pk_value}\" - objekt s daným primárnym kľúčom neexistuje."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Nesprávny typ. Bol prijatý {data_type} namiesto primárneho kľúča."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Nesprávny hypertextový odkaz - žiadna zhoda."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Nesprávny hypertextový odkaz - chybná URL."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Nesprávny typ {data_type}. Požadovaný typ: hypertextový odkaz."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objekt, ktorého atribút \"{slug_name}\" je \"{value}\" neexistuje."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Nesprávna hodnota."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{datatype}\"."
@@ -330,18 +361,22 @@ msgid "This field must be unique."
msgstr "Táto položka musí byť unikátna."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Dané položky: {field_names} musia tvoriť musia spolu tvoriť unikátnu množinu."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Položka musí byť pre špecifický deň \"{date_field}\" unikátna."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Položka musí byť pre mesiac \"{date_field}\" unikátna."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Položka musí byť pre rok \"{date_field}\" unikátna."
@@ -361,6 +396,6 @@ msgstr "Nesprávna verzia v \"hostname\"."
msgid "Invalid version in query parameter."
msgstr "Nesprávna verzia v parametri požiadavku."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo
index 5a5efc5f3..e2e4717ba 100644
Binary files a/rest_framework/locale/sv/LC_MESSAGES/django.mo and b/rest_framework/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.po b/rest_framework/locale/sv/LC_MESSAGES/django.po
index 159068df6..daebfb63a 100644
--- a/rest_framework/locale/sv/LC_MESSAGES/django.po
+++ b/rest_framework/locale/sv/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Swedish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Ogiltigt användarnamn/lösenord."
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Användaren borttagen eller inaktiv."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla ogiltiga tecken."
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Ogiltig \"token\"."
@@ -88,11 +88,12 @@ msgstr "Autentiseringsuppgifter ej tillhandahållna."
msgid "You do not have permission to perform this action."
msgstr "Du har inte tillåtelse att utföra denna förfrågan."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Hittades inte."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "Metoden \"{method}\" tillåts inte."
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "Medietypen \"{media_type}\" stöds inte."
@@ -108,209 +110,238 @@ msgstr "Medietypen \"{media_type}\" stöds inte."
msgid "Request was throttled."
msgstr "Förfrågan stoppades eftersom du har skickat för många."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Det här fältet är obligatoriskt."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Det här fältet får inte vara null."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" är inte ett giltigt booleskt värde."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Det här fältet får inte vara blankt."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Se till att detta fält inte har fler än {max_length} tecken."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Se till att detta fält har minst {min_length} tecken."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Ange en giltig mejladress."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Det här värdet matchar inte mallen."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Ange en giltig \"slug\" bestående av bokstäver, nummer, understreck eller bindestreck."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Ange en giltig URL."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value} är inte ett giltigt UUID."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "Ange en giltig IPv4- eller IPv6-adress."
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Ett giltigt heltal krävs."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Se till att detta värde är mindre än eller lika med {max_value}."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Se till att detta värde är större än eller lika med {min_value}."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "Textvärdet är för långt."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Ett giltigt nummer krävs."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Se till att det inte finns fler än totalt {max_digits} siffror."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Se till att det inte finns fler än {max_decimal_places} decimaler."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Se till att det inte finns fler än {max_whole_digits} siffror före decimalpunkten."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {format}."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Förväntade en datumtid men fick ett datum."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Förväntade ett datum men fick en datumtid."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "Perioden har fel format. Använd ett av dessa format istället: {format}."
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" är inte ett giltigt val."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Förväntade en lista med element men fick typen \"{input_type}\"."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Ingen fil skickades."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Inget filnamn kunde bestämmas."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Den skickade filen var tom."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Förväntade en \"dictionary\" med element men fick typen \"{input_type}\"."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Ogiltigt sida \"{page_number}\": {message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Ogiltig cursor."
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Ogiltig hyperlänk - Ingen URL matchade."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Ogiltig hyperlänk - Felaktig URL-matching."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Ogiltig hyperlänk - Objektet finns inte."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "Objekt med {slug_name}={value} finns inte."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Ogiltigt värde."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Ogiltig data. Förväntade en dictionary, men fick {datatype}."
@@ -331,18 +362,22 @@ msgid "This field must be unique."
msgstr "Det här fältet måste vara unikt."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "Fälten {field_names} måste skapa ett unikt set."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Det här fältet måste vara unikt för datumet \"{date_field}\"."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Det här fältet måste vara unikt för månaden \"{date_field}\"."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Det här fältet måste vara unikt för året \"{date_field}\"."
@@ -362,6 +397,6 @@ msgstr "Ogiltig version i värdnamnet."
msgid "Invalid version in query parameter."
msgstr "Ogiltig version i förfrågningsparametern."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Åtkomst nekad."
diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo
index fc61233fe..aa35f51c9 100644
Binary files a/rest_framework/locale/tr/LC_MESSAGES/django.mo and b/rest_framework/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po
index 5e5818a8b..30b587036 100644
--- a/rest_framework/locale/tr/LC_MESSAGES/django.po
+++ b/rest_framework/locale/tr/LC_MESSAGES/django.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,40 +23,40 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış."
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli."
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış."
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "Geçersiz kullanıcı adı/parola"
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "Kullanıcı aktif değil ya da silinmiş."
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik."
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı."
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "Geçersiz token."
@@ -92,11 +92,12 @@ msgstr "Giriş bilgileri verilmedi."
msgid "You do not have permission to perform this action."
msgstr "Bu işlemi yapmak için izniniz bulunmuyor."
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "Bulunamadı."
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "\"{method}\" metoduna izin verilmiyor."
@@ -105,6 +106,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil."
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"."
@@ -112,209 +114,238 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"."
msgid "Request was throttled."
msgstr "Üst üste çok fazla istek yapıldı."
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "Bu alan zorunlu."
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "Bu alan boş bırakılmamalı."
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "\"{input}\" geçerli bir boolean değil."
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "Bu alan boş bırakılmamalı."
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun."
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun."
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "Geçerli bir e-posta adresi girin."
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor."
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz."
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "Geçerli bir URL girin."
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "\"{value}\" geçerli bir UUID değil."
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "Geçerli bir tam sayı girin."
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun."
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun."
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "String değeri çok uzun."
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "Geçerli bir numara gerekiyor."
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun."
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun."
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun."
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın."
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "Datetime değeri bekleniyor, ama date değeri geldi."
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın."
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi."
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın."
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "\"{input}\" geçerli bir seçim değil."
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı."
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "Hiçbir dosya verilmedi."
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin."
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "Hiçbir dosya adı belirlenemedi."
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "Gönderilen dosya boş."
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)."
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk."
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı."
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "Geçersiz sayfa \"{page_number}\":{message}."
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "Sayfalandırma imleci geçersiz"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı."
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}."
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "Geçersiz bağlantı - Hiçbir URL eşleşmedi."
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "Geçersiz bağlantı - Yanlış URL eşleşmesi."
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "Geçersiz bağlantı - Obje bulunamadı."
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı."
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı."
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "Geçersiz değer."
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. "
@@ -335,18 +366,22 @@ msgid "This field must be unique."
msgstr "Bu alan eşsiz olmalı."
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar."
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı."
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı."
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı."
@@ -366,6 +401,6 @@ msgstr "Host adında geçersiz versiyon."
msgid "Invalid version in query parameter."
msgstr "Sorgu parametresinde geçersiz versiyon."
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "Erişim engellendi."
diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo
index 01777ca5c..580ae7540 100644
Binary files a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo and b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
index 5bf503dff..52e6e5072 100644
--- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo
index e981153d6..5e8e0ed5f 100644
Binary files a/rest_framework/locale/uk/LC_MESSAGES/django.mo and b/rest_framework/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po
index d369ca260..aa67fd208 100644
--- a/rest_framework/locale/uk/LC_MESSAGES/django.po
+++ b/rest_framework/locale/uk/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Ukrainian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo
index 77c8a0b9b..10a4c9b6c 100644
Binary files a/rest_framework/locale/vi/LC_MESSAGES/django.mo and b/rest_framework/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po
index c37a38c89..bbda294b1 100644
--- a/rest_framework/locale/vi/LC_MESSAGES/django.po
+++ b/rest_framework/locale/vi/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Vietnamese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,40 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr ""
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr ""
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr ""
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr ""
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr ""
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr ""
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr ""
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr ""
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr ""
@@ -86,11 +86,12 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr ""
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr ""
@@ -99,6 +100,7 @@ msgid "Could not satisfy the request Accept header."
msgstr ""
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr ""
@@ -106,209 +108,238 @@ msgstr ""
msgid "Request was throttled."
msgstr ""
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr ""
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr ""
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr ""
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr ""
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr ""
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr ""
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr ""
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr ""
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr ""
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr ""
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr ""
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr ""
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr ""
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr ""
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr ""
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr ""
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr ""
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr ""
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr ""
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr ""
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr ""
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr ""
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr ""
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr ""
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr ""
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr ""
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr ""
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr ""
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr ""
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr ""
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr ""
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr ""
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr ""
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr ""
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr ""
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr ""
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr ""
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr ""
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr ""
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr ""
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr ""
@@ -329,18 +360,22 @@ msgid "This field must be unique."
msgstr ""
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr ""
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr ""
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr ""
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr ""
@@ -360,6 +395,6 @@ msgstr ""
msgid "Invalid version in query parameter."
msgstr ""
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr ""
diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo
index 3b90a8e16..39e31b655 100644
Binary files a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
index f0a7d534c..920d70ad5 100644
--- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
+++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 13:21+0100\n"
-"PO-Revision-Date: 2015-08-06 12:21+0000\n"
-"Last-Translator: Thomas Christie \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
"Language-Team: Chinese (China) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +19,40 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: authentication.py:73
+#: authentication.py:72
msgid "Invalid basic header. No credentials provided."
msgstr "无效的Basic认证头，没有提供认证信息。"
-#: authentication.py:76
+#: authentication.py:75
msgid "Invalid basic header. Credentials string should not contain spaces."
msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。"
-#: authentication.py:82
+#: authentication.py:81
msgid "Invalid basic header. Credentials not correctly base64 encoded."
msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。"
-#: authentication.py:100
+#: authentication.py:98
msgid "Invalid username/password."
msgstr "用户名或者密码错误。"
-#: authentication.py:103 authentication.py:191
+#: authentication.py:101 authentication.py:189
msgid "User inactive or deleted."
msgstr "用户未激活或者已删除。"
-#: authentication.py:170
+#: authentication.py:168
msgid "Invalid token header. No credentials provided."
msgstr "没有提供认证信息（认证令牌HTTP头无效）。"
-#: authentication.py:173
+#: authentication.py:171
msgid "Invalid token header. Token string should not contain spaces."
msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。"
-#: authentication.py:179
+#: authentication.py:177
msgid ""
"Invalid token header. Token string should not contain invalid characters."
msgstr "无效的Token。Token字符串不能包含非法的字符。"
-#: authentication.py:188
+#: authentication.py:186
msgid "Invalid token."
msgstr "认证令牌无效。"
@@ -88,11 +88,12 @@ msgstr "身份认证信息未提供。"
msgid "You do not have permission to perform this action."
msgstr "您没有执行该操作的权限。"
-#: exceptions.py:104 views.py:79
+#: exceptions.py:104 views.py:81
msgid "Not found."
msgstr "未找到。"
#: exceptions.py:109
+#, python-brace-format
msgid "Method \"{method}\" not allowed."
msgstr "方法 “{method}” 不被允许。"
@@ -101,6 +102,7 @@ msgid "Could not satisfy the request Accept header."
msgstr "无法满足Accept HTTP头的请求。"
#: exceptions.py:132
+#, python-brace-format
msgid "Unsupported media type \"{media_type}\" in request."
msgstr "不支持请求中的媒体类型 “{media_type}”。"
@@ -108,209 +110,238 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。"
msgid "Request was throttled."
msgstr "请求超过了限速。"
-#: fields.py:167 relations.py:173 relations.py:206 validators.py:79
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
#: validators.py:162
msgid "This field is required."
msgstr "该字段是必填项。"
-#: fields.py:168
+#: fields.py:263
msgid "This field may not be null."
msgstr "该字段不能为 null。"
-#: fields.py:504 fields.py:532
+#: fields.py:599 fields.py:627
+#, python-brace-format
msgid "\"{input}\" is not a valid boolean."
msgstr "“{input}” 不是合法的布尔值。"
-#: fields.py:567
+#: fields.py:662
msgid "This field may not be blank."
msgstr "该字段不能为空。"
-#: fields.py:568 fields.py:1482
+#: fields.py:663 fields.py:1594
+#, python-brace-format
msgid "Ensure this field has no more than {max_length} characters."
msgstr "请确保这个字段不能超过 {max_length} 个字符。"
-#: fields.py:569
+#: fields.py:664
+#, python-brace-format
msgid "Ensure this field has at least {min_length} characters."
msgstr "请确保这个字段至少包含 {min_length} 个字符。"
-#: fields.py:606
+#: fields.py:701
msgid "Enter a valid email address."
msgstr "请输入合法的邮件地址。"
-#: fields.py:617
+#: fields.py:712
msgid "This value does not match the required pattern."
msgstr "输入值不匹配要求的模式。"
-#: fields.py:628
+#: fields.py:723
msgid ""
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
"hyphens."
msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。"
-#: fields.py:640
+#: fields.py:735
msgid "Enter a valid URL."
msgstr "请输入合法的URL。"
-#: fields.py:653
+#: fields.py:748
+#, python-brace-format
msgid "\"{value}\" is not a valid UUID."
msgstr "“{value}”不是合法的UUID。"
-#: fields.py:687
+#: fields.py:782
msgid "Enter a valid IPv4 or IPv6 address."
msgstr "请输入一个有效的IPv4或IPv6地址。"
-#: fields.py:712
+#: fields.py:807
msgid "A valid integer is required."
msgstr "请填写合法的整数值。"
-#: fields.py:713 fields.py:748 fields.py:781
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
msgid "Ensure this value is less than or equal to {max_value}."
msgstr "请确保该值小于或者等于 {max_value}。"
-#: fields.py:714 fields.py:749 fields.py:782
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
msgid "Ensure this value is greater than or equal to {min_value}."
msgstr "请确保该值大于或者等于 {min_value}。"
-#: fields.py:715 fields.py:750 fields.py:786
+#: fields.py:810 fields.py:845 fields.py:881
msgid "String value too large."
msgstr "字符串值太长。"
-#: fields.py:747 fields.py:780
+#: fields.py:842 fields.py:875
msgid "A valid number is required."
msgstr "请填写合法的数字。"
-#: fields.py:783
+#: fields.py:878
+#, python-brace-format
msgid "Ensure that there are no more than {max_digits} digits in total."
msgstr "请确保总计不超过 {max_digits} 个数字。"
-#: fields.py:784
+#: fields.py:879
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_decimal_places} decimal places."
msgstr "请确保总计不超过 {max_decimal_places} 个小数位。"
-#: fields.py:785
+#: fields.py:880
+#, python-brace-format
msgid ""
"Ensure that there are no more than {max_whole_digits} digits before the "
"decimal point."
msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。"
-#: fields.py:899
+#: fields.py:994
+#, python-brace-format
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
msgstr "日期时间格式错误。请从这些格式中选择：{format}。"
-#: fields.py:900
+#: fields.py:995
msgid "Expected a datetime but got a date."
msgstr "期望为日期时间，得到的是日期。"
-#: fields.py:965
+#: fields.py:1060
+#, python-brace-format
msgid "Date has wrong format. Use one of these formats instead: {format}."
msgstr "日期格式错误。请从这些格式中选择：{format}。"
-#: fields.py:966
+#: fields.py:1061
msgid "Expected a date but got a datetime."
msgstr "期望为日期，得到的是日期时间。"
-#: fields.py:1030
+#: fields.py:1125
+#, python-brace-format
msgid "Time has wrong format. Use one of these formats instead: {format}."
msgstr "时间格式错误。请从这些格式中选择：{format}。"
-#: fields.py:1085
+#: fields.py:1180
+#, python-brace-format
msgid "Duration has wrong format. Use one of these formats instead: {format}."
msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。"
-#: fields.py:1110 fields.py:1154
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
msgid "\"{input}\" is not a valid choice."
msgstr "“{input}” 不是合法选项。"
-#: fields.py:1155 fields.py:1301 relations.py:405 serializers.py:504
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
msgid "Expected a list of items but got type \"{input_type}\"."
msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。"
-#: fields.py:1156
+#: fields.py:1256
msgid "This selection may not be empty."
msgstr ""
-#: fields.py:1194
+#: fields.py:1294
+#, python-brace-format
msgid "\"{input}\" is not a valid path choice."
msgstr ""
-#: fields.py:1213
+#: fields.py:1313
msgid "No file was submitted."
msgstr "没有提交任何文件。"
-#: fields.py:1214
+#: fields.py:1314
msgid ""
"The submitted data was not a file. Check the encoding type on the form."
msgstr "提交的数据不是一个文件。请检查表单的编码类型。"
-#: fields.py:1215
+#: fields.py:1315
msgid "No filename could be determined."
msgstr "无法检测到文件名。"
-#: fields.py:1216
+#: fields.py:1316
msgid "The submitted file is empty."
msgstr "提交的是空文件。"
-#: fields.py:1217
+#: fields.py:1317
+#, python-brace-format
msgid ""
"Ensure this filename has at most {max_length} characters (it has {length})."
msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。"
-#: fields.py:1263
+#: fields.py:1363
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。"
-#: fields.py:1302 relations.py:406 serializers.py:505
+#: fields.py:1402 relations.py:424 serializers.py:505
msgid "This list may not be empty."
msgstr ""
-#: fields.py:1346
+#: fields.py:1452
+#, python-brace-format
msgid "Expected a dictionary of items but got type \"{input_type}\"."
msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。"
#: pagination.py:192
+#, python-brace-format
msgid "Invalid page \"{page_number}\": {message}."
msgstr "无效页面 “{page_number}”：{message}。"
-#: pagination.py:459
+#: pagination.py:462
msgid "Invalid cursor"
msgstr "无效游标"
-#: relations.py:174
+#: relations.py:192
+#, python-brace-format
msgid "Invalid pk \"{pk_value}\" - object does not exist."
msgstr "无效主键 “{pk_value}” － 对象不存在。"
-#: relations.py:175
+#: relations.py:193
+#, python-brace-format
msgid "Incorrect type. Expected pk value, received {data_type}."
msgstr "类型错误。期望为主键，得到的类型为 {data_type}。"
-#: relations.py:207
+#: relations.py:225
msgid "Invalid hyperlink - No URL match."
msgstr "无效超链接 －没有匹配的URL。"
-#: relations.py:208
+#: relations.py:226
msgid "Invalid hyperlink - Incorrect URL match."
msgstr "无效超链接 －错误的URL匹配。"
-#: relations.py:209
+#: relations.py:227
msgid "Invalid hyperlink - Object does not exist."
msgstr "无效超链接 －对象不存在。"
-#: relations.py:210
+#: relations.py:228
+#, python-brace-format
msgid "Incorrect type. Expected URL string, received {data_type}."
msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。"
-#: relations.py:369
+#: relations.py:387
+#, python-brace-format
msgid "Object with {slug_name}={value} does not exist."
msgstr "属性 {slug_name} 为 {value} 的对象不存在。"
-#: relations.py:370
+#: relations.py:388
msgid "Invalid value."
msgstr "无效值。"
#: serializers.py:310
+#, python-brace-format
msgid "Invalid data. Expected a dictionary, but got {datatype}."
msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。"
@@ -331,18 +362,22 @@ msgid "This field must be unique."
msgstr "该字段必须唯一。"
#: validators.py:78
+#, python-brace-format
msgid "The fields {field_names} must make a unique set."
msgstr "字段 {field_names} 必须能构成唯一集合。"
#: validators.py:226
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" date."
msgstr "该字段必须在日期 “{date_field}” 唯一。"
#: validators.py:241
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" month."
msgstr "该字段必须在月份 “{date_field}” 唯一。"
#: validators.py:254
+#, python-brace-format
msgid "This field must be unique for the \"{date_field}\" year."
msgstr "该字段必须在年 “{date_field}” 唯一。"
@@ -362,6 +397,6 @@ msgstr "主机名包含无效版本。"
msgid "Invalid version in query parameter."
msgstr "请求参数里包含无效版本。"
-#: views.py:86
+#: views.py:88
msgid "Permission denied."
msgstr "没有权限。"
diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..b82d4c1c6
Binary files /dev/null and b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..a2bfc894c
--- /dev/null
+++ b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-21 10:55+0200\n"
+"PO-Revision-Date: 2015-09-21 08:56+0000\n"
+"Last-Translator: Xavier Ordoquy \n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: authentication.py:72
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:75
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:81
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:98
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:101 authentication.py:189
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:168
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:171
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:177
+msgid ""
+"Invalid token header. Token string should not contain invalid characters."
+msgstr ""
+
+#: authentication.py:186
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:49
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:84
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:89
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:94
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:99
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:104 views.py:81
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:109
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:120
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:132
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:145
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:262 relations.py:191 relations.py:224 validators.py:79
+#: validators.py:162
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:263
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:599 fields.py:627
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:662
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:663 fields.py:1594
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:664
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:701
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:712
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:723
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:735
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:748
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:782
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: fields.py:807
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:808 fields.py:843 fields.py:876
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:809 fields.py:844 fields.py:877
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:810 fields.py:845 fields.py:881
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:842 fields.py:875
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:878
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:879
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:880
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:994
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:995
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:1060
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1061
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:1125
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1180
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1205 fields.py:1254
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1208 relations.py:58 relations.py:427
+#, python-brace-format
+msgid "More than {count} items..."
+msgstr ""
+
+#: fields.py:1255 fields.py:1401 relations.py:423 serializers.py:504
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1256
+msgid "This selection may not be empty."
+msgstr ""
+
+#: fields.py:1294
+#, python-brace-format
+msgid "\"{input}\" is not a valid path choice."
+msgstr ""
+
+#: fields.py:1313
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1314
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1315
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1316
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1317
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1363
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1402 relations.py:424 serializers.py:505
+msgid "This list may not be empty."
+msgstr ""
+
+#: fields.py:1452
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:192
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:462
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:192
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:193
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:225
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:226
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:227
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:228
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:387
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:388
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:310
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:24
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:78
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:226
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:241
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:254
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:42
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:73 versioning.py:115
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:144
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:166
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:88
+msgid "Permission denied."
+msgstr ""
diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
index 5058422f2..aba1a2013 100644
--- a/rest_framework/metadata.py
+++ b/rest_framework/metadata.py
@@ -8,12 +8,13 @@ to return this information in a more standardized way.
"""
from __future__ import unicode_literals
+from collections import OrderedDict
+
from django.core.exceptions import PermissionDenied
from django.http import Http404
from django.utils.encoding import force_text
from rest_framework import exceptions, serializers
-from rest_framework.compat import OrderedDict
from rest_framework.request import clone_request
from rest_framework.utils.field_mapping import ClassLookupDict
diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index b9263c447..2a2b6f168 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -92,9 +92,6 @@ class DefaultContentNegotiation(BaseContentNegotiation):
"""
Given the incoming request, return a tokenised list of media
type strings.
-
- Allows URL style accept override. eg. "?accept=application/json"
"""
header = request.META.get('HTTP_ACCEPT', '*/*')
- header = request.query_params.get(self.settings.URL_ACCEPT_OVERRIDE, header)
return [token.strip() for token in header.split(',')]
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index 4730623f7..3945e330c 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -6,7 +6,7 @@ be used for paginated responses.
from __future__ import unicode_literals
from base64 import b64decode, b64encode
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
from django.core.paginator import Paginator as DjangoPaginator
from django.core.paginator import InvalidPage
@@ -15,7 +15,7 @@ from django.utils import six
from django.utils.six.moves.urllib import parse as urlparse
from django.utils.translation import ugettext_lazy as _
-from rest_framework.compat import OrderedDict, deprecated
+from rest_framework.compat import deprecated
from rest_framework.exceptions import NotFound
from rest_framework.response import Response
from rest_framework.settings import api_settings
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 628538903..292952cfa 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -5,8 +5,6 @@ from __future__ import unicode_literals
from django.http import Http404
-from rest_framework.compat import get_model_name
-
SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS')
@@ -104,7 +102,7 @@ class DjangoModelPermissions(BasePermission):
"""
kwargs = {
'app_label': model_cls._meta.app_label,
- 'model_name': get_model_name(model_cls)
+ 'model_name': model_cls._meta.model_name
}
return [perm % kwargs for perm in self.perms_map[method]]
@@ -166,7 +164,7 @@ class DjangoObjectPermissions(DjangoModelPermissions):
def get_required_object_permissions(self, method, model_cls):
kwargs = {
'app_label': model_cls._meta.app_label,
- 'model_name': get_model_name(model_cls)
+ 'model_name': model_cls._meta.model_name
}
return [perm % kwargs for perm in self.perms_map[method]]
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 56af657d9..24800a758 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,6 +1,8 @@
# coding: utf-8
from __future__ import unicode_literals
+from collections import OrderedDict
+
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django.core.urlresolvers import (
NoReverseMatch, Resolver404, get_script_prefix, resolve
@@ -12,7 +14,6 @@ from django.utils.encoding import smart_text
from django.utils.six.moves.urllib import parse as urlparse
from django.utils.translation import ugettext_lazy as _
-from rest_framework.compat import OrderedDict
from rest_framework.fields import (
Field, empty, get_attribute, is_simple_callable, iter_options
)
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index fb0dfcbd8..c5b0aeb3c 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -4,7 +4,7 @@ Renderers are used to serialize a response into specific media types.
They give us a generic way of being able to handle various media types
on the response, such as JSON encoded data or HTML output.
-REST framework also provides an HTML renderer the renders the browsable API.
+REST framework also provides an HTML renderer that renders the browsable API.
"""
from __future__ import unicode_literals
@@ -420,9 +420,6 @@ class BrowsableAPIRenderer(BaseRenderer):
if method not in view.allowed_methods:
return # Not a valid method
- if not api_settings.FORM_METHOD_OVERRIDE:
- return # Cannot use form overloading
-
try:
view.check_permissions(request)
if obj is not None:
@@ -530,13 +527,6 @@ class BrowsableAPIRenderer(BaseRenderer):
instance = None
with override_method(view, request, method) as request:
- # If we're not using content overloading there's no point in
- # supplying a generic form, as the view won't treat the form's
- # value as the content of the request.
- if not (api_settings.FORM_CONTENT_OVERRIDE and
- api_settings.FORM_CONTENTTYPE_OVERRIDE):
- return None
-
# Check permissions
if not self.show_form_for_method(view, method, request, instance):
return
@@ -564,28 +554,22 @@ class BrowsableAPIRenderer(BaseRenderer):
# Generate a generic form that includes a content type field,
# and a content field.
- content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE
- content_field = api_settings.FORM_CONTENT_OVERRIDE
-
media_types = [parser.media_type for parser in view.parser_classes]
choices = [(media_type, media_type) for media_type in media_types]
initial = media_types[0]
- # NB. http://jacobian.org/writing/dynamic-form-generation/
class GenericContentForm(forms.Form):
- def __init__(self):
- super(GenericContentForm, self).__init__()
-
- self.fields[content_type_field] = forms.ChoiceField(
- label='Media type',
- choices=choices,
- initial=initial
- )
- self.fields[content_field] = forms.CharField(
- label='Content',
- widget=forms.Textarea,
- initial=content
- )
+ _content_type = forms.ChoiceField(
+ label='Media type',
+ choices=choices,
+ initial=initial,
+ widget=forms.Select(attrs={'data-override': 'content-type'})
+ )
+ _content = forms.CharField(
+ label='Content',
+ widget=forms.Textarea(attrs={'data-override': 'content'}),
+ initial=content
+ )
return GenericContentForm()
diff --git a/rest_framework/request.py b/rest_framework/request.py
index 7b583485b..76bf496ce 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -86,7 +86,7 @@ def clone_request(request, method):
ret._full_data = request._full_data
ret._content_type = request._content_type
ret._stream = request._stream
- ret._method = method
+ ret.method = method
if hasattr(request, '_user'):
ret._user = request._user
if hasattr(request, '_auth'):
@@ -129,11 +129,6 @@ class Request(object):
- authentication_classes(list/tuple). The authentications used to try
authenticating the request's user.
"""
-
- _METHOD_PARAM = api_settings.FORM_METHOD_OVERRIDE
- _CONTENT_PARAM = api_settings.FORM_CONTENT_OVERRIDE
- _CONTENTTYPE_PARAM = api_settings.FORM_CONTENTTYPE_OVERRIDE
-
def __init__(self, request, parsers=None, authenticators=None,
negotiator=None, parser_context=None):
self._request = request
@@ -144,7 +139,6 @@ class Request(object):
self._data = Empty
self._files = Empty
self._full_data = Empty
- self._method = Empty
self._content_type = Empty
self._stream = Empty
@@ -162,30 +156,10 @@ class Request(object):
def _default_negotiator(self):
return api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS()
- @property
- def method(self):
- """
- Returns the HTTP method.
-
- This allows the `method` to be overridden by using a hidden `form`
- field on a form POST request.
- """
- if not _hasattr(self, '_method'):
- self._load_method_and_content_type()
- return self._method
-
@property
def content_type(self):
- """
- Returns the content type header.
-
- This should be used instead of `request.META.get('HTTP_CONTENT_TYPE')`,
- as it allows the content type to be overridden by using a hidden form
- field on a form POST request.
- """
- if not _hasattr(self, '_content_type'):
- self._load_method_and_content_type()
- return self._content_type
+ meta = self._request.META
+ return meta.get('CONTENT_TYPE', meta.get('HTTP_CONTENT_TYPE', ''))
@property
def stream(self):
@@ -265,9 +239,6 @@ class Request(object):
"""
Parses the request content into `self.data`.
"""
- if not _hasattr(self, '_content_type'):
- self._load_method_and_content_type()
-
if not _hasattr(self, '_data'):
self._data, self._files = self._parse()
if self._files:
@@ -276,32 +247,14 @@ class Request(object):
else:
self._full_data = self._data
- def _load_method_and_content_type(self):
- """
- Sets the method and content_type, and then check if they've
- been overridden.
- """
- self._content_type = self.META.get('HTTP_CONTENT_TYPE',
- self.META.get('CONTENT_TYPE', ''))
-
- self._perform_form_overloading()
-
- if not _hasattr(self, '_method'):
- self._method = self._request.method
-
- # Allow X-HTTP-METHOD-OVERRIDE header
- if 'HTTP_X_HTTP_METHOD_OVERRIDE' in self.META:
- self._method = self.META['HTTP_X_HTTP_METHOD_OVERRIDE'].upper()
-
def _load_stream(self):
"""
Return the content body of the request, as a stream.
"""
+ meta = self._request.META
try:
content_length = int(
- self.META.get(
- 'CONTENT_LENGTH', self.META.get('HTTP_CONTENT_LENGTH')
- )
+ meta.get('CONTENT_LENGTH', meta.get('HTTP_CONTENT_LENGTH', 0))
)
except (ValueError, TypeError):
content_length = 0
@@ -313,50 +266,6 @@ class Request(object):
else:
self._stream = six.BytesIO(self.raw_post_data)
- def _perform_form_overloading(self):
- """
- If this is a form POST request, then we need to check if the method and
- content/content_type have been overridden by setting them in hidden
- form fields or not.
- """
-
- USE_FORM_OVERLOADING = (
- self._METHOD_PARAM or
- (self._CONTENT_PARAM and self._CONTENTTYPE_PARAM)
- )
-
- # We only need to use form overloading on form POST requests.
- if (
- self._request.method != 'POST' or
- not USE_FORM_OVERLOADING or
- not is_form_media_type(self._content_type)
- ):
- return
-
- # At this point we're committed to parsing the request as form data.
- self._data = self._request.POST
- self._files = self._request.FILES
- self._full_data = self._data.copy()
- self._full_data.update(self._files)
-
- # Method overloading - change the method and remove the param from the content.
- if (
- self._METHOD_PARAM and
- self._METHOD_PARAM in self._data
- ):
- self._method = self._data[self._METHOD_PARAM].upper()
-
- # Content overloading - modify the content type, and force re-parse.
- if (
- self._CONTENT_PARAM and
- self._CONTENTTYPE_PARAM and
- self._CONTENT_PARAM in self._data and
- self._CONTENTTYPE_PARAM in self._data
- ):
- self._content_type = self._data[self._CONTENTTYPE_PARAM]
- self._stream = six.BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding']))
- self._data, self._files, self._full_data = (Empty, Empty, Empty)
-
def _parse(self):
"""
Parse the request content, returning a two-tuple of (data, files)
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 3f038e3b5..0e97668eb 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -98,7 +98,7 @@ class Response(SimpleTemplateResponse):
state = super(Response, self).__getstate__()
for key in (
'accepted_renderer', 'renderer_context', 'resolver_match',
- 'client', 'request', 'wsgi_request'
+ 'client', 'request', 'json', 'wsgi_request'
):
if key in state:
del state[key]
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
index af7c5e949..5a7ba09a8 100644
--- a/rest_framework/reverse.py
+++ b/rest_framework/reverse.py
@@ -22,7 +22,6 @@ def preserve_builtin_query_params(url, request=None):
overrides = [
api_settings.URL_FORMAT_OVERRIDE,
- api_settings.URL_ACCEPT_OVERRIDE
]
for param in overrides:
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index b96100ec2..d4e9d95ed 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -16,14 +16,13 @@ For example, you might have a `urls.py` that looks something like this:
from __future__ import unicode_literals
import itertools
-from collections import namedtuple
+from collections import OrderedDict, namedtuple
from django.conf.urls import url
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import NoReverseMatch
from rest_framework import views
-from rest_framework.compat import OrderedDict
from rest_framework.response import Response
from rest_framework.reverse import reverse
from rest_framework.urlpatterns import format_suffix_patterns
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 037939e31..5aef1df69 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -12,6 +12,8 @@ response content is handled by parsers and renderers.
"""
from __future__ import unicode_literals
+import warnings
+
from django.db import models
from django.db.models.fields import Field as DjangoModelField
from django.db.models.fields import FieldDoesNotExist
@@ -19,6 +21,7 @@ from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import DurationField as ModelDurationField
+from rest_framework.compat import JSONField as ModelJSONField
from rest_framework.compat import postgres_fields, unicode_to_repr
from rest_framework.utils import model_meta
from rest_framework.utils.field_mapping import (
@@ -51,6 +54,8 @@ LIST_SERIALIZER_KWARGS = (
'instance', 'data', 'partial', 'context', 'allow_null'
)
+ALL_FIELDS = '__all__'
+
# BaseSerializer
# --------------
@@ -166,6 +171,12 @@ class BaseSerializer(Field):
"For example: 'serializer.save(owner=request.user)'.'"
)
+ assert not hasattr(self, '_data'), (
+ "You cannot call `.save()` after accessing `serializer.data`."
+ "If you need to access data before committing to the database then "
+ "inspect 'serializer.validated_data' instead. "
+ )
+
validated_data = dict(
list(self.validated_data.items()) +
list(kwargs.items())
@@ -780,6 +791,8 @@ class ModelSerializer(Serializer):
}
if ModelDurationField is not None:
serializer_field_mapping[ModelDurationField] = DurationField
+ if ModelJSONField is not None:
+ serializer_field_mapping[ModelJSONField] = JSONField
serializer_related_field = PrimaryKeyRelatedField
serializer_url_field = HyperlinkedIdentityField
serializer_choice_field = ChoiceField
@@ -791,7 +804,7 @@ class ModelSerializer(Serializer):
# you'll also need to ensure you update the `create` method on any generic
# views, to correctly handle the 'Location' response header for
# "HTTP 201 Created" responses.
- url_field_name = api_settings.URL_FIELD_NAME
+ url_field_name = None
# Default `create` and `update` behavior...
def create(self, validated_data):
@@ -874,6 +887,9 @@ class ModelSerializer(Serializer):
Return the dict of field names -> field instances that should be
used for `self.fields` when instantiating the serializer.
"""
+ if self.url_field_name is None:
+ self.url_field_name = api_settings.URL_FIELD_NAME
+
assert hasattr(self, 'Meta'), (
'Class {serializer_class} missing "Meta" attribute'.format(
serializer_class=self.__class__.__name__
@@ -948,10 +964,10 @@ class ModelSerializer(Serializer):
fields = getattr(self.Meta, 'fields', None)
exclude = getattr(self.Meta, 'exclude', None)
- if fields and not isinstance(fields, (list, tuple)):
+ if fields and fields != ALL_FIELDS and not isinstance(fields, (list, tuple)):
raise TypeError(
- 'The `fields` option must be a list or tuple. Got %s.' %
- type(fields).__name__
+ 'The `fields` option must be a list or tuple or "__all__". '
+ 'Got %s.' % type(fields).__name__
)
if exclude and not isinstance(exclude, (list, tuple)):
@@ -967,6 +983,20 @@ class ModelSerializer(Serializer):
)
)
+ if fields is None and exclude is None:
+ warnings.warn(
+ "Creating a ModelSerializer without either the 'fields' "
+ "attribute or the 'exclude' attribute is pending deprecation "
+ "since 3.3.0. Add an explicit fields = '__all__' to the "
+ "{serializer_class} serializer.".format(
+ serializer_class=self.__class__.__name__
+ ),
+ PendingDeprecationWarning
+ )
+
+ if fields == ALL_FIELDS:
+ fields = None
+
if fields is not None:
# Ensure that all declared fields have also been included in the
# `Meta.fields` option.
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index e20e51287..9d834c125 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -26,8 +26,6 @@ from django.utils import six
from rest_framework import ISO_8601
from rest_framework.compat import importlib
-USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
-
DEFAULTS = {
# Base API policies
'DEFAULT_RENDERER_CLASSES': (
@@ -93,13 +91,8 @@ DEFAULTS = {
),
'TEST_REQUEST_DEFAULT_FORMAT': 'multipart',
- # Browser enhancements
- 'FORM_METHOD_OVERRIDE': '_method',
- 'FORM_CONTENT_OVERRIDE': '_content',
- 'FORM_CONTENTTYPE_OVERRIDE': '_content_type',
- 'URL_ACCEPT_OVERRIDE': 'accept',
+ # Hyperlink settings
'URL_FORMAT_OVERRIDE': 'format',
-
'FORMAT_SUFFIX_KWARG': 'format',
'URL_FIELD_NAME': 'url',
@@ -188,10 +181,17 @@ class APISettings(object):
and return the class, rather than the string literal.
"""
def __init__(self, user_settings=None, defaults=None, import_strings=None):
- self.user_settings = user_settings or {}
+ if user_settings:
+ self._user_settings = user_settings
self.defaults = defaults or DEFAULTS
self.import_strings = import_strings or IMPORT_STRINGS
+ @property
+ def user_settings(self):
+ if not hasattr(self, '_user_settings'):
+ self._user_settings = getattr(settings, 'REST_FRAMEWORK', {})
+ return self._user_settings
+
def __getattr__(self, attr):
if attr not in self.defaults.keys():
raise AttributeError("Invalid API setting: '%s'" % attr)
@@ -212,7 +212,7 @@ class APISettings(object):
return val
-api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS)
+api_settings = APISettings(None, DEFAULTS, IMPORT_STRINGS)
def reload_api_settings(*args, **kwargs):
diff --git a/rest_framework/static/rest_framework/js/ajax-form.js b/rest_framework/static/rest_framework/js/ajax-form.js
new file mode 100644
index 000000000..db07fd8fb
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/ajax-form.js
@@ -0,0 +1,97 @@
+function replaceDocument(docString) {
+ var doc = document.open("text/html");
+ doc.write(docString);
+ doc.close();
+}
+
+
+function doAjaxSubmit(e) {
+ var form = $(this);
+ var btn = $(this.clk);
+ var method = btn.data('method') || form.data('method') || form.attr('method') || 'GET';
+ method = method.toUpperCase()
+ if (method === 'GET') {
+ // GET requests can always use standard form submits.
+ return;
+ }
+
+ var contentType =
+ form.find('input[data-override="content-type"]').val() ||
+ form.find('select[data-override="content-type"] option:selected').text();
+ if (method === 'POST' && !contentType) {
+ // POST requests can use standard form submits, unless we have
+ // overridden the content type.
+ return;
+ }
+
+ // At this point we need to make an AJAX form submission.
+ e.preventDefault();
+
+ var url = form.attr('action');
+ var data;
+ if (contentType) {
+ data = form.find('[data-override="content"]').val() || ''
+ } else {
+ contentType = form.attr('enctype') || form.attr('encoding')
+ if (contentType === 'multipart/form-data') {
+ if (!window.FormData) {
+ alert('Your browser does not support AJAX multipart form submissions');
+ return;
+ }
+ // Use the FormData API and allow the content type to be set automatically,
+ // so it includes the boundary string.
+ // See https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects
+ contentType = false;
+ data = new FormData(form[0]);
+ } else {
+ contentType = 'application/x-www-form-urlencoded; charset=UTF-8'
+ data = form.serialize();
+ }
+ }
+
+ var ret = $.ajax({
+ url: url,
+ method: method,
+ data: data,
+ contentType: contentType,
+ processData: false,
+ headers: {'Accept': 'text/html; q=1.0, */*'},
+ });
+ ret.always(function(data, textStatus, jqXHR) {
+ if (textStatus != 'success') {
+ jqXHR = data;
+ }
+ var responseContentType = jqXHR.getResponseHeader("content-type") || "";
+ if (responseContentType.toLowerCase().indexOf('text/html') === 0) {
+ replaceDocument(jqXHR.responseText);
+ try {
+ // Modify the location and scroll to top, as if after page load.
+ history.replaceState({}, '', url);
+ scroll(0,0);
+ } catch(err) {
+ // History API not supported, so redirect.
+ window.location = url;
+ }
+ } else {
+ // Not HTML content. We can't open this directly, so redirect.
+ window.location = url;
+ }
+ });
+ return ret;
+}
+
+
+function captureSubmittingElement(e) {
+ var target = e.target;
+ var form = this;
+ form.clk = target;
+}
+
+
+$.fn.ajaxForm = function() {
+ var options = {}
+ return this
+ .unbind('submit.form-plugin click.form-plugin')
+ .bind('submit.form-plugin', options, doAjaxSubmit)
+ .bind('click.form-plugin', options, captureSubmittingElement);
+};
diff --git a/rest_framework/static/rest_framework/js/csrf.js b/rest_framework/static/rest_framework/js/csrf.js
new file mode 100644
index 000000000..4e8da0de5
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/csrf.js
@@ -0,0 +1,47 @@
+function getCookie(name) {
+ var cookieValue = null;
+ if (document.cookie && document.cookie != '') {
+ var cookies = document.cookie.split(';');
+ for (var i = 0; i < cookies.length; i++) {
+ var cookie = jQuery.trim(cookies[i]);
+ // Does this cookie string begin with the name we want?
+ if (cookie.substring(0, name.length + 1) == (name + '=')) {
+ cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+ break;
+ }
+ }
+ }
+ return cookieValue;
+}
+
+function csrfSafeMethod(method) {
+ // these HTTP methods do not require CSRF protection
+ return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+}
+
+function sameOrigin(url) {
+ // test that a given url is a same-origin URL
+ // url could be relative or scheme relative or absolute
+ var host = document.location.host; // host + port
+ var protocol = document.location.protocol;
+ var sr_origin = '//' + host;
+ var origin = protocol + sr_origin;
+ // Allow absolute or scheme relative URLs to same origin
+ return (url == origin || url.slice(0, origin.length + 1) == origin + '/') ||
+ (url == sr_origin || url.slice(0, sr_origin.length + 1) == sr_origin + '/') ||
+ // or any other URL that isn't scheme relative or absolute i.e relative.
+ !(/^(\/\/|http:|https:).*/.test(url));
+}
+
+var csrftoken = getCookie('csrftoken');
+
+$.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ if (!csrfSafeMethod(settings.type) && sameOrigin(settings.url)) {
+ // Send the token to same-origin, relative URLs only.
+ // Send the token only if the method warrants CSRF protection
+ // Using the CSRFToken value acquired earlier
+ xhr.setRequestHeader("X-CSRFToken", csrftoken);
+ }
+ }
+});
diff --git a/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js b/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js
new file mode 100644
index 000000000..0f60b7bd0
--- /dev/null
+++ b/rest_framework/static/rest_framework/js/jquery-1.11.3.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+
+return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="