Merge master

.gitignore

@@ -14,3 +14,4 @@ MANIFEST
 
 !.gitignore
 !.travis.yml
+!.isort.cfg

.isort.cfg

@@ -0,0 +1,6 @@
+[settings]
+skip=.tox
+atomic=true
+multi_line_output=5
+known_third_party=pytest,django
+known_first_party=rest_framework

.travis.yml

@@ -3,7 +3,7 @@ language: python
 sudo: false
 
 env:
-    - TOX_ENV=py27-flake8
+    - TOX_ENV=py27-lint
     - TOX_ENV=py27-docs
     - TOX_ENV=py34-django18
     - TOX_ENV=py33-django18

CONTRIBUTING.md

@@ -38,7 +38,7 @@ Some tips on good issue reporting:
 
 ## Triaging issues
 
-Getting involved in triaging incoming issues is a good way to start contributing.  Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be.  Anyone can help out with this, you just need to be willing to
+Getting involved in triaging incoming issues is a good way to start contributing.  Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be.  Anyone can help out with this, you just need to be willing to:
 
 * Read through the ticket - does it make sense, is it missing any context that would help explain it better?
 * Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group?

README.md

@@ -159,7 +159,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou
 
 [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master
 [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[pypi-version]: https://pypip.in/version/djangorestframework/badge.svg
+[pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg
 [pypi]: https://pypi.python.org/pypi/djangorestframework
 [twitter]: https://twitter.com/_tomchristie
 [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework

docs/api-guide/authentication.md

@@ -247,6 +247,10 @@ Unauthenticated responses that are denied permission will result in an `HTTP 403
 
 If you're using an AJAX style API with SessionAuthentication, you'll need to make sure you include a valid CSRF token for any "unsafe" HTTP method calls, such as `PUT`, `PATCH`, `POST` or `DELETE` requests.  See the [Django CSRF documentation][csrf-ajax] for more details.
 
+**Warning**: Always use Django's standard login view when creating login pages. This will ensure your login views are properly protected.
+
+CSRF validation in REST framework works slightly differently to standard Django due to the need to support both session and non-session based authentication to the same views. This means that only authenticated requests require CSRF tokens, and anonymous requests may be sent without CSRF tokens. This behaviour is not suitable for login views, which should always have CSRF validation applied.
+
 # Custom authentication
 
 To implement a custom authentication scheme, subclass `BaseAuthentication` and override the `.authenticate(self, request)` method.  The method should return a two-tuple of `(user, auth)` if authentication succeeds, or `None` otherwise.

docs/api-guide/fields.md

@@ -20,6 +20,8 @@ Each serializer field class constructor takes at least these arguments.  Some Fi
 
 ### `read_only`
 
+Read-only fields are included in the API output, but should not be included in the input during create or update operations. Any 'read_only' fields that are incorrectly included in the serializer input will be ignored. 
+
 Set this to `True` to ensure that the field is used when serializing a representation, but is not used when creating or updating an instance during deserialization.
 
 Defaults to `False`
@@ -183,6 +185,26 @@ A field that ensures the input is a valid UUID string. The `to_internal_value` m
 
     "de305d54-75b4-431b-adb2-eb6b9e546013"
 
+**Signature:** `UUIDField(format='hex_verbose')`
+
+- `format`: Determines the representation format of the uuid value
+    - `'hex_verbose'` - The cannoncical hex representation, including hyphens: `"5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
+    - `'hex'` - The compact hex representation of the UUID, not including hyphens: `"5ce0e9a55ffa654bcee01238041fb31a"`
+    - `'int'` - A 128 bit integer representation of the UUID: `"123456789012312313134124512351145145114"`
+    - `'urn'` - RFC 4122 URN representation of the UUID: `"urn:uuid:5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
+  Changing the `format` parameters only affects representation values. All formats are accepted by `to_internal_value`
+
+## IPAddressField
+
+A field that ensures the input is a valid IPv4 or IPv6 string.
+
+Corresponds to `django.forms.fields.IPAddressField` and `django.forms.fields.GenericIPAddressField`.
+
+**Signature**: `IPAddressField(protocol='both', unpack_ipv4=False, **options)`
+
+- `protocol` Limits valid inputs to the specified protocol. Accepted values are 'both' (default), 'IPv4' or 'IPv6'. Matching is case insensitive.
+- `unpack_ipv4` Unpacks IPv4 mapped addresses like ::ffff:192.0.2.1. If this option is enabled that address would be unpacked to 192.0.2.1. Default is disabled. Can only be used when protocol is set to 'both'.
+
 ---
 
 # Numeric fields
@@ -302,6 +324,18 @@ Corresponds to `django.db.models.fields.TimeField`
 
 Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`)
 
+## DurationField
+
+A Duration representation.
+Corresponds to `django.db.models.fields.DurationField`
+
+The `validated_data` for these fields will contain a `datetime.timedelta` instance.
+The representation is a string following this format `'[DD] [HH:[MM:]]ss[.uuuuuu]'`.
+
+**Note:** This field is only available with Django versions >= 1.8.
+
+**Signature:** `DurationField()`
+
 ---
 
 # Choice selection fields

docs/api-guide/filtering.md

@@ -149,6 +149,7 @@ If all you need is simple equality-based filtering, you can set a `filter_fields
     class ProductList(generics.ListAPIView):
         queryset = Product.objects.all()
         serializer_class = ProductSerializer
+        filter_backends = (filters.DjangoFilterBackend,)
         filter_fields = ('category', 'in_stock')
 
 This will automatically create a `FilterSet` class for the given fields, and will allow you to make requests such as:
@@ -174,6 +175,7 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha
     class ProductList(generics.ListAPIView):
         queryset = Product.objects.all()
         serializer_class = ProductSerializer
+        filter_backends = (filters.DjangoFilterBackend,)
         filter_class = ProductFilter
 
 

docs/api-guide/generic-views.md

@@ -124,21 +124,24 @@ For example:
 
 Note that if your API doesn't include any object level permissions, you may optionally exclude the `self.check_object_permissions`, and simply return the object from the `get_object_or_404` lookup.
 
-#### `get_filter_backends(self)`
-
-Returns the classes that should be used to filter the queryset. Defaults to returning the `filter_backends` attribute.
-
-May be overridden to provide more complex behavior with filters, such as using different (or even exclusive) lists of filter_backends depending on different criteria.
-
-For example:
-
-    def get_filter_backends(self):
-        if "geo_route" in self.request.query_params:
-            return (GeoRouteFilter, CategoryFilter)
-        elif "geo_point" in self.request.query_params:
-            return (GeoPointFilter, CategoryFilter)
-
-        return (CategoryFilter,)
+#### `filter_queryset(self, queryset)`       
+       
+Given a queryset, filter it with whichever filter backends are in use, returning a new queryset.   
+        
+For example:       
+       
+    def filter_queryset(self, queryset):
+        filter_backends = (CategoryFilter,)
+        
+        if 'geo_route' in self.request.query_params:
+            filter_backends = (GeoRouteFilter, CategoryFilter)
+        elif 'geo_point' in self.request.query_params:
+            filter_backends = (GeoPointFilter, CategoryFilter)
+        
+        for backend in list(filter_backends):
+            queryset = backend().filter_queryset(self.request, queryset, view=self)
+        
+        return queryset
 
 #### `get_serializer_class(self)`
 
@@ -192,7 +195,7 @@ These override points are also particularly useful for adding behavior that occu
 You won't typically need to override the following methods, although you might need to call into them if you're writing custom views using `GenericAPIView`.
 
 * `get_serializer_context(self)` - Returns a dictionary containing any extra context that should be supplied to the serializer.  Defaults to including `'request'`, `'view'` and `'format'` keys.
-* `get_serializer(self, instance=None, data=None, files=None, many=False, partial=False, allow_add_remove=False)` - Returns a serializer instance.
+* `get_serializer(self, instance=None, data=None, many=False, partial=False)` - Returns a serializer instance.
 * `get_paginated_response(self, data)` - Returns a paginated style `Response` object.
 * `paginate_queryset(self, queryset)` - Paginate a queryset if required, either returning a page object, or `None` if pagination is not configured for this view.
 * `filter_queryset(self, queryset)` - Given a queryset, filter it with whichever filter backends are in use, returning a new queryset.
@@ -391,6 +394,10 @@ The following third party packages provide additional generic view implementatio
 
 The [django-rest-framework-bulk package][django-rest-framework-bulk] implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.
 
+## Django Rest Multiple Models
+
+[Django Rest Multiple Models][django-rest-multiple-models] provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request.
+
 
 [cite]: https://docs.djangoproject.com/en/dev/ref/class-based-views/#base-vs-generic-views
 [GenericAPIView]: #genericapiview
@@ -400,3 +407,6 @@ The [django-rest-framework-bulk package][django-rest-framework-bulk] implements
 [UpdateModelMixin]: #updatemodelmixin
 [DestroyModelMixin]: #destroymodelmixin
 [django-rest-framework-bulk]: https://github.com/miki725/django-rest-framework-bulk
+[django-rest-multiple-models]: https://github.com/Axiologue/DjangoRestMultipleModels
+
+

docs/api-guide/metadata.md

@@ -98,6 +98,12 @@ The following class could be used to limit the information that is returned to `
                 'description': view.get_view_description()
             }
 
+Then configure your settings to use this custom class:
+
+    REST_FRAMEWORK = {
+        'DEFAULT_METADATA_CLASS': 'myproject.apps.core.MinimalMetadata'
+    }
+
 [cite]: http://tools.ietf.org/html/rfc7231#section-4.3.7
 [no-options]: https://www.mnot.net/blog/2012/10/29/NO_OPTIONS
 [json-schema]: http://json-schema.org/

docs/api-guide/pagination.md

@@ -246,11 +246,11 @@ Let's modify the built-in `PageNumberPagination` style, so that instead of inclu
             previous_url = self.get_previous_link()
 
             if next_url is not None and previous_url is not None:
-                link = '<{next_url}; rel="next">, <{previous_url}; rel="prev">'
+                link = '<{next_url}>; rel="next", <{previous_url}>; rel="prev"'
             elif next_url is not None:
-                link = '<{next_url}; rel="next">'
+                link = '<{next_url}>; rel="next"'
             elif previous_url is not None:
-                link = '<{previous_url}; rel="prev">'
+                link = '<{previous_url}>; rel="prev"'
             else:
                 link = ''
 

docs/api-guide/parsers.md

@@ -144,17 +144,16 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa
 The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request.
 
     class PlainTextParser(BaseParser):
-    """
-    Plain text parser.
-    """
-
-    media_type = 'text/plain'
-
-    def parse(self, stream, media_type=None, parser_context=None):
         """
-        Simply return a string representing the body of the request.
+        Plain text parser.
         """
-        return stream.read()
+        media_type = 'text/plain'
+
+        def parse(self, stream, media_type=None, parser_context=None):
+            """
+            Simply return a string representing the body of the request.
+            """
+            return stream.read()
 
 ---
 

docs/api-guide/permissions.md

@@ -150,7 +150,7 @@ Similar to `DjangoModelPermissions`, but also allows unauthenticated users to ha
 
 This permission class ties into Django's standard [object permissions framework][objectpermissions] that allows per-object permissions on models.  In order to use this permission class, you'll also need to add a permission backend that supports object-level permissions, such as [django-guardian][guardian].
 
-As with `DjangoModelPermissions`, this permission must only be applied to views that have a `.queryset` property. Authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned.
+As with `DjangoModelPermissions`, this permission must only be applied to views that have a `.queryset` property or `.get_queryset()` method. Authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned.
 
 * `POST` requests require the user to have the `add` permission on the model instance.
 * `PUT` and `PATCH` requests require the user to have the `change` permission on the model instance.
@@ -190,6 +190,16 @@ If you need to test if a request is a read operation or a write operation, you s
 
 ---
 
+Custom permissions will raise a `PermissionDenied` exception if the test fails. To change the error message associated with the exception, implement a `message` attribute directly on your custom permission. Otherwise the `default_detail` attribute from `PermissionDenied` will be used.
+    
+    from rest_framework import permissions
+
+    class CustomerAccessPermission(permissions.BasePermission):
+        message = 'Adding customers not allowed.'
+        
+        def has_permission(self, request, view):
+             ...
+        
 ## Examples
 
 The following is an example of a permission class that checks the incoming request's IP address against a blacklist, and denies the request if the IP has been blacklisted.
@@ -233,10 +243,6 @@ Also note that the generic views will only check the object-level permissions fo
 
 The following third party packages are also available.
 
-## DRF Any Permissions
-
-The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to REST framework.  Instead of all specified permissions being required, only one of the given permissions has to be true in order to get access to the view.
-
 ## Composed Permissions
 
 The [Composed Permissions][composed-permissions] package provides a simple way to define complex and multi-depth (with logic operators) permission objects, using small and reusable components.

docs/api-guide/relations.md

@@ -116,6 +116,8 @@ By default this field is read-write, although you can change this behavior using
 * `queryset` - The queryset used for model instance lookups when validating the field input. Relationships must either set a queryset explicitly, or set `read_only=True`.
 * `many` - If applied to a to-many relationship, you should set this argument to `True`.
 * `allow_null` - If set to `True`, the field will accept values of `None` or the empty string for nullable relationships. Defaults to `False`.
+* `pk_field` - Set to a field to control serialization/deserialization of the primary key's value. For example, `pk_field=UUIDField(format='hex')` would serialize a UUID primary key into its compact hex representation.
+
 
 ## HyperlinkedRelatedField
 
@@ -254,17 +256,64 @@ For example, the following serializer:
 
 Would serialize to a nested representation like this:
 
+    >>> album = Album.objects.create(album_name="The Grey Album", artist='Danger Mouse')
+    >>> Track.objects.create(album=album, order=1, title='Public Service Announcement', duration=245)
+    <Track: Track object>
+    >>> Track.objects.create(album=album, order=2, title='What More Can I Say', duration=264)
+    <Track: Track object>
+    >>> Track.objects.create(album=album, order=3, title='Encore', duration=159)
+    <Track: Track object>
+    >>> serializer = AlbumSerializer(instance=album)
+    >>> serializer.data
     {
         'album_name': 'The Grey Album',
         'artist': 'Danger Mouse',
         'tracks': [
-            {'order': 1, 'title': 'Public Service Announcement'},
-            {'order': 2, 'title': 'What More Can I Say'},
-            {'order': 3, 'title': 'Encore'},
+            {'order': 1, 'title': 'Public Service Announcement', 'duration': 245},
+            {'order': 2, 'title': 'What More Can I Say', 'duration': 264},
+            {'order': 3, 'title': 'Encore', 'duration': 159},
             ...
         ],
     }
 
+# Writable nested serializers
+
+Be default nested serializers are read-only. If you want to to support write-operations to a nested serializer field you'll need to create either or both of the `create()` and/or `update()` methods, in order to explicitly specify how the child relationships should be saved.
+
+    class TrackSerializer(serializers.ModelSerializer):
+        class Meta:
+            model = Track
+            fields = ('order', 'title')
+
+    class AlbumSerializer(serializers.ModelSerializer):
+        tracks = TrackSerializer(many=True)
+
+        class Meta:
+            model = Album
+            fields = ('album_name', 'artist', 'tracks')
+
+        def create(self, validated_data):
+            tracks_data = validated_data.pop('tracks')
+            album = Album.objects.create(**validated_data)
+            for track_data in tracks_data:
+                Track.objects.create(album=album, **track_data)
+            return album
+
+    >>> data = {
+        'album_name': 'The Grey Album',
+        'artist': 'Danger Mouse',
+        'tracks': [
+            {'order': 1, 'title': 'Public Service Announcement', 'duration': 245},
+            {'order': 2, 'title': 'What More Can I Say', 'duration': 264},
+            {'order': 3, 'title': 'Encore', 'duration': 159},
+        ],
+    }
+    >>> serializer = AlbumSerializer(data=data)
+    >>> serializer.is_valid()
+    True
+    >>> serializer.save()
+    <Album: Album object>
+
 # Custom relational fields
 
 To implement a custom relational field, you should override `RelatedField`, and implement the `.to_representation(self, value)` method. This method takes the target of the field as the `value` argument, and should return the representation that should be used to serialize the target. The `value` argument will typically be a model instance.

docs/api-guide/renderers.md

@@ -157,7 +157,7 @@ See also: `TemplateHTMLRenderer`
 
 Renders data returned by a serializer into an HTML form.  The output of this renderer does not include the enclosing `<form>` tags or an submit actions, as you'll probably need those to include the desired method and URL.  Also note that the `HTMLFormRenderer` does not yet support including field error messages.
 
-Note that the template used by the `HTMLFormRenderer` class, and the context submitted to it **may be subject to change**.  If you need to use this renderer class it is advised that you either make a local copy of the class and templates, or follow the release note on REST framework upgrades closely.
+**Note**: The `HTMLFormRenderer` class is intended for internal use with the browsable API. It should not be considered a fully documented or stable API. The template used by the `HTMLFormRenderer` class, and the context submitted to it **may be subject to change**.  If you need to use this renderer class it is advised that you either make a local copy of the class and templates, or follow the release note on REST framework upgrades closely.
 
 **.media_type**: `text/html`
 
@@ -181,7 +181,7 @@ Renders data into HTML for the Browsable API.  This renderer will determine whic
 
 #### Customizing BrowsableAPIRenderer
 
-By default the response content will be rendered with the highest priority renderer apart from `BrowseableAPIRenderer`.  If you need to customize this behavior, for example to use HTML as the default return format, but use JSON in the browsable API, you can do so by overriding the `get_default_renderer()` method.  For example:
+By default the response content will be rendered with the highest priority renderer apart from `BrowsableAPIRenderer`.  If you need to customize this behavior, for example to use HTML as the default return format, but use JSON in the browsable API, you can do so by overriding the `get_default_renderer()` method.  For example:
 
     class CustomBrowsableAPIRenderer(BrowsableAPIRenderer):
         def get_default_renderer(self, view):

docs/api-guide/serializers.md

@@ -565,7 +565,7 @@ Typically we would recommend *not* using inheritance on inner Meta classes, but
 
 The ModelSerializer class also exposes an API that you can override in order to alter how serializer fields are automatically determined when instantiating the serializer.
 
-Normally if a `ModelSerializer` does not generate the fields you need by default the you should either add them to the class explicitly, or simply use a regular `Serializer` class instead. However in some cases you may want to create a new base class that defines how the serializer fields are created for any given model.
+Normally if a `ModelSerializer` does not generate the fields you need by default then you should either add them to the class explicitly, or simply use a regular `Serializer` class instead. However in some cases you may want to create a new base class that defines how the serializer fields are created for any given model.
 
 ### `.serializer_field_mapping`
 

docs/api-guide/settings.md

@@ -119,6 +119,14 @@ Default: `None`
 
 #### PAGINATE_BY_PARAM
 
+---
+
+**This setting is pending deprecation.**
+
+See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style).
+
+---
+
 The name of a query parameter, which can be used by the client to override the default page size to use for pagination.  If set to `None`, clients may not override the default page size.
 
 For example, given the following settings:
@@ -136,6 +144,14 @@ Default: `None`
 
 #### MAX_PAGINATE_BY
 
+---
+
+**This setting is pending deprecation.**
+
+See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style).
+
+---
+
 The maximum page size to allow when the page size is specified by the client.  If set to `None`, then no maximum limit is applied.
 
 For example, given the following settings:
@@ -273,6 +289,8 @@ Default: `'accept'`
 
 The name of a URL parameter that may be used to override the default `Accept` header based content negotiation.
 
+If the value of this setting is `None` then URL format overloading will be disabled.
+
 Default: `'format'`
 
 ---

docs/api-guide/validators.md

@@ -204,12 +204,12 @@ A validator may be any callable that raises a `serializers.ValidationError` on f
 
 To write a class based validator, use the `__call__` method. Class based validators are useful as they allow you to parameterize and reuse behavior.
 
-    class MultipleOf:
+    class MultipleOf(object):
         def __init__(self, base):
             self.base = base
 
         def __call__(self, value):
-            if value % self.base != 0
+            if value % self.base != 0:
                 message = 'This field must be a multiple of %d.' % self.base
                 raise serializers.ValidationError(message)
 

docs/api-guide/versioning.md

@@ -3,7 +3,7 @@ source: versioning.py
 # Versioning
 
 > Versioning an interface is just a "polite" way to kill deployed clients.
-> 
+>
 > — [Roy Fielding][cite].
 
 API versioning allows you to alter behavior between different clients. REST framework provides for a number of different versioning schemes.
@@ -71,9 +71,22 @@ You can also set the versioning scheme on an individual view. Typically you won'
 The following settings keys are also used to control versioning:
 
 * `DEFAULT_VERSION`. The value that should be used for `request.version` when no versioning information is present. Defaults to `None`.
-* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Defaults to `None`.
+* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Note that the value used for the `DEFAULT_VERSION` setting is always considered to be part of the `ALLOWED_VERSIONS` set. Defaults to `None`.
 * `VERSION_PARAMETER`. The string that should used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`.
 
+You can also set your versioning class plus those three values on a per-view or a per-viewset basis by defining your own versioning scheme and using the `default_version`, `allowed_versions` and `version_param` class variables. For example, if you want to use `URLPathVersioning`:
+
+    from rest_framework.versioning import URLPathVersioning
+    from rest_framework.views import APIView
+
+    class ExampleVersioning(URLPathVersioning):
+        default_version = ...
+        allowed_versions = ...
+        version_param = ...
+
+    class ExampleView(APIVIew):
+        versioning_class = ExampleVersioning
+
 ---
 
 # API Reference
@@ -117,12 +130,12 @@ Your URL conf must include a pattern that matches the version with a `'version'`
 
     urlpatterns = [
         url(
-            r'^(?P<version>{v1,v2})/bookings/$',
+            r'^(?P<version>[v1|v2]+)/bookings/$',
             bookings_list,
             name='bookings-list'
         ),
         url(
-            r'^(?P<version>{v1,v2})/bookings/(?P<pk>[0-9]+)/$',
+            r'^(?P<version>[v1|v2]+)/bookings/(?P<pk>[0-9]+)/$',
             bookings_detail,
             name='bookings-detail'
         )

docs/api-guide/viewsets.md

@@ -27,7 +27,7 @@ Let's define a simple viewset that can be used to list or retrieve all the users
 
     class UserViewSet(viewsets.ViewSet):
         """
-        A simple ViewSet that for listing or retrieving users.
+        A simple ViewSet for listing or retrieving users.
         """
         def list(self, request):
             queryset = User.objects.all()

docs/index.md

@@ -1,10 +1,13 @@
 <p class="badges" height=20px>
-<iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
+    <iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 
-<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://www.django-rest-framework.org" data-count="none"></a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <a href="http://travis-ci.org/tomchristie/django-rest-framework?branch=master">
+        <img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="status-badge">
+    </a>
 
-<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="travis-build-image">
+    <a href="https://pypi.python.org/pypi/djangorestframework">
+        <img src="https://img.shields.io/pypi/v/djangorestframework.svg" class="status-badge">
+    </a>
 </p>
 
 ---
@@ -248,8 +251,6 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
 [mozilla]: http://www.mozilla.org/en-US/about/
 [eventbrite]: https://www.eventbrite.co.uk/about/
 [markdown]: http://pypi.python.org/pypi/Markdown/

docs/topics/3.0-announcement.md

@@ -940,7 +940,7 @@ The default JSON renderer will return float objects for un-coerced `Decimal` ins
 * The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1.
 * Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand.
 * Some of the default validation error messages were rewritten and might no longer be pre-translated. You can still [create language files with Django][django-localization] if you wish to localize them.
-* `APIException` subclasses could previously take could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
+* `APIException` subclasses could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
 
 ---
 

docs/topics/browsable-api.md

@@ -35,7 +35,7 @@ To replace the default theme, add a `bootstrap_theme` block to your `api.html` a
         <link rel="stylesheet" href="/path/to/my/bootstrap.css" type="text/css">
     {% endblock %}
 
-A suitable replacement theme can be generated using Bootstrap's [Customize Tool][bcustomize].  There are also pre-made themes available at [Bootswatch][bswatch].  To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
+Suitable pre-made replacement themes are available at [Bootswatch][bswatch].  To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
 
 You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block.  The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
 

docs/topics/project-management.md

@@ -97,9 +97,15 @@ The following template should be used for the description of the issue, and serv
     Release manager is @***.
     Pull request is #***.
 
+    During development cycle:
+
+    - [ ] Upload the new content to be translated to [transifex](http://www.django-rest-framework.org/topics/project-management/#translations).
+
+
     Checklist:
 
     - [ ] Create pull request for [release notes](https://github.com/tomchristie/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/tomchristie/django-rest-framework/milestones/***).
+    - [ ] Update the translations from [transifex](http://www.django-rest-framework.org/topics/project-management/#translations).
     - [ ] Ensure the pull request increments the version to `*.*.*` in [`restframework/__init__.py`](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/__init__.py).
     - [ ] Confirm with @tomchristie that release is finalized and ready to go.
     - [ ] Ensure that release date is included in pull request.

docs/topics/release-notes.md

@@ -40,13 +40,52 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 3.1.x series
 
+### 3.1.3
+
+**Date**: [4th June 2015][3.1.3-milestone].
+
+* Add `DurationField`. ([#2481][gh2481], [#2989][gh2989])
+* Add `format` argument to `UUIDField`. ([#2788][gh2788], [#3000][gh3000])
+* `MultipleChoiceField` empties incorrectly on a partial update using multipart/form-data ([#2993][gh2993], [#2894][gh2894])
+* Fix a bug in options related to read-only `RelatedField`. ([#2981][gh2981], [#2811][gh2811])
+* Fix nested serializers with `unique_together` relations. ([#2975][gh2975])
+* Allow unexpected values for `ChoiceField`/`MultipleChoiceField` representations. ([#2839][gh2839], [#2940][gh2940])
+* Rollback the transaction on error if `ATOMIC_REQUESTS` is set. ([#2887][gh2887], [#2034][gh2034])
+* Set the action on a view when override_method regardless of its None-ness. ([#2933][gh2933])
+* `DecimalField` accepts `2E+2` as 200 and validates decimal place correctly. ([#2948][gh2948], [#2947][gh2947])
+* Support basic authentication with custom `UserModel` that change `username`. ([#2952][gh2952])
+* `IPAddressField` improvements. ([#2747][gh2747], [#2618][gh2618], [#3008][gh3008])
+* Improve `DecimalField` for easier subclassing. ([#2695][gh2695])
+
+
+### 3.1.2
+
+**Date**: [13rd May 2015][3.1.2-milestone].
+
+* `DateField.to_representation` can handle str and empty values. ([#2656][gh2656], [#2687][gh2687], [#2869][gh2869])
+* Use default reason phrases from HTTP standard. ([#2764][gh2764], [#2763][gh2763])
+* Raise error when `ModelSerializer` used with abstract model. ([#2757][gh2757], [#2630][gh2630])
+* Handle reversal of non-API view_name in `HyperLinkedRelatedField` ([#2724][gh2724], [#2711][gh2711])
+* Dont require pk strictly for related fields. ([#2745][gh2745], [#2754][gh2754])
+* Metadata detects null boolean field type. ([#2762][gh2762])
+* Proper handling of depth in nested serializers. ([#2798][gh2798])
+* Display viewset without paginator. ([#2807][gh2807])
+* Don't check for deprecated `.model` attribute in permissions ([#2818][gh2818])
+* Restrict integer field to integers and strings. ([#2835][gh2835], [#2836][gh2836])
+* Improve `IntegerField` to use compiled decimal regex. ([#2853][gh2853])
+* Prevent empty `queryset` to raise AssertionError. ([#2862][gh2862])
+* `DjangoModelPermissions` rely on `get_queryset`. ([#2863][gh2863])
+* Check `AcceptHeaderVersioning` with content negotiation in place. ([#2868][gh2868])
+* Allow `DjangoObjectPermissions` to use views that define `get_queryset`. ([#2905][gh2905])
+
+
 ### 3.1.1
 
 **Date**: [23rd March 2015][3.1.1-milestone].
 
 * **Security fix**: Escape tab switching cookie name in browsable API.
-* Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743](gh2743))
-* Use a password input for the AuthTokenSerializer. ([#2741](gh2741))
+* Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743][gh2743])
+* Use a password input for the AuthTokenSerializer. ([#2741][gh2741])
 * Fix missing anchor closing tag after next button. ([#2691][gh2691])
 * Fix `lookup_url_kwarg` handling in viewsets. ([#2685][gh2685], [#2591][gh2591])
 * Fix problem with importing `rest_framework.views` in `apps.py` ([#2678][gh2678])
@@ -184,6 +223,8 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [3.0.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.5+Release%22
 [3.1.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.0+Release%22
 [3.1.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.1+Release%22
+[3.1.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.2+Release%22
+[3.1.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.3+Release%22
 
 <!-- 3.0.1 -->
 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -296,3 +337,48 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh2631]: https://github.com/tomchristie/django-rest-framework/issues/2631
 [gh2741]: https://github.com/tomchristie/django-rest-framework/issues/2641
 [gh2743]: https://github.com/tomchristie/django-rest-framework/issues/2643
+<!-- 3.1.2 -->
+[gh2656]: https://github.com/tomchristie/django-rest-framework/issues/2656
+[gh2687]: https://github.com/tomchristie/django-rest-framework/issues/2687
+[gh2869]: https://github.com/tomchristie/django-rest-framework/issues/2869
+[gh2764]: https://github.com/tomchristie/django-rest-framework/issues/2764
+[gh2763]: https://github.com/tomchristie/django-rest-framework/issues/2763
+[gh2757]: https://github.com/tomchristie/django-rest-framework/issues/2757
+[gh2630]: https://github.com/tomchristie/django-rest-framework/issues/2630
+[gh2724]: https://github.com/tomchristie/django-rest-framework/issues/2724
+[gh2711]: https://github.com/tomchristie/django-rest-framework/issues/2711
+[gh2745]: https://github.com/tomchristie/django-rest-framework/issues/2745
+[gh2754]: https://github.com/tomchristie/django-rest-framework/issues/2754
+[gh2762]: https://github.com/tomchristie/django-rest-framework/issues/2762
+[gh2798]: https://github.com/tomchristie/django-rest-framework/issues/2798
+[gh2807]: https://github.com/tomchristie/django-rest-framework/issues/2807
+[gh2818]: https://github.com/tomchristie/django-rest-framework/issues/2818
+[gh2835]: https://github.com/tomchristie/django-rest-framework/issues/2835
+[gh2836]: https://github.com/tomchristie/django-rest-framework/issues/2836
+[gh2853]: https://github.com/tomchristie/django-rest-framework/issues/2853
+[gh2862]: https://github.com/tomchristie/django-rest-framework/issues/2862
+[gh2863]: https://github.com/tomchristie/django-rest-framework/issues/2863
+[gh2868]: https://github.com/tomchristie/django-rest-framework/issues/2868
+[gh2905]: https://github.com/tomchristie/django-rest-framework/issues/2905
+<!-- 3.1.3 -->
+[gh2481]: https://github.com/tomchristie/django-rest-framework/issues/2481
+[gh2989]: https://github.com/tomchristie/django-rest-framework/issues/2989
+[gh2788]: https://github.com/tomchristie/django-rest-framework/issues/2788
+[gh3000]: https://github.com/tomchristie/django-rest-framework/issues/3000
+[gh2993]: https://github.com/tomchristie/django-rest-framework/issues/2993
+[gh2894]: https://github.com/tomchristie/django-rest-framework/issues/2894
+[gh2981]: https://github.com/tomchristie/django-rest-framework/issues/2981
+[gh2811]: https://github.com/tomchristie/django-rest-framework/issues/2811
+[gh2975]: https://github.com/tomchristie/django-rest-framework/issues/2975
+[gh2839]: https://github.com/tomchristie/django-rest-framework/issues/2839
+[gh2940]: https://github.com/tomchristie/django-rest-framework/issues/2940
+[gh2887]: https://github.com/tomchristie/django-rest-framework/issues/2887
+[gh2034]: https://github.com/tomchristie/django-rest-framework/issues/2034
+[gh2933]: https://github.com/tomchristie/django-rest-framework/issues/2933
+[gh2948]: https://github.com/tomchristie/django-rest-framework/issues/2948
+[gh2947]: https://github.com/tomchristie/django-rest-framework/issues/2947
+[gh2952]: https://github.com/tomchristie/django-rest-framework/issues/2952
+[gh2747]: https://github.com/tomchristie/django-rest-framework/issues/2747
+[gh2618]: https://github.com/tomchristie/django-rest-framework/issues/2618
+[gh3008]: https://github.com/tomchristie/django-rest-framework/issues/3008
+[gh2695]: https://github.com/tomchristie/django-rest-framework/issues/2695

docs/topics/rest-hypermedia-hateoas.md

@@ -32,7 +32,7 @@ REST framework also includes [serialization] and [parser]/[renderer] components
 
 ## What REST framework doesn't provide.
 
-What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope.
+What REST framework doesn't do is give you machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope.
 
 [cite]: http://vimeo.com/channels/restfest/page:2
 [dissertation]: http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm

docs/topics/third-party-resources.md

@@ -211,6 +211,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 ### Views
 
 * [djangorestframework-bulk][djangorestframework-bulk] - Implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.
+* [django-rest-multiple-models][django-rest-multiple-models] - Provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request.
 
 ### Routers
 
@@ -237,10 +238,12 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [djangorestrelationalhyperlink][djangorestrelationalhyperlink] - A hyperlinked serialiser that can can be used to alter relationships via hyperlinks, but otherwise like a hyperlink model serializer.
 * [django-rest-swagger][django-rest-swagger] - An API documentation generator for Swagger UI.
 * [django-rest-framework-proxy][django-rest-framework-proxy] - Proxy to redirect incoming request to another API server.
-* [gaiarestframework][gaiarestframework] - Utils for django-rest-framewok
+* [gaiarestframework][gaiarestframework] - Utils for django-rest-framework
 * [drf-extensions][drf-extensions] - A collection of custom extensions
 * [ember-django-adapter][ember-django-adapter] - An adapter for working with Ember.js
 * [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.
 
 ## Other Resources
 
@@ -267,6 +270,9 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [Web API performance: profiling Django REST framework][web-api-performance-profiling-django-rest-framework]
 * [API Development with Django and Django REST Framework][api-development-with-django-and-django-rest-framework]
 
+### Documentations
+* [Classy Django REST Framework][cdrf.co]
+
 [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html
 [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework
 [new-repo]: https://github.com/new
@@ -299,6 +305,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [drf-compound-fields]: https://github.com/estebistec/drf-compound-fields
 [django-extra-fields]: https://github.com/Hipo/drf-extra-fields
 [djangorestframework-bulk]: https://github.com/miki725/django-rest-framework-bulk
+[django-rest-multiple-models]: https://github.com/Axiologue/DjangoRestMultipleModels
 [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers
 [wq.db.rest]: http://wq.io/docs/about-rest
 [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack
@@ -330,3 +337,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [django-rest-auth]: https://github.com/Tivix/django-rest-auth/
 [django-versatileimagefield]: https://github.com/WGBH/django-versatileimagefield
 [django-versatileimagefield-drf-docs]:http://django-versatileimagefield.readthedocs.org/en/latest/drf_integration.html
+[cdrf.co]:http://www.cdrf.co
+[drf-tracking]: https://github.com/aschn/drf-tracking
+[django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces

docs/tutorial/1-serialization.md

@@ -89,7 +89,6 @@ We'll also need to create an initial migration for our snippet model, and sync t
 
 The first thing we need to get started on our Web API is to provide a way of serializing and deserializing the snippet instances into representations such as `json`.  We can do this by declaring serializers that work very similar to Django's forms.  Create a file in the `snippets` directory named `serializers.py` and add the following.
 
-    from django.forms import widgets
     from rest_framework import serializers
     from snippets.models import Snippet, LANGUAGE_CHOICES, STYLE_CHOICES
 

docs/tutorial/2-requests-and-responses.md

@@ -108,7 +108,7 @@ and
 
 Now update the `urls.py` file slightly, to append a set of `format_suffix_patterns` in addition to the existing URLs.
 
-    from django.conf.urls import patterns, url
+    from django.conf.urls import url
     from rest_framework.urlpatterns import format_suffix_patterns
     from snippets import views
 

docs/tutorial/quickstart.md

@@ -83,8 +83,6 @@ Rather than write multiple views we're grouping together all the common behavior
 
 We can easily break these down into individual views if we need to, but using viewsets keeps the view logic nicely organized as well as being very concise.
 
-For trivial cases you can simply set a `model` attribute on the `ViewSet` class and the serializer and queryset will be automatically generated for you.  Setting the `queryset` and/or `serializer_class` attributes gives you more explicit control of the API behaviour, and is the recommended style for most applications.
-
 ## URLs
 
 Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...

docs_theme/404.html

@@ -1,216 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
+{% extends "base.html" %}
 
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta charset="utf-8">
-  <title>Django REST framework - 404 - Page not found</title>
-  <link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
-  <link rel="canonical" href="http://www.django-rest-framework.org/404" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="Django, API, REST, 404 - Page not found">
-  <meta name="author" content="Tom Christie">
+{% block content %}
 
-  <!-- Le styles -->
-  <link href="http://www.django-rest-framework.org/css/prettify.css" rel="stylesheet">
-  <link href="http://www.django-rest-framework.org/css/bootstrap.css" rel="stylesheet">
-  <link href="http://www.django-rest-framework.org/css/bootstrap-responsive.css" rel="stylesheet">
-  <link href="http://www.django-rest-framework.org/css/default.css" rel="stylesheet">
+  <h1 id="404-page-not-found" style="text-align: center">404</h1>
+  <p style="text-align: center"><strong>Page not found</strong></p>
+  <p style="text-align: center">Try the <a href="http://www.django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
 
-  <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-
-  <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-18852272-2']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script');
-      ga.type = 'text/javascript';
-      ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0];
-      s.parentNode.insertBefore(ga, s);
-    })();
-  </script>
-</head>
-
-<body onload="prettyPrint()" class="404-page">
-
-  <div class="wrapper">
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="repo-link btn btn-primary btn-small" href="https://github.com/tomchristie/django-rest-framework/tree/master">GitHub</a>
-          <a class="repo-link btn btn-inverse btn-small disabled" href="#">Next <i class="icon-arrow-right icon-white"></i></a>
-          <a class="repo-link btn btn-inverse btn-small disabled" href="#"><i class="icon-arrow-left icon-white"></i> Previous</a>
-          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="http://www.django-rest-framework.org">Django REST framework</a>
-          <div class="nav-collapse collapse">
-            <ul class="nav">
-              <li><a href="http://www.django-rest-framework.org">Home</a></li>
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tutorial <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="http://www.django-rest-framework.org/tutorial/quickstart">Quickstart</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/1-serialization">1 - Serialization</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/2-requests-and-responses">2 - Requests and responses</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/3-class-based-views">3 - Class based views</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/4-authentication-and-permissions">4 - Authentication and permissions</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/5-relationships-and-hyperlinked-apis">5 - Relationships and hyperlinked APIs</a></li>
-                  <li><a href="http://www.django-rest-framework.org/tutorial/6-viewsets-and-routers">6 - Viewsets and routers</a></li>
-                </ul>
-              </li>
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Guide <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="http://www.django-rest-framework.org/api-guide/requests">Requests</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/responses">Responses</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/views">Views</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/generic-views">Generic views</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/viewsets">Viewsets</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/routers">Routers</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/parsers">Parsers</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/renderers">Renderers</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/filtering">Filtering</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/pagination">Pagination</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/content-negotiation">Content negotiation</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/format-suffixes">Format suffixes</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/reverse">Returning URLs</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/exceptions">Exceptions</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/status-codes">Status codes</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/testing">Testing</a></li>
-                  <li><a href="http://www.django-rest-framework.org/api-guide/settings">Settings</a></li>
-                </ul>
-              </li>
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Topics <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="http://www.django-rest-framework.org/topics/documenting-your-api">Documenting your API</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/ajax-csrf-cors">AJAX, CSRF & CORS</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/browser-enhancements">Browser enhancements</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/browsable-api">The Browsable API</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/rest-hypermedia-hateoas">REST, Hypermedia & HATEOAS</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/rest-framework-2-announcement">2.0 Announcement</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/2.2-announcement">2.2 Announcement</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/2.3-announcement">2.3 Announcement</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/release-notes">Release Notes</a></li>
-                  <li><a href="http://www.django-rest-framework.org/topics/credits">Credits</a></li>
-                </ul>
-              </li>
-            </ul>
-            <ul class="nav pull-right">
-              <!-- TODO
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Version: 2.0.0 <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Trunk</a></li>
-                  <li><a href="#">2.0.0</a></li>
-                </ul>
-              </li>
-            -->
-            </ul>
-          </div>
-          <!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="body-content">
-      <div class="container-fluid">
-        <!-- Search Modal -->
-        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h3 id="myModalLabel">Documentation search</h3>
-          </div>
-          <div class="modal-body">
-            <!-- Custom google search -->
-            <script>
-              (function() {
-                var cx = '015016005043623903336:rxraeohqk6w';
-                var gcse = document.createElement('script');
-                gcse.type = 'text/javascript';
-                gcse.async = true;
-                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-                  '//www.google.com/cse/cse.js?cx=' + cx;
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(gcse, s);
-              })();
-            </script>
-            <gcse:search></gcse:search>
-          </div>
-          <div class="modal-footer">
-            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-          </div>
-        </div>
-
-        <div class="row-fluid">
-          <div id="main-content" class="span12">
-            <h1 id="404-page-not-found" style="text-align: center">404</h1>
-            <p style="text-align: center"><strong>Page not found</strong>
-            </p>
-            <p style="text-align: center">Try the <a href="http://www.django-rest-framework.org/">homepage</a>, or <a href="#searchModal" data-toggle="modal">search the documentation</a>.</p>
-          </div>
-          <!--/span-->
-        </div>
-        <!--/row-->
-      </div>
-      <!--/.fluid-container-->
-    </div>
-    <!--/.body content-->
-
-    <div id="push"></div>
-  </div>
-  <!--/.wrapper -->
-
-  <footer class="span12">
-    <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</a>
-    </p>
-  </footer>
-
-  <!-- Le javascript
-    ================================================== -->
-  <!-- Placed at the end of the document so the pages load faster -->
-  <script src="http://www.django-rest-framework.org/js/jquery-1.8.1-min.js"></script>
-  <script src="http://www.django-rest-framework.org/js/prettify-1.0.js"></script>
-  <script src="http://www.django-rest-framework.org/js/bootstrap-2.1.1-min.js"></script>
-  <script>
-    //$('.side-nav').scrollspy()
-    var shiftWindow = function() {
-      scrollBy(0, -50)
-    };
-    if (location.hash) shiftWindow();
-    window.addEventListener("hashchange", shiftWindow);
-
-    $('.dropdown-menu').on('click touchstart', function(event) {
-      event.stopPropagation();
-    });
-
-    // Dynamically force sidenav to no higher than browser window
-    $('.side-nav').css('max-height', window.innerHeight - 130);
-
-    $(function() {
-      $(window).resize(function() {
-        $('.side-nav').css('max-height', window.innerHeight - 130);
-      });
-    });
-  </script>
-</body>
-
-</html>
+{% endblock %}

docs_theme/base.html

@@ -4,11 +4,11 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
-  <title>{{ page_title }}</title>
+  <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
   <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="canonical" href="{{ canonical_url }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="Django, API, REST, {{ current_page.title }}">
+  <meta name="description" content="Django, API, REST{% if current_page %}, {{ current_page.title }}{% endif %}">
   <meta name="author" content="Tom Christie">
 
   <!-- Le styles -->
@@ -54,37 +54,27 @@
     }
   </style>
 </head>
-<body onload="prettyPrint()" class="{% if current_page.is_homepage %}index{% endif %}-page">
+<body onload="prettyPrint()" class="{% if current_page and current_page.is_homepage %}index{% endif %}-page">
 
   <div class="wrapper">
-
     {% include "nav.html" %}
 
     <div class="body-content">
       <div class="container-fluid">
-
         <!-- Search Modal -->
-        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div id="mkdocs_search_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             <h3 id="myModalLabel">Documentation search</h3>
           </div>
 
           <div class="modal-body">
-            <!-- Custom google search -->
-            <script>
-              (function() {
-                var cx = '015016005043623903336:rxraeohqk6w';
-                var gcse = document.createElement('script');
-                gcse.type = 'text/javascript';
-                gcse.async = true;
-                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-                  '//www.google.com/cse/cse.js?cx=' + cx;
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(gcse, s);
-              })();
-            </script>
-            <gcse:search></gcse:search>
+            <form role="form">
+              <div class="form-group">
+                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
+              </div>
+            </form>
+            <div id="mkdocs-search-results"></div>
           </div>
 
           <div class="modal-footer">
@@ -93,26 +83,17 @@
         </div>
 
         <div class="row-fluid">
-
           <div class="span3">
-            <!-- TODO
-            <p style="margin-top: -12px">
-              <a class="btn btn-mini btn-primary" style="width: 60px">&laquo; previous</a>
-              <a class="btn btn-mini btn-primary" style="float: right; margin-right: 8px; width: 60px;">next &raquo;</a>
-            </p>
-          -->
             <div id="table-of-contents">
               <ul class="nav nav-list side-nav well sidebar-nav-fixed">
-
-                {% if current_page.is_homepage %}
-                    <li class="main">
-                        <a href="#">Django REST framework</a>
-                    </li>
+                {% if current_page and current_page.is_homepage %}
+                  <li class="main">
+                    <a href="#">Django REST framework</a>
+                  </li>
                 {% endif %}
 
                 {% for toc_item in toc %}
-
-                  <li class="{% if not current_page.is_homepage %}main{% endif %}">
+                  <li class="{% if current_page and not current_page.is_homepage %}main{% endif %}">
                     <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                   </li>
 
@@ -121,42 +102,38 @@
                       <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                     </li>
                   {% endfor %}
-
                 {% endfor %}
 
-                {% if current_page.is_homepage %}
-                <div class="promo">
-                  <hr/>
-                  <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
-                </div>
+                {% if current_page and current_page.is_homepage %}
+                  <div class="promo">
+                    <hr/>
+                    <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
+                  </div>
                 {% endif %}
-
               </ul>
 
             </div>
           </div>
 
           <div id="main-content" class="span9">
-            {% if meta.source %}
-              {% for filename in meta.source %}
-                <a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/{{ filename }}">
-                  <span class="label label-info">{{ filename }}</span>
-                </a>
-              {% endfor %}
-            {% endif %}
+            {% block content %}
+              {% if meta.source %}
+                {% for filename in meta.source %}
+                  <a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/{{ filename }}">
+                    <span class="label label-info">{{ filename }}</span>
+                  </a>
+                {% endfor %}
+              {% endif %}
 
-            {{ content }}
-          </div>
-          <!--/span-->
-        </div>
-        <!--/row-->
-      </div>
-      <!--/.fluid-container-->
-    </div>
-    <!--/.body content-->
+              {{ content }}
+            {% endblock %}
+
+          </div> <!--/span-->
+        </div> <!--/row-->
+      </div> <!--/.fluid-container-->
+    </div> <!--/.body content-->
     <div id="push"></div>
-  </div>
-  <!--/.wrapper -->
+  </div> <!--/.wrapper -->
 
   <footer class="span12">
     <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.</a>
@@ -169,13 +146,15 @@
   <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
   <script src="{{ base_url }}/js/prettify-1.0.js"></script>
   <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
+  <script>var base_url = '{{ base_url }}';</script>
+  <script src="{{ base_url }}/mkdocs/js/require.js"></script>
   <script src="{{ base_url }}/js/theme.js"></script>
 
   <script>
-    //$('.side-nav').scrollspy()
     var shiftWindow = function() {
       scrollBy(0, -50)
     };
+
     if (location.hash) shiftWindow();
     window.addEventListener("hashchange", shiftWindow);
 
@@ -183,12 +162,12 @@
       event.stopPropagation();
     });
 
-    // Dynamically force sidenav to no higher than browser window
-    $('.side-nav').css('max-height', window.innerHeight - 130);
+    // Dynamically force sidenav/dropdown to no higher than browser window
+    $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
 
     $(function() {
       $(window).resize(function() {
-        $('.side-nav').css('max-height', window.innerHeight - 130);
+        $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
       });
     });
   </script>

docs_theme/css/default.css

@@ -5,11 +5,12 @@ pre {
 }
 
 .dropdown .dropdown-menu {
-    display: none;
+  display: none;
+  overflow-y: scroll;
 }
 
 .dropdown.open .dropdown-menu {
-    display: block;
+  display: block;
 }
 
 @media (max-width: 480px) {
@@ -36,15 +37,8 @@ body.index-page #main-content iframe.github-star-button {
     margin-right: -15px;
 }
 
-/* Tweet button */
-body.index-page #main-content iframe.twitter-share-button {
-    float: right;
-    margin-top: -12px;
-    margin-right: 8px;
-}
-
-/* Travis CI badge */
-body.index-page #main-content img.travis-build-image {
+/* Travis CI and PyPI badge */
+body.index-page #main-content img.status-badge {
     float: right;
     margin-right: 8px;
     margin-top: -11px;
@@ -415,3 +409,7 @@ ul.sponsor {
     list-style: none;
     display: block;
 }
+
+#mkdocs_search_modal article p{
+  word-wrap: break-word;
+}

docs_theme/js/theme.js

@@ -1,5 +1,35 @@
-$(function(){
+function getSearchTerm()
+{
+    var sPageURL = window.location.search.substring(1);
+    var sURLVariables = sPageURL.split('&');
+    for (var i = 0; i < sURLVariables.length; i++)
+    {
+        var sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] == 'q')
+        {
+            return sParameterName[1];
+        }
+    }
+}
+
+$(function() {
+
+    var initialise_search = function(){
+        require.config({"baseUrl":"/mkdocs/js"});
+        require(["search",]);
+    }
+
+    var search_term = getSearchTerm();
+    if(search_term){
+        $('#mkdocs_search_modal').modal();
+    }
 
     $('pre code').parent().addClass('prettyprint well');
 
+    $(document).on("submit", "#mkdocs_search_modal form", function (e) {
+        $("#mkdocs-search-results").html("Searching...");
+        initialise_search();
+        return false;
+    });
+
 });

docs_theme/nav.html

@@ -8,7 +8,7 @@
           <a class="repo-link btn btn-inverse btn-small {% if not previous_page %}disabled{% endif %}" rel="next" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}>
             <i class="icon-arrow-left icon-white"></i> Previous
           </a>
-          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
+          <a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -19,7 +19,6 @@
             {% if include_nav %}
             <!-- Main navigation -->
             <ul class="nav navbar-nav">
-              <li {% if current_page.is_homepage %}class="active"{% endif %}><a href="/">Home</a></li>
               {% for nav_item in nav %} {% if nav_item.children %}
               <li class="dropdown{% if nav_item.active %} active{% endif %}">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>

mkdocs.yml

@@ -7,50 +7,53 @@ repo_url: https://github.com/tomchristie/django-rest-framework
 theme_dir: docs_theme
 
 pages:
- - ['index.md', 'Home']
- - ['tutorial/quickstart.md', 'Tutorial', 'Quickstart']
- - ['tutorial/1-serialization.md', 'Tutorial', '1 - Serialization']
- - ['tutorial/2-requests-and-responses.md', 'Tutorial', '2 - Requests and responses']
- - ['tutorial/3-class-based-views.md', 'Tutorial', '3 - Class based views']
- - ['tutorial/4-authentication-and-permissions.md', 'Tutorial', '4 - Authentication and permissions']
- - ['tutorial/5-relationships-and-hyperlinked-apis.md', 'Tutorial', '5 - Relationships and hyperlinked APIs']
- - ['tutorial/6-viewsets-and-routers.md', 'Tutorial', '6 - Viewsets and routers']
- - ['api-guide/requests.md', 'API Guide', 'Requests']
- - ['api-guide/responses.md', 'API Guide', 'Responses']
- - ['api-guide/views.md', 'API Guide', 'Views']
- - ['api-guide/generic-views.md', 'API Guide', 'Generic views']
- - ['api-guide/viewsets.md', 'API Guide', 'Viewsets']
- - ['api-guide/routers.md', 'API Guide', 'Routers']
- - ['api-guide/parsers.md', 'API Guide', 'Parsers']
- - ['api-guide/renderers.md', 'API Guide', 'Renderers']
- - ['api-guide/serializers.md', 'API Guide', 'Serializers']
- - ['api-guide/fields.md', 'API Guide', 'Serializer fields']
- - ['api-guide/relations.md', 'API Guide', 'Serializer relations']
- - ['api-guide/validators.md', 'API Guide', 'Validators']
- - ['api-guide/authentication.md', 'API Guide', 'Authentication']
- - ['api-guide/permissions.md', 'API Guide', 'Permissions']
- - ['api-guide/throttling.md', 'API Guide', 'Throttling']
- - ['api-guide/filtering.md', 'API Guide', 'Filtering']
- - ['api-guide/pagination.md', 'API Guide', 'Pagination']
- - ['api-guide/versioning.md', 'API Guide', 'Versioning']
- - ['api-guide/content-negotiation.md', 'API Guide', 'Content negotiation']
- - ['api-guide/metadata.md', 'API Guide', 'Metadata']
- - ['api-guide/format-suffixes.md', 'API Guide', 'Format suffixes']
- - ['api-guide/reverse.md', 'API Guide', 'Returning URLs']
- - ['api-guide/exceptions.md', 'API Guide', 'Exceptions']
- - ['api-guide/status-codes.md', 'API Guide', 'Status codes']
- - ['api-guide/testing.md', 'API Guide', 'Testing']
- - ['api-guide/settings.md', 'API Guide', 'Settings']
- - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API']
- - ['topics/internationalization.md', 'Topics', 'Internationalization']
- - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS']
- - ['topics/browser-enhancements.md', 'Topics',]
- - ['topics/browsable-api.md', 'Topics', 'The Browsable API']
- - ['topics/rest-hypermedia-hateoas.md', 'Topics', 'REST, Hypermedia & HATEOAS']
- - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources']
- - ['topics/contributing.md', 'Topics', 'Contributing to REST framework']
- - ['topics/project-management.md', 'Topics', 'Project management']
- - ['topics/3.0-announcement.md', 'Topics', '3.0 Announcement']
- - ['topics/3.1-announcement.md', 'Topics', '3.1 Announcement']
- - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement']
- - ['topics/release-notes.md', 'Topics', 'Release Notes']
+ - Home: 'index.md'
+ - Tutorial:
+    - 'Quickstart': 'tutorial/quickstart.md'
+    - '1 - Serialization': 'tutorial/1-serialization.md'
+    - '2 - Requests and responses': 'tutorial/2-requests-and-responses.md'
+    - '3 - Class based views': 'tutorial/3-class-based-views.md'
+    - '4 - Authentication and permissions': 'tutorial/4-authentication-and-permissions.md'
+    - '5 - Relationships and hyperlinked APIs': 'tutorial/5-relationships-and-hyperlinked-apis.md'
+    - '6 - Viewsets and routers': 'tutorial/6-viewsets-and-routers.md'
+ - API Guide:
+    - 'Requests': 'api-guide/requests.md'
+    - 'Responses': 'api-guide/responses.md'
+    - 'Views': 'api-guide/views.md'
+    - 'Generic views': 'api-guide/generic-views.md'
+    - 'Viewsets': 'api-guide/viewsets.md'
+    - 'Routers': 'api-guide/routers.md'
+    - 'Parsers': 'api-guide/parsers.md'
+    - 'Renderers': 'api-guide/renderers.md'
+    - 'Serializers': 'api-guide/serializers.md'
+    - 'Serializer fields': 'api-guide/fields.md'
+    - 'Serializer relations': 'api-guide/relations.md'
+    - 'Validators': 'api-guide/validators.md'
+    - 'Authentication': 'api-guide/authentication.md'
+    - 'Permissions': 'api-guide/permissions.md'
+    - 'Throttling': 'api-guide/throttling.md'
+    - 'Filtering': 'api-guide/filtering.md'
+    - 'Pagination': 'api-guide/pagination.md'
+    - 'Versioning': 'api-guide/versioning.md'
+    - 'Content negotiation': 'api-guide/content-negotiation.md'
+    - 'Metadata': 'api-guide/metadata.md'
+    - 'Format suffixes': 'api-guide/format-suffixes.md'
+    - 'Returning URLs': 'api-guide/reverse.md'
+    - 'Exceptions': 'api-guide/exceptions.md'
+    - 'Status codes': 'api-guide/status-codes.md'
+    - 'Testing': 'api-guide/testing.md'
+    - 'Settings': 'api-guide/settings.md'
+ - Topics:
+     - 'Documenting your API': 'topics/documenting-your-api.md'
+     - 'Internationalization': 'topics/internationalization.md'
+     - 'AJAX, CSRF & CORS': 'topics/ajax-csrf-cors.md'
+     - 'Browser Enhancements': 'topics/browser-enhancements.md'
+     - 'The Browsable API': 'topics/browsable-api.md'
+     - 'REST, Hypermedia & HATEOAS': 'topics/rest-hypermedia-hateoas.md'
+     - 'Third Party Resources': 'topics/third-party-resources.md'
+     - 'Contributing to REST framework': 'topics/contributing.md'
+     - 'Project management': 'topics/project-management.md'
+     - '3.0 Announcement': 'topics/3.0-announcement.md'
+     - '3.1 Announcement': 'topics/3.1-announcement.md'
+     - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md'
+     - 'Release Notes': 'topics/release-notes.md'

requirements/requirements-codestyle.txt

@@ -1,3 +1,6 @@
 # PEP8 code linting, which we run on all commits.
 flake8==2.4.0
 pep8==1.5.7
+
+# Sort and lint imports
+isort==3.9.6

requirements/requirements-documentation.txt

@@ -1,2 +1,2 @@
 # MkDocs to build our documentation.
-mkdocs==0.11.1
+mkdocs==0.13.2

requirements/requirements-optionals.txt

@@ -1,4 +1,4 @@
 # Optional packages which may be used with REST framework.
 markdown==2.5.2
-django-guardian==1.2.5
-django-filter==0.9.2
+django-guardian==1.3.0
+django-filter==0.10.0

requirements/requirements-testing.txt

@@ -1,3 +1,4 @@
 # PyTest for running the tests.
 pytest==2.6.4
 pytest-django==2.8.0
+pytest-cov==1.8.1

rest_framework/__init__.py

@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.1.1'
+__version__ = '3.1.3'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2015 Tom Christie'

rest_framework/authentication.py

@@ -2,12 +2,16 @@
 Provides various authentication policies.
 """
 from __future__ import unicode_literals
+
 import base64
+
 from django.contrib.auth import authenticate
 from django.middleware.csrf import CsrfViewMiddleware
 from django.utils.translation import ugettext_lazy as _
-from rest_framework import exceptions, HTTP_HEADER_ENCODING
+
+from rest_framework import HTTP_HEADER_ENCODING, exceptions
 from rest_framework.authtoken.models import Token
+from rest_framework.compat import get_user_model
 
 
 def get_authorization_header(request):
@@ -85,7 +89,12 @@ class BasicAuthentication(BaseAuthentication):
         """
         Authenticate the userid and password against username and password.
         """
-        user = authenticate(username=userid, password=password)
+        username_field = getattr(get_user_model(), 'USERNAME_FIELD', 'username')
+        credentials = {
+            username_field: userid,
+            'password': password
+        }
+        user = authenticate(**credentials)
 
         if user is None:
             raise exceptions.AuthenticationFailed(_('Invalid username/password.'))
@@ -164,7 +173,13 @@ class TokenAuthentication(BaseAuthentication):
             msg = _('Invalid token header. Token string should not contain spaces.')
             raise exceptions.AuthenticationFailed(msg)
 
-        return self.authenticate_credentials(auth[1])
+        try:
+            token = auth[1].decode()
+        except UnicodeError:
+            msg = _('Invalid token header. Token string should not contain invalid characters.')
+            raise exceptions.AuthenticationFailed(msg)
+
+        return self.authenticate_credentials(token)
 
     def authenticate_credentials(self, key):
         try:

rest_framework/authtoken/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from rest_framework.authtoken.models import Token
 
 

rest_framework/authtoken/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

rest_framework/authtoken/models.py

@@ -5,7 +5,6 @@ from django.conf import settings
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
-
 # Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist.
 # Note that we don't perform this code in the compat module due to
 # bug report #1297

rest_framework/authtoken/views.py

@@ -1,9 +1,8 @@
-from rest_framework.views import APIView
-from rest_framework import parsers
-from rest_framework import renderers
-from rest_framework.response import Response
+from rest_framework import parsers, renderers
 from rest_framework.authtoken.models import Token
 from rest_framework.authtoken.serializers import AuthTokenSerializer
+from rest_framework.response import Response
+from rest_framework.views import APIView
 
 
 class ObtainAuthToken(APIView):

rest_framework/compat.py

@@ -5,13 +5,18 @@ versions of django/python, and compatibility wrappers around optional packages.
 
 # flake8: noqa
 from __future__ import unicode_literals
-from django.core.exceptions import ImproperlyConfigured
+
+import inspect
+
+import django
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.db import connection, transaction
+from django.test.client import FakePayload
+from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.six.moves.urllib.parse import urlparse as _urlparse
-from django.utils import six
-import django
-import inspect
+
 try:
     import importlib
 except ImportError:
@@ -119,6 +124,14 @@ def get_model_name(model_cls):
         return model_cls._meta.module_name
 
 
+# Support custom user models in Django 1.5+
+try:
+    from django.contrib.auth import get_user_model
+except ImportError:
+    from django.contrib.auth.models import User
+    get_user_model = lambda: User
+
+
 # View._allowed_methods only present from 1.5 onwards
 if django.VERSION >= (1, 5):
     from django.views.generic import View
@@ -190,9 +203,6 @@ if 'patch' not in View.http_method_names:
     View.http_method_names = View.http_method_names + ['patch']
 
 
-# RequestFactory only provides `generic` from 1.5 onwards
-from django.test.client import RequestFactory as DjangoRequestFactory
-from django.test.client import FakePayload
 
 try:
     # In 1.5 the test client uses force_bytes
@@ -202,24 +212,30 @@ except ImportError:
     from django.utils.encoding import smart_str as force_bytes_or_smart_bytes
 
 
-class RequestFactory(DjangoRequestFactory):
-    def generic(self, method, path,
-            data='', content_type='application/octet-stream', **extra):
-        parsed = _urlparse(path)
-        data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
-        r = {
-            'PATH_INFO': self._get_path(parsed),
-            'QUERY_STRING': force_text(parsed[4]),
-            'REQUEST_METHOD': six.text_type(method),
-        }
-        if data:
-            r.update({
-                'CONTENT_LENGTH': len(data),
-                'CONTENT_TYPE': six.text_type(content_type),
-                'wsgi.input': FakePayload(data),
-            })
-        r.update(extra)
-        return self.request(**r)
+# RequestFactory only provides `generic` from 1.5 onwards
+if django.VERSION >= (1, 5):
+    from django.test.client import RequestFactory
+else:
+    from django.test.client import RequestFactory as DjangoRequestFactory
+
+    class RequestFactory(DjangoRequestFactory):
+        def generic(self, method, path,
+                data='', content_type='application/octet-stream', **extra):
+            parsed = _urlparse(path)
+            data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
+            r = {
+                'PATH_INFO': self._get_path(parsed),
+                'QUERY_STRING': force_text(parsed[4]),
+                'REQUEST_METHOD': six.text_type(method),
+            }
+            if data:
+                r.update({
+                    'CONTENT_LENGTH': len(data),
+                    'CONTENT_TYPE': six.text_type(content_type),
+                    'wsgi.input': FakePayload(data),
+                })
+            r.update(extra)
+            return self.request(**r)
 
 
 # Markdown is optional
@@ -250,3 +266,28 @@ else:
     SHORT_SEPARATORS = (b',', b':')
     LONG_SEPARATORS = (b', ', b': ')
     INDENT_SEPARATORS = (b',', b': ')
+
+
+if django.VERSION >= (1, 8):
+    from django.db.models import DurationField
+    from django.utils.dateparse import parse_duration
+    from django.utils.duration import duration_string
+else:
+    DurationField = duration_string = parse_duration = None
+
+
+def set_rollback():
+    if hasattr(transaction, 'set_rollback'):
+        if connection.settings_dict.get('ATOMIC_REQUESTS', False):
+            # If running in >=1.6 then mark a rollback as required,
+            # and allow it to be handled by Django.
+            if connection.in_atomic_block:
+                transaction.set_rollback(True)
+    elif transaction.is_managed():
+        # Otherwise handle it explicitly if in managed mode.
+        if transaction.is_dirty():
+            transaction.rollback()
+        transaction.leave_transaction_management()
+    else:
+        # transaction not managed
+        pass

rest_framework/decorators.py

@@ -7,10 +7,13 @@ based views, as well as the `@detail_route` and `@list_route` decorators, which
 used to annotate methods on viewsets that should be included by routers.
 """
 from __future__ import unicode_literals
-from django.utils import six
-from rest_framework.views import APIView
+
 import types
 
+from django.utils import six
+
+from rest_framework.views import APIView
+
 
 def api_view(http_method_names=None):
 

rest_framework/exceptions.py

@@ -5,11 +5,16 @@ In addition Django's built in 403 and 404 exceptions are handled.
 (`django.http.Http404` and `django.core.exceptions.PermissionDenied`)
 """
 from __future__ import unicode_literals
+
+import math
+
 from django.utils import six
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
+
 from rest_framework import status
-import math
+from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 
 
 def _force_text_recursive(data):
@@ -18,14 +23,20 @@ def _force_text_recursive(data):
     lazy translation strings into plain text.
     """
     if isinstance(data, list):
-        return [
+        ret = [
             _force_text_recursive(item) for item in data
         ]
+        if isinstance(data, ReturnList):
+            return ReturnList(ret, serializer=data.serializer)
+        return data
     elif isinstance(data, dict):
-        return dict([
+        ret = dict([
             (key, _force_text_recursive(value))
             for key, value in data.items()
         ])
+        if isinstance(data, ReturnDict):
+            return ReturnDict(ret, serializer=data.serializer)
+        return data
     return force_text(data)
 
 

rest_framework/fields.py

@@ -1,22 +1,5 @@
 from __future__ import unicode_literals
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.exceptions import ValidationError as DjangoValidationError
-from django.core.validators import RegexValidator
-from django.forms import ImageField as DjangoImageField
-from django.utils import six, timezone
-from django.utils.dateparse import parse_date, parse_datetime, parse_time
-from django.utils.encoding import is_protected_type, smart_text
-from django.utils.translation import ugettext_lazy as _
-from rest_framework import ISO_8601
-from rest_framework.compat import (
-    EmailValidator, MinValueValidator, MaxValueValidator,
-    MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict,
-    unicode_repr, unicode_to_repr
-)
-from rest_framework.exceptions import ValidationError
-from rest_framework.settings import api_settings
-from rest_framework.utils import html, representation, humanize_datetime
+
 import collections
 import copy
 import datetime
@@ -25,6 +8,27 @@ import inspect
 import re
 import uuid
 
+from django.conf import settings
+from django.core.exceptions import ValidationError as DjangoValidationError
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import RegexValidator, ip_address_validators
+from django.forms import ImageField as DjangoImageField
+from django.utils import six, timezone
+from django.utils.dateparse import parse_date, parse_datetime, parse_time
+from django.utils.encoding import is_protected_type, smart_text
+from django.utils.ipv6 import clean_ipv6_address
+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
+)
+from rest_framework.exceptions import ValidationError
+from rest_framework.settings import api_settings
+from rest_framework.utils import html, humanize_datetime, representation
+
 
 class empty:
     """
@@ -287,6 +291,8 @@ class Field(object):
                 # If the field is blank, and null is a valid value then
                 # determine if we should use null instead.
                 return '' if getattr(self, 'allow_blank', False) else None
+            elif ret == '' and self.default:
+                return empty
             return ret
         return dictionary.get(self.field_name, empty)
 
@@ -416,10 +422,11 @@ class Field(object):
         Transform the *outgoing* native value into primitive data.
         """
         raise NotImplementedError(
-            '{cls}.to_representation() must be implemented.\n'
-            'If you are upgrading from REST framework version 2 '
-            'you might want `ReadOnlyField`.'.format(
-                cls=self.__class__.__name__
+            '{cls}.to_representation() must be implemented for field '
+            '{field_name}. If you do not need to support write operations '
+            'you probably want to subclass `ReadOnlyField` instead.'.format(
+                cls=self.__class__.__name__,
+                field_name=self.field_name,
             )
         )
 
@@ -579,7 +586,7 @@ class CharField(Field):
         # Test for the empty string here so that it does not get validated,
         # and so that subclasses do not need to handle it explicitly
         # inside the `to_internal_value()` method.
-        if data == '':
+        if data == '' or (self.trim_whitespace and six.text_type(data).strip() == ''):
             if not self.allow_blank:
                 self.fail('blank')
             return ''
@@ -639,20 +646,62 @@ class URLField(CharField):
 
 
 class UUIDField(Field):
+    valid_formats = ('hex_verbose', 'hex', 'int', 'urn')
+
     default_error_messages = {
         'invalid': _('"{value}" is not a valid UUID.'),
     }
 
+    def __init__(self, **kwargs):
+        self.uuid_format = kwargs.pop('format', 'hex_verbose')
+        if self.uuid_format not in self.valid_formats:
+            raise ValueError(
+                'Invalid format for uuid representation. '
+                'Must be one of "{0}"'.format('", "'.join(self.valid_formats))
+            )
+        super(UUIDField, self).__init__(**kwargs)
+
     def to_internal_value(self, data):
         if not isinstance(data, uuid.UUID):
             try:
-                return uuid.UUID(data)
+                if isinstance(data, six.integer_types):
+                    return uuid.UUID(int=data)
+                else:
+                    return uuid.UUID(hex=data)
             except (ValueError, TypeError):
                 self.fail('invalid', value=data)
         return data
 
     def to_representation(self, value):
-        return str(value)
+        if self.uuid_format == 'hex_verbose':
+            return str(value)
+        else:
+            return getattr(value, self.uuid_format)
+
+
+class IPAddressField(CharField):
+    """Support both IPAddressField and GenericIPAddressField"""
+
+    default_error_messages = {
+        'invalid': _('Enter a valid IPv4 or IPv6 address.'),
+    }
+
+    def __init__(self, protocol='both', **kwargs):
+        self.protocol = protocol.lower()
+        self.unpack_ipv4 = (self.protocol == 'both')
+        super(IPAddressField, self).__init__(**kwargs)
+        validators, error_message = ip_address_validators(protocol, self.unpack_ipv4)
+        self.validators.extend(validators)
+
+    def to_internal_value(self, data):
+        if data and ':' in data:
+            try:
+                if self.protocol in ('both', 'ipv6'):
+                    return clean_ipv6_address(data, self.unpack_ipv4)
+            except DjangoValidationError:
+                self.fail('invalid', value=data)
+
+        return super(IPAddressField, self).to_internal_value(data)
 
 
 # Number types...
@@ -758,10 +807,8 @@ class DecimalField(Field):
 
     def to_internal_value(self, data):
         """
-        Validates that the input is a decimal number. Returns a Decimal
-        instance. Returns None for empty values. Ensures that there are no more
-        than max_digits in the number, and no more than decimal_places digits
-        after the decimal point.
+        Validate that the input is a decimal number and return a Decimal
+        instance.
         """
         data = smart_text(data).strip()
         if len(data) > self.MAX_STRING_LENGTH:
@@ -781,8 +828,19 @@ class DecimalField(Field):
         if value in (decimal.Decimal('Inf'), decimal.Decimal('-Inf')):
             self.fail('invalid')
 
+        return self.validate_precision(value)
+
+    def validate_precision(self, value):
+        """
+        Ensure that there are no more than max_digits in the number, and no
+        more than decimal_places digits after the decimal point.
+
+        Override this method to disable the precision validation for input
+        values or to enhance it in any way you need to.
+        """
         sign, digittuple, exponent = value.as_tuple()
-        decimals = abs(exponent)
+        decimals = exponent * decimal.Decimal(-1) if exponent < 0 else 0
+
         # digittuple doesn't include any leading zeros.
         digits = len(digittuple)
         if decimals > digits:
@@ -806,16 +864,22 @@ class DecimalField(Field):
         if not isinstance(value, decimal.Decimal):
             value = decimal.Decimal(six.text_type(value).strip())
 
-        context = decimal.getcontext().copy()
-        context.prec = self.max_digits
-        quantized = value.quantize(
-            decimal.Decimal('.1') ** self.decimal_places,
-            context=context
-        )
+        quantized = self.quantize(value)
+
         if not self.coerce_to_string:
             return quantized
         return '{0:f}'.format(quantized)
 
+    def quantize(self, value):
+        """
+        Quantize the decimal value to the configured precision.
+        """
+        context = decimal.getcontext().copy()
+        context.prec = self.max_digits
+        return value.quantize(
+            decimal.Decimal('.1') ** self.decimal_places,
+            context=context)
+
 
 # Date & time fields...
 
@@ -827,6 +891,7 @@ class DateTimeField(Field):
     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
@@ -863,7 +928,7 @@ class DateTimeField(Field):
                         return self.enforce_timezone(parsed)
             else:
                 try:
-                    parsed = datetime.datetime.strptime(value, format)
+                    parsed = self.datetime_parser(value, format)
                 except (ValueError, TypeError):
                     pass
                 else:
@@ -891,6 +956,7 @@ class DateField(Field):
     }
     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
@@ -915,7 +981,7 @@ class DateField(Field):
                         return parsed
             else:
                 try:
-                    parsed = datetime.datetime.strptime(value, format)
+                    parsed = self.datetime_parser(value, format)
                 except (ValueError, TypeError):
                     pass
                 else:
@@ -954,6 +1020,7 @@ class TimeField(Field):
     }
     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
@@ -975,7 +1042,7 @@ class TimeField(Field):
                         return parsed
             else:
                 try:
-                    parsed = datetime.datetime.strptime(value, format)
+                    parsed = self.datetime_parser(value, format)
                 except (ValueError, TypeError):
                     pass
                 else:
@@ -1002,6 +1069,29 @@ class TimeField(Field):
         return value.strftime(self.format)
 
 
+class DurationField(Field):
+    default_error_messages = {
+        'invalid': _('Duration has wrong format. Use one of these formats instead: {format}.'),
+    }
+
+    def __init__(self, *args, **kwargs):
+        if parse_duration is None:
+            raise NotImplementedError(
+                'DurationField not supported for django versions prior to 1.8')
+        return super(DurationField, self).__init__(*args, **kwargs)
+
+    def to_internal_value(self, value):
+        if isinstance(value, datetime.timedelta):
+            return value
+        parsed = parse_duration(value)
+        if parsed is not None:
+            return parsed
+        self.fail('invalid', format='[DD] [HH:[MM:]]ss[.uuuuuu]')
+
+    def to_representation(self, value):
+        return duration_string(value)
+
+
 # Choice types...
 
 class ChoiceField(Field):
@@ -1045,26 +1135,37 @@ class ChoiceField(Field):
     def to_representation(self, value):
         if value in ('', None):
             return value
-        return self.choice_strings_to_values[six.text_type(value)]
+        return self.choice_strings_to_values.get(six.text_type(value), value)
 
 
 class MultipleChoiceField(ChoiceField):
     default_error_messages = {
         'invalid_choice': _('"{input}" is not a valid choice.'),
-        'not_a_list': _('Expected a list of items but got type "{input_type}".')
+        'not_a_list': _('Expected a list of items but got type "{input_type}".'),
+        'empty': _('This selection may not be empty.')
     }
     default_empty_html = []
 
+    def __init__(self, *args, **kwargs):
+        self.allow_empty = kwargs.pop('allow_empty', True)
+        super(MultipleChoiceField, self).__init__(*args, **kwargs)
+
     def get_value(self, dictionary):
         # We override the default field access in order to support
         # lists in HTML forms.
         if html.is_html_input(dictionary):
-            return dictionary.getlist(self.field_name)
+            ret = dictionary.getlist(self.field_name)
+            if getattr(self.root, 'partial', False) and not ret:
+                ret = empty
+            return ret
+
         return dictionary.get(self.field_name, empty)
 
     def to_internal_value(self, data):
         if isinstance(data, type('')) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
+        if not self.allow_empty and len(data) == 0:
+            self.fail('empty')
 
         return set([
             super(MultipleChoiceField, self).to_internal_value(item)
@@ -1073,7 +1174,7 @@ class MultipleChoiceField(ChoiceField):
 
     def to_representation(self, value):
         return set([
-            self.choice_strings_to_values[six.text_type(item)] for item in value
+            self.choice_strings_to_values.get(six.text_type(item), item) for item in value
         ])
 
 
@@ -1113,8 +1214,12 @@ class FileField(Field):
         return data
 
     def to_representation(self, value):
+        if not value:
+            return None
+
         if self.use_url:
-            if not value:
+            if not getattr(value, 'url', None):
+                # If the file has not been saved it may not have a URL.
                 return None
             url = value.url
             request = self.context.get('request', None)
@@ -1165,11 +1270,13 @@ class ListField(Field):
     child = _UnvalidatedField()
     initial = []
     default_error_messages = {
-        'not_a_list': _('Expected a list of items but got type "{input_type}".')
+        'not_a_list': _('Expected a list of items but got type "{input_type}".'),
+        'empty': _('This list may not be empty.')
     }
 
     def __init__(self, *args, **kwargs):
         self.child = kwargs.pop('child', copy.deepcopy(self.child))
+        self.allow_empty = kwargs.pop('allow_empty', True)
         assert not inspect.isclass(self.child), '`child` has not been instantiated.'
         super(ListField, self).__init__(*args, **kwargs)
         self.child.bind(field_name='', parent=self)
@@ -1178,6 +1285,10 @@ class ListField(Field):
         # We override the default field access in order to support
         # lists in HTML forms.
         if html.is_html_input(dictionary):
+            val = dictionary.getlist(self.field_name, [])
+            if len(val) > 1:
+                # Support QueryDict lists in HTML input.
+                return val
             return html.parse_html_list(dictionary, prefix=self.field_name)
         return dictionary.get(self.field_name, empty)
 
@@ -1189,6 +1300,8 @@ class ListField(Field):
             data = html.parse_html_list(data)
         if isinstance(data, type('')) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
+        if not self.allow_empty and len(data) == 0:
+            self.fail('empty')
         return [self.child.run_validation(item) for item in data]
 
     def to_representation(self, data):

rest_framework/filters.py

@@ -4,13 +4,16 @@ returned by list views.
 """
 from __future__ import unicode_literals
 
+import operator
+from functools import reduce
+
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
-from rest_framework.compat import django_filters, guardian, get_model_name
+
+from rest_framework.compat import django_filters, get_model_name, guardian
 from rest_framework.settings import api_settings
-from functools import reduce
-import operator
 
 FilterSet = django_filters and django_filters.FilterSet or None
 
@@ -57,6 +60,7 @@ class DjangoFilterBackend(BaseFilterBackend):
                 class Meta:
                     model = queryset.model
                     fields = filter_fields
+
             return AutoFilterSet
 
         return None
@@ -98,13 +102,20 @@ class SearchFilter(BaseFilterBackend):
         if not search_fields:
             return queryset
 
+        original_queryset = queryset
         orm_lookups = [self.construct_search(six.text_type(search_field))
                        for search_field in search_fields]
 
         for search_term in self.get_search_terms(request):
             or_queries = [models.Q(**{orm_lookup: search_term})
                           for orm_lookup in orm_lookups]
-            queryset = queryset.filter(reduce(operator.or_, or_queries)).distinct()
+            queryset = queryset.filter(reduce(operator.or_, or_queries))
+
+        if settings.DATABASES[queryset.db]["ENGINE"] == "django.db.backends.oracle":
+            # distinct analogue for Oracle users
+            queryset = original_queryset.filter(pk__in=set(queryset.values_list('pk', flat=True)))
+        else:
+            queryset = queryset.distinct()
 
         return queryset
 
@@ -187,4 +198,7 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend):
             'model_name': get_model_name(model_cls)
         }
         permission = self.perm_format % kwargs
-        return guardian.shortcuts.get_objects_for_user(user, permission, queryset)
+        if guardian.VERSION >= (1, 3):
+            # Maintain behavior compatibility with versions prior to 1.3
+            extra = {'accept_global_perms': False}
+        return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)

rest_framework/generics.py

@@ -2,10 +2,12 @@
 Generic views that provide commonly needed behaviour.
 """
 from __future__ import unicode_literals
+
 from django.db.models.query import QuerySet
 from django.http import Http404
 from django.shortcuts import get_object_or_404 as _get_object_or_404
-from rest_framework import views, mixins
+
+from rest_framework import mixins, views
 from rest_framework.settings import api_settings
 
 

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/django-rest-framework/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ 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:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "اسم المستخدم/كلمة السر غير صحيحين."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "المستخدم غير مفعل او تم حذفه."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-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:38
 msgid "A server error occurred."
@@ -70,11 +82,12 @@ msgstr "لم يتم تزويد بيانات الدخول."
 msgid "You do not have permission to perform this action."
 msgstr "ليس لديك صلاحية للقيام بهذا الإجراء."
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "غير موجود."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -83,6 +96,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -90,161 +104,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "هذا الحقل مطلوب."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" ليس قيمة منطقية."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "لا يمكن لهذا الحقل ان يكون فارغاً."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف."
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "تأكد ان الحقل {min_length} محرف على الاقل."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "عليك ان تدخل بريد إلكتروني صالح."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "هذه القيمة لا تطابق النمط المطلوب."
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "الرجاء إدخال رابط إلكتروني صالح."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "الرجاء إدخال رقم صحيح صالح."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "تأكد ان القيمة أقل أو تساوي {max_value}."
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}."
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "الرجاء إدخال رقم صالح."
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم."
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "لم يتم إرسال أي ملف."
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "الملف الذي تم إرساله فارغ."
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)."
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "معرف العنصر \"{pk_value}\" غير صالح -  العنصر غير موجود."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -261,38 +299,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "قيمة غير صالحة."
 
-#: serializers.py:299
+#: serializers.py:304
+#, 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:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -304,22 +361,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "حساب المستخدم غير مفعل."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "تعذر تسجيل الدخول بالبيانات التي ادخلتها."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "يجب أن تتضمن \"اسم المستخدم\" و \"كلمة المرور\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/be/LC_MESSAGES/django.po

@@ -0,0 +1,373 @@
+# 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-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django-rest-framework/language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<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:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+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:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, 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:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/cs/LC_MESSAGES/django.po

@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2015
+# Tomáš Ehrlich <tomas.ehrlich@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/django-rest-framework/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +19,49 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 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:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Chybné uživatelské jméno nebo heslo."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Uživatelský účet je neaktivní nebo byl smazán."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Chybný token."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Uživatelský účet je neaktivní nebo byl smazán."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Uživatelský účet je uzamčen."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Zadanými údaji se nebylo možné přihlásit."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Musí obsahovat \"uživatelské jméno\" a \"heslo\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -64,17 +77,18 @@ msgstr "Chybné přihlašovací údaje."
 
 #: exceptions.py:83
 msgid "Authentication credentials were not provided."
-msgstr "Přihlašovací údaje nebyly zadány."
+msgstr "Nebyly zadány přihlašovací údaje."
 
 #: exceptions.py:88
 msgid "You do not have permission to perform this action."
 msgstr "K této akci nemáte oprávnění."
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Nenalezeno."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metoda \"{method}\" není povolena."
 
@@ -83,168 +97,193 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Nelze vyhovět požadavku v hlavičce Accept."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Nepodporovaný media type \"{media_type}\" v požadavku."
 
 #: exceptions.py:134
 msgid "Request was throttled."
-msgstr "Pořadavek byl limitován kvůli omezení počtu požadavků za časovou periodu."
+msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Toto pole je vyžadováno."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Toto pole nesmí být prázdné (null)."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" nelze použít jako typ boolean."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
-msgstr "Toto pole nesmí být prázdné.."
+msgstr "Toto pole nesmí být prázdné."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
-msgstr "Zkontrolujte, že toto obsahuje alespoň {min_length} znaků"
+msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Vložte platnou e-mailovou adresu."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Vložte platný odkaz."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" není platné UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
-msgstr "Je vyžadováno číslo."
+msgstr "Je vyžadováno celé číslo."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
-msgstr "Řetězec je příliš dlouhý"
+msgstr "Řetězec je příliš dlouhý."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Je vyžadováno číslo."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
-msgstr "Bylo zadáno pouze datum místo data a času."
+msgstr "Bylo zadáno pouze datum bez času."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Bylo zadáno datum a čas, místo samotného data."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" není platnou možností."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Nebyl zaslán žádný soubor."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
-msgstr "Nebylo možno zjistit jméno souboru."
+msgstr "Nebylo možné zjistit jméno souboru."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Zaslaný soubor je prázdný."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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."
+msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Chybné čislo stránky \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Chybný kurzor."
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje."
 
 #: relations.py:134
+#, 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."
 
@@ -261,65 +300,76 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Chybný odkaz - objekt neexistuje."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt s {slug_name}={value} neexistuje."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Chybná hodnota."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
-msgstr "Chybná data. Byl přijat typ {datatype} místo očakávaného slovníku."
+msgstr "Chybná data. Byl přijat typ {datatype} místo očekávaného slovníku."
+
+#: 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:22
 msgid "This field must be unique."
 msgstr "Tato položka musí být unikátní."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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í."
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr "Chybné číslo verze v hlavičce Accept"
+msgstr "Chybné číslo verze v hlavičce Accept."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
 msgstr "Chybné číslo verze v odkazu."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Chybné číslo verze v hostname."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Chybné čislo verze v URL parametru."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Uživatelský účet je zamčen."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Se zadanými údaji nebylo možné se přihlásit."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Musí obsahovat \"uživatelské jméno! a \"heslo\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/django-rest-framework/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ugyldig basic header. Ingen legitimation angivet."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Ugyldigt brugernavn/kodeord."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Inaktiv eller slettet bruger."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Ugyldig token header."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Ugyldigt token."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Inaktiv eller slettet bruger."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Brugerkontoen er deaktiveret."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Kunne ikke logge ind med den angivne legitimation."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Skal indeholde \"username\" og \"password\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -70,11 +82,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Ikke fundet."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metoden \"{method}\" er ikke tilladt."
 
@@ -83,6 +96,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kunne ikke efterkomme forespørgslens Accept header."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
 
@@ -90,161 +104,185 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet."
 msgid "Request was throttled."
 msgstr "Forespørgslen blev neddroslet."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Dette felt er påkrævet."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Dette felt må ikke være null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" er ikke en tilladt boolsk værdi."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Dette felt må ikke være tomt."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Angiv en gyldig e-mailadresse."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Denne værdi passer ikke med det påkrævede mønster."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Indtast en gyldig URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" er ikke et gyldigt UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Et gyldigt heltal er påkrævet."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Strengværdien er for stor."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Et gyldigt tal er påkrævet."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Forventede en datotid, men fik en dato."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Forventede en dato men fik en datotid."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" er ikke et gyldigt valg."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Ingen medsendt fil."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Filnavnet kunne ikke afgøres."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Den medsendte fil er tom."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ugyldig side \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Ugyldig cursor"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke."
 
 #: relations.py:134
+#, 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}."
 
@@ -261,38 +299,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ugyldigt hyperlink - objektet findes ikke."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Forkert type. Forventede en URL-streng, fik {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Object med {slug_name}={value} findes ikke."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Ugyldig værdi."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ugyldig data. Forventede en dictionary, men fik {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 "Ingen"
+
+#: 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 "Intet at vælge."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "Dette felt skal være unikt."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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."
 
@@ -304,22 +361,14 @@ msgstr "Ugyldig version i \"Accept\" headeren."
 msgid "Invalid version in URL path."
 msgstr "Ugyldig version i URL-stien."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Ugyldig version i hostname."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Ugyldig version i forespørgselsparameteren."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Brugerkontoen er deaktiveret."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Kunne ikke logge ind med den angivne legitimation."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Skal indeholde \"username\" og \"password\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Adgang nægtet."

rest_framework/locale/de/LC_MESSAGES/django.po

@@ -5,13 +5,14 @@
 # Translators:
 # Fabian Büchler <fabian@buechler.io>, 2015
 # Thomas Tanner, 2015
+# Xavier Ordoquy <xordoquy@linovia.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-03-07 19:50+0000\n"
-"Last-Translator: Fabian Büchler <fabian@buechler.io>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/django-rest-framework/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +20,49 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Ungültiger Benutzername/Passwort"
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Benutzer inaktiv oder gelöscht."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Ungültiger token header. Keine Zugangsdaten angegeben."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Ungültiges Token"
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Benutzer inaktiv oder gelöscht."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Benutzerkonto ist gesperrt."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "\"username\" und \"password\" sind erforderlich."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -71,11 +84,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Nicht gefunden."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Methode \"{method}\" nicht erlaubt."
 
@@ -84,6 +98,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
 
@@ -91,161 +106,185 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage."
 msgid "Request was throttled."
 msgstr "Die Anfrage wurde gedrosselt."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Dieses Feld ist erforderlich."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Dieses Feld darf nicht Null sein."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" ist kein gültiger Wahrheitswert."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Gib eine gültige E-Mail Adresse an."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Gib eine gültige URL ein."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" ist keine gültige UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Eine gültige Ganzzahl ist erforderlich."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Zeichenkette zu lang."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Eine gültige Zahl ist erforderlich."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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_places} Stellen vor dem Komma lang ist."
+msgstr "Stelle sicher, dass es nicht mehr als {max_whole_digits} Stellen vor dem Komma lang ist."
 
-#: fields.py:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" ist keine gültige Option."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Es wurde keine Datei übermittelt."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Der Dateiname konnte nicht ermittelt werden."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Die übermittelte Datei ist leer."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, 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:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Ungültige Seite \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Ungültiger Zeiger"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}."
 
@@ -262,38 +301,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Ungültiger Hyperlink - Objekt existiert nicht."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekt mit {slug_name}={value} existiert nicht."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Ungültiger Wert."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten."
 
+#: 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:22
 msgid "This field must be unique."
 msgstr "Dieses Feld muss eindeutig sein."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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."
 
@@ -305,22 +363,14 @@ msgstr "Ungültige Version in der \"Accept\" Kopfzeile."
 msgid "Invalid version in URL path."
 msgstr "Ungültige Version im URL Pfad."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Ungültige Version im Hostname."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Ungültige Version im Anfrageparameter."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Benutzerkonto ist gesperrt."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "\"username\" und \"password\" sind erforderlich."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/django-rest-framework/language/en/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,37 +17,49 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Invalid basic header. No credentials provided."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Invalid basic header. Credentials string should not contain spaces."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Invalid basic header. Credentials not correctly base64 encoded."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Invalid username/password."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "User inactive or deleted."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Invalid token header. No credentials provided."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Invalid token header. Token string should not contain spaces."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Invalid token."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "User inactive or deleted."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "User account is disabled."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Unable to log in with provided credentials."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Must include \"username\" and \"password\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -69,11 +81,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Not found."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Method \"{method}\" not allowed."
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Could not satisfy the request Accept header."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Unsupported media type \"{media_type}\" in request."
 
@@ -89,161 +103,185 @@ msgstr "Unsupported media type \"{media_type}\" in request."
 msgid "Request was throttled."
 msgstr "Request was throttled."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "This field is required."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "This field may not be null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" is not a valid boolean."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "This field may not be blank."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Enter a valid email address."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "This value does not match the required pattern."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Enter a valid URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" is not a valid UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "A valid integer is required."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "String value too large."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "A valid number is required."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Expected a datetime but got a date."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Expected a date but got a datetime."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, 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:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" is not a valid choice."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "No file was submitted."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "No filename could be determined."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "The submitted file is empty."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, 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:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Invalid page \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Invalid cursor"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Invalid pk \"{pk_value}\" - object does not exist."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Incorrect type. Expected pk value, received {data_type}."
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Invalid hyperlink - Object does not exist."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Incorrect type. Expected URL string, received {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Object with {slug_name}={value} does not exist."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Invalid value."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Invalid data. Expected a dictionary, but got {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 "None"
+
+#: 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 "No items to select."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "This field must be unique."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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."
 
@@ -303,22 +360,14 @@ msgstr "Invalid version in \"Accept\" header."
 msgid "Invalid version in URL path."
 msgstr "Invalid version in URL path."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Invalid version in hostname."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Invalid version in query parameter."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "User account is disabled."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Unable to log in with provided credentials."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Permission denied."

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-01-30 16:40+0000\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: 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:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93 views.py:77
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,159 +103,183 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -258,38 +296,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, 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:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -301,26 +358,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:81
+#: views.py:85
 msgid "Permission denied."
 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 ""

rest_framework/locale/es/LC_MESSAGES/django.po

@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# nnrcschmdt <e.rico.schmidt@gmail.com>, 2015
 # José Padilla <jpadilla@webapplicate.com>, 2015
 # Miguel González <migonzalvar@gmail.com>, 2015
 # Sergio Infante <rsinfante@gmail.com>, 2015
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-03-06 19:51+0000\n"
-"Last-Translator: Miguel González <migonzalvar@gmail.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/django-rest-framework/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +21,49 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Nombre de usuario/contraseña inválidos."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Usuario inactivo o borrado."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Cabecera token inválida. Las credenciales no fueron suministradas."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Cabecera token inválida. La cadena token no debe contener espacios."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Token inválido."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Usuario inactivo o borrado."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Cuenta de usuario está deshabilitada."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "No puede iniciar sesión con las credenciales proporcionadas."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Debe incluir \"username\" y \"password\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -72,11 +85,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "No encontrado."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Método \"{method}\" no permitido."
 
@@ -85,6 +99,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
 
@@ -92,161 +107,185 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud."
 msgid "Request was throttled."
 msgstr "Solicitud fue regulada (throttled)."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Este campo es requerido."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Este campo no puede ser nulo."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" no es un booleano válido."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Este campo no puede estar en blanco."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Introduzca una dirección de correo electrónico válida."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Este valor no coincide con el patrón requerido."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Introduzca una URL válida."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" no es un UUID válido."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Introduzca un número entero válido."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Cadena demasiado larga."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Se requiere un número válido."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Se esperaba un fecha/hora en vez de una fecha."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Se esperaba una fecha en vez de una fecha/hora."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" no es una elección válida."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "No se envió ningún archivo."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "No se pudo determinar un nombre de archivo."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "El archivo enviado está vació."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, 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:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Página \"{page_number}\" inválida: {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Cursor inválido"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe."
 
 #: relations.py:134
+#, 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}."
 
@@ -263,38 +302,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Hiperenlace inválido - Objeto no existe."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objeto con {slug_name}={value} no existe."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Valor inválido."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Datos inválidos. Se esperaba un diccionario pero es un {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 "Ninguno"
+
+#: 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 "No hay elementos para seleccionar."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "Este campo debe ser único."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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}\"."
 
@@ -306,22 +364,14 @@ msgstr "Versión inválida en la cabecera \"Accept\"."
 msgid "Invalid version in URL path."
 msgstr "Versión inválida en la ruta de la URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Versión inválida en el nombre de host."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Versión inválida en el parámetro de consulta."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Cuenta de usuario está deshabilitada."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "No puede iniciar sesión con las credenciales proporcionadas."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Debe incluir \"username\" y \"password\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Permiso denegado."

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-02-27 16:24+0000\n"
-"Last-Translator: Tõnis Kärdi <tonis.kardi@gmail.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/django-rest-framework/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Sobimatu kasutajatunnus/salasõna."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Kasutaja on inaktiivne või kustutatud."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Sobimatu lubakaart."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Kasutaja on inaktiivne või kustutatud."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Kasutajakonto on suletud."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Sisselogimine antud tunnusega ebaõnnestus."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Peab sisaldama \"kasutajatunnust\" ja \"slasõna\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -70,11 +82,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Ei leidnud."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Meetod \"{method}\" pole lubatud."
 
@@ -83,6 +96,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Päringu Accept-päist ei suutnud täita."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Meedia tüüpi {media_type} päringus ei toetata."
 
@@ -90,161 +104,185 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata."
 msgid "Request was throttled."
 msgstr "Liiga palju päringuid."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Väli on kohustuslik."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Väli ei tohi olla tühi."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" pole kehtiv kahendarv."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "See väli ei tohi olla tühi."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Sisestage kehtiv e-posti aadress."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Väärtus ei ühti etteantud mustriga."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Sisestage korrektne URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" pole kehtiv UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Sisendiks peab olema täisarv."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Sõne on liiga pikk."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Sisendiks peab olema arv."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" on sobimatu valik."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Ühtegi faili ei esitatud."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Ei suutnud tuvastada failinime."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Esitatud fail oli tühi."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, 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:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Sobimatu lehekülg \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Sobimatu kursor."
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}."
 
@@ -261,38 +299,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Sobimatu hüperlink - objekti ei eksisteeri."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objekti {slug_name}={value} ei eksisteeri."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Sobimatu väärtus."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {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:22
 msgid "This field must be unique."
 msgstr "Selle välja väärtus peab olema unikaalne."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Veerud {field_names} peavad moodustama unikaalse hulga."
 
-#: validators.py:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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."
 
@@ -304,22 +361,14 @@ msgstr "Sobimatu versioon \"Accept\" päises."
 msgid "Invalid version in URL path."
 msgstr "Sobimatu versioon URLi rajas."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Sobimatu versioon hostinimes."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Sobimatu versioon päringu parameetris."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Kasutajakonto on suletud."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Sisselogimine antud tunnusega ebaõnnestus."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Peab sisaldama \"kasutajatunnust\" ja \"slasõna\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/fr/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-03-19 22:23+0000\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
 "Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/django-rest-framework/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,37 +21,49 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "En-tête « basic » non valide. Informations d'identification non fournies."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 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:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Utilisateur inactif ou supprimé."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "En-tête « token » non valide. Informations d'identification non fournies."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Token non valide."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Utilisateur inactif ou supprimé."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Ce compte est désactivé."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Impossible de se connecter avec les informations d'identification fournies."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "\"username\" et \"password\" doivent être inclus."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -73,11 +85,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Pas trouvé."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Méthode \"{method}\" non autorisée."
 
@@ -86,6 +99,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "L'en-tête « Accept » n'a pas pu être satisfaite."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Type de média \"{media_type}\" non supporté."
 
@@ -93,161 +107,185 @@ msgstr "Type de média \"{media_type}\" non supporté."
 msgid "Request was throttled."
 msgstr "Requête ralentie."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Ce champ est obligatoire."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Ce champ ne peut être null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" n'est pas un booléen valide."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Ce champ ne peut être vide."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Saisissez une adresse email valable."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Cette valeur ne satisfait pas le motif imposé."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Saisissez une URL valide."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" n'est pas un UUID valide."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Un nombre entier valide est requis."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Chaîne de caractères trop longue."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Un nombre valide est requis."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Attendait une date + heure mais a reçu une date."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Attendait une date mais a reçu une date + heure."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" n'est pas un choix valide."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Aucun fichier n'a été soumis."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Le nom de fichier n'a pu être déterminé."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Le fichier soumis est vide."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, 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:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Page \"{page_number}\" non valide : {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Curseur non valide"
 
 #: relations.py:133
+#, 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:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}."
 
@@ -264,38 +302,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Lien non valide : l'objet n'existe pas."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "L'object avec {slug_name}={value} n'existe pas."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Valeur non valide."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Donnée non valide. Attendait un dictionnaire, a reçu {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 "Aucune"
+
+#: 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 "Aucun élément à sélectionner."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "Ce champ doit être unique."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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}\"."
 
@@ -307,22 +364,14 @@ msgstr "Version non valide dans l'en-tête « Accept »."
 msgid "Invalid version in URL path."
 msgstr "Version non valide dans l'URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Version non valide dans le nom d'hôte."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Version non valide dans le paramètre de requête."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Ce compte est désactivé."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Impossible de se connecter avec les informations d'identification fournies."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "\"username\" et \"password\" doivent être inclus."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Permission refusée."

rest_framework/locale/gl/LC_MESSAGES/django.po

@@ -0,0 +1,373 @@
+# 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-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django-rest-framework/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+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:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, 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:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/gl_ES/LC_MESSAGES/django.po

@@ -0,0 +1,373 @@
+# 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-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Galician (Spain) (http://www.transifex.com/projects/p/django-rest-framework/language/gl_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+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:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, 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:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/django-rest-framework/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 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:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Érvénytelen felhasználónév/jelszó."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "A felhasználó nincs aktiválva vagy törölve lett."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Érvénytelen token."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "A felhasználó nincs aktiválva vagy törölve lett."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "A felhasználó tiltva van."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "A megadott azonosítókkal nem lehet bejelentkezni."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Tartalmaznia kell a \"felhasználónevet\" és a \"jelszót\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -70,11 +82,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Nem található."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "A \"{method}\" metódus nem megengedett."
 
@@ -83,6 +96,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:121
+#, 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."
 
@@ -90,161 +104,185 @@ 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:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Ennek a mezőnek a megadása kötelező."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Ez a mező nem lehet null értékű."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "Az \"{input}\" nem egy érvényes logikai érték."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Ez a mező nem lehet üres."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Adjon meg egy érvényes e-mail címet!"
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Ez az érték nem illeszkedik a szükséges mintázatra."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Adjon meg egy érvényes URL-t!"
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Egy érvényes egész szám megadása szükséges."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "A karakterlánc túl hosszú."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Egy érvényes szám megadása szükséges."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 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:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 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:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "Az \"{input}\" nem egy érvényes elem."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Semmilyen fájl sem került feltöltésre."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "A fájlnév nem megállapítható."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "A küldött fájl üres."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Érvénytelen oldal \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, 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:134
+#, 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."
 
@@ -261,38 +299,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Érvénytelen link - Az objektum nem létezik."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, 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:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Érvénytelen érték."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Érvénytelen adat. Egy dictionary helyett {datatype} lett elküldve."
 
+#: 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:22
 msgid "This field must be unique."
 msgstr "Ennek a mezőnek egyedinek kell lennie."
 
 #: validators.py:76
+#, 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:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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."
 
@@ -304,22 +361,14 @@ msgstr "Érvénytelen verzió az \"Accept\" fejlécmezőben."
 msgid "Invalid version in URL path."
 msgstr "Érvénytelen verzió az URL elérési útban."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Érvénytelen verzió a hosztnévben."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Érvénytelen verzió a lekérdezési paraméterben."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "A felhasználó tiltva van."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "A megadott azonosítókkal nem lehet bejelentkezni."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Tartalmaznia kell a \"felhasználónevet\" és a \"jelszót\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/django-rest-framework/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: 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:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, 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:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""

rest_framework/locale/it/LC_MESSAGES/django.po

@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Antonio Mancina <antomicx@gmail.com>, 2015
 # Mattia Procopio <promat85@gmail.com>, 2015
+# Xavier Ordoquy <xordoquy@linovia.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/django-rest-framework/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +20,49 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
-msgstr ""
+msgstr "Header di base invalido. Credenziali non fornite."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
-msgstr ""
+msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
-msgstr ""
+msgstr "Credenziali non correttamente codificate in base64."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Nome utente/password non validi"
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Utente inattivo o eliminato."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Header del token non valido. Credenziali non fornite."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Token invalido."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Utente inattivo o eliminato."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "L'account dell'utente è disabilitato"
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Impossibile eseguire il log in con le credenziali immesse."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Deve includere \"nome utente\" e \"password\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -70,11 +84,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Non trovato."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Metodo \"{method}\" non consentito"
 
@@ -83,197 +98,237 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Tipo di media \"{media_type}\"non supportato."
 
 #: exceptions.py:134
 msgid "Request was throttled."
-msgstr ""
+msgstr "La richiesta è stata limitata (throttled)."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Campo obbligatorio."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Il campo non puà essere nullo."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" non è un valido valore booleano."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Questo campo non può essere omesso."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
-msgstr "Assicurati che questo campo abbia almeno {max_length} caratteri."
+msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Inserisci un indirizzo email valido."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
-msgstr ""
+msgstr "Questo valore non corrisponde alla sequenza richiesta."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Inserisci un URL valido"
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" non è un UUID valido."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "È richiesto un numero intero valido."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
-msgstr ""
+msgstr "Stringa troppo lunga."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "È richiesto un numero valido."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" non è una scelta valida."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Non è stato inviato alcun file."
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
-msgstr ""
+msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form."
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Il nome del file non può essere determinato."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Il file inviato è vuoto."
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
-msgstr ""
+msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})."
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr ""
+msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
-msgstr ""
+msgstr "Pagina \"{page_number}\" non valida: {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Cursore non valido"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
-msgstr ""
+msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
-msgstr ""
+msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}."
 
 #: relations.py:157
 msgid "Invalid hyperlink - No URL match."
-msgstr ""
+msgstr "Collegamento non valido - Nessuna corrispondenza di URL."
 
 #: relations.py:158
 msgid "Invalid hyperlink - Incorrect URL match."
-msgstr ""
+msgstr "Collegamento non valido - Corrispondenza di URL non corretta."
 
 #: relations.py:159
 msgid "Invalid hyperlink - Object does not exist."
-msgstr ""
+msgstr "Collegamento non valido - L'oggetto non esiste."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
-msgstr ""
+msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
-msgstr ""
+msgstr "L'oggetto con {slug_name}={value} non esiste."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Valore non valido."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr "Dati non validi. Era atteso un dizionario, ma si è ricevuto {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:22
@@ -281,45 +336,41 @@ msgid "This field must be unique."
 msgstr "Questo campo deve essere unico."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
-msgstr ""
+msgstr "I campi {field_names} devono costituire un insieme unico."
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
-msgstr ""
+msgstr "Questo campo deve essere unico per la data \"{date_field}\"."
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
-msgstr ""
+msgstr "Questo campo deve essere unico per il mese \"{date_field}\"."
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
-msgstr ""
+msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"."
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr ""
+msgstr "Versione non valida nell'header \"Accept\"."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
-msgstr ""
+msgstr "Versione non valida nella sequenza URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
-msgstr ""
+msgstr "Versione non valida nel nome dell'host."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
+msgstr "Versione non valida nel parametro della query."
+
+#: views.py:85
+msgid "Permission denied."
 msgstr ""
-
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "L'account dell'utente è disabilitato"
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Impossibile eseguire il log in con le credenziali immesse."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Deve includere \"nome utente\" e \"password\"."

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/django-rest-framework/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "아이디/비밀번호가 유효하지 않습니다."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "계정이 중지되었거나 삭제되었습니다."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "토큰이 유효하지 않습니다."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "계정이 중지되었거나 삭제되었습니다."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "사용자 계정을 사용할 수 없습니다."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "제공된 인증데이터(credentials)로는 로그인할 수 없습니다."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "\"아이디\"와 \"비밀번호\"를 포함해야 합니다."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -70,19 +82,21 @@ msgstr "자격 인증데이터(authentication credentials)가 제공되지 않
 msgid "You do not have permission to perform this action."
 msgstr "이 작업을 "
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "찾을 수 없습니다."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다."
 
 #: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
-msgstr ""
+msgstr "Accept header 요청을 만족할 수 없습니다."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다."
 
@@ -90,161 +104,185 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니
 msgid "Request was throttled."
 msgstr "요청이 지연(throttled)되었습니다."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "이 항목을 채워주십시오."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
-msgstr ""
+msgstr "이 칸은 null일 수 없습니다."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
-msgstr ""
+msgstr "이 칸은 blank일 수 없습니다."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오."
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "이 칸이 글자 수가  적어도 {min_length} 이상인지 확인하십시오."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "유효한 이메일 주소를 입력하십시오."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "형식에 맞지 않는 값입니다."
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오."
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "유효한 URL을 입력하십시오."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\"가 유효하지 않은 UUID 입니다."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "유효한 정수(integer)를 넣어주세요."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오."
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오."
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "문자열 값이 너무 큽니다."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "유효한 숫자를 넣어주세요."
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오."
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "소수점 자릿수가  {max_decimal_places} 이하인지 확인하십시오."
 
-#: fields.py:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "예상된 datatime 대신 date를 받았습니다."
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "예상된 date 대신 datetime을 받았습니다."
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}."
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다."
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "파일이 제출되지 않았습니다."
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요."
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "파일명을 알 수 없습니다."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "제출된 파일이 비어있습니다."
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)."
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "유효하지 않은 page \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
-msgstr ""
+msgstr "커서(cursor)가 유효하지 않습니다."
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다."
 
@@ -261,65 +299,76 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "{slug_name}={value} 객체가 존재하지 않습니다."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "값이 유효하지 않습니다."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다."
 
-#: validators.py:22
-msgid "This field must be unique."
+#: 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:22
+msgid "This field must be unique."
+msgstr "이 칸은 반드시 고유해야 합니다."
+
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr ""
+msgstr "\"Accept\" header내 버전이 유효하지 않습니다."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
-msgstr ""
+msgstr "URL path내 버전이 유효하지 않습니다."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
-msgstr ""
+msgstr "hostname내 버전이 유효하지 않습니다."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
+msgstr "쿼리 파라메터내 버전이 유효하지 않습니다."
+
+#: views.py:85
+msgid "Permission denied."
 msgstr ""
-
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "사용자 계정을 사용할 수 없습니다."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "제공된 인증데이터(credentials)로는 로그인할 수 없습니다."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "\"아이디\"와 \"비밀번호\"를 포함해야 합니다."

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/django-rest-framework/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,49 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Невалиден основен header. Не се внесени податоци за автентикација."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Невалидно корисничко име/лозинка."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Корисникот е деактивиран или избришан."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Невалиден токен header. Не се внесени податоци за најава."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Невалиден токен во header. Токенот не треба да содржи празни места."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Невалиден токен."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-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:38
 msgid "A server error occurred."
@@ -70,11 +82,12 @@ msgstr "Не се внесени податоци за најава."
 msgid "You do not have permission to perform this action."
 msgstr "Немате дозвола да го сторите ова."
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Не е пронајдено ништо."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Методата \"{method}\" не е дозволена."
 
@@ -83,6 +96,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Не може да се исполни барањето на Accept header-от."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Media типот „{media_type}“ не е поддржан."
 
@@ -90,161 +104,185 @@ msgstr "Media типот „{media_type}“ не е поддржан."
 msgid "Request was throttled."
 msgstr "Request-от е забранет заради ограничувања."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Ова поле е задолжително."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Ова поле не смее да биде недефинирано."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" не е валиден boolean."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Ова поле не смее да биде празно."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Ова поле не смее да има повеќе од {max_length} знаци."
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Ова поле мора да има барем {min_length} знаци."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Внесете валидна email адреса."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Ова поле не е по правилната шема/барање."
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти."
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Внесете валиден URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Задолжителен е валиден цел број."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Вредноста треба да биде помала или еднаква на {max_value}."
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Вредноста треба да биде поголема или еднаква на {min_value}."
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Вредноста е преголема."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Задолжителен е валиден број."
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Не смее да има повеќе од {max_digits} цифри вкупно."
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Не смее да има повеќе од {max_decimal_places} децимални места."
 
-#: fields.py:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Очекувано беше дата и време, а внесено беше само дата."
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Датата е со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Очекувана беше дата, а внесени беа и дата и време."
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Времето е со погрешен формат. Користете го овој формат: {format}."
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "„{input}“ не е валиден избор."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Очекувана беше листа, а внесено беше „{input_type}“."
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Ниеден фајл не е качен (upload-иран)."
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата."
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Не може да се открие име на фајлот."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Качениот (upload-иран) фајл е празен."
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})."
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Невалидна страна „{page_number}“: {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Невалиден pk „{pk_value}“ - објектот не постои."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}."
 
@@ -261,38 +299,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Невалиден хиперлинк - Објектот не постои."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Објектот со {slug_name}={value} не постои."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Невалидна вредност."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {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:22
 msgid "This field must be unique."
 msgstr "Ова поле мора да биде уникатно."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Полињата {field_names} заедно мора да формираат уникатен збир."
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата."
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот."
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината."
 
@@ -304,22 +361,14 @@ msgstr "Невалидна верзија во „Accept“ header-от."
 msgid "Invalid version in URL path."
 msgstr "Невалидна верзија во URL патеката."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Невалидна верзија во hostname-от."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Невалидна верзија во query параметарот."
 
-#: 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“."
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/nb/LC_MESSAGES/django.po

@@ -0,0 +1,373 @@
+# 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-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django-rest-framework/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+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:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, 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:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/nl/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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/django-rest-framework/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: 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:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, 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:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""

rest_framework/locale/pl/LC_MESSAGES/django.po

@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Janusz Harkot <jh@blueice.pl>, 2015
-# piotrjakimiak <legolass71@gmail.com>, 2015
+# Piotr Jakimiak <legolass71@gmail.com>, 2015
 # Maciek Olko <maciej.olko@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-03-04 17:03+0000\n"
-"Last-Translator: piotrjakimiak <legolass71@gmail.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/django-rest-framework/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,37 +20,49 @@ 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:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Użytkownik nieaktywny lub usunięty."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Niepoprawny token."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Użytkownik nieaktywny lub usunięty."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Konto użytkownika jest nieaktywne."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Podane dane uwierzytelniające nie pozwalają na zalogowanie."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Musi zawierać \"username\" i \"password\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -72,11 +84,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:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Nie znaleziono."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Niedozwolona metoda \"{method}\"."
 
@@ -85,6 +98,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Nie można zaspokoić nagłówka Accept żądania."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
 
@@ -92,161 +106,185 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"."
 msgid "Request was throttled."
 msgstr "Żądanie zostało zdławione."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "To pole jest wymagane."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Pole nie może mieć wartości null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" nie jest poprawną wartością logiczną."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "To pole nie może być puste."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Podaj poprawny adres e-mail."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Ta wartość nie pasuje do wymaganego wzorca."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Wprowadź poprawny adres URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" nie jest poprawnym UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Wymagana poprawna liczba całkowita."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Za długi ciąg znaków."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Wymagana poprawna liczba."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Oczekiwano datę z czasem, otrzymano tylko datę."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Oczekiwano daty a otrzymano datę z czasem."
 
-#: fields.py:936
+#: fields.py:971
+#, 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:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" nie jest poprawnym wyborem."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Nie przesłano pliku."
 
-#: fields.py:1068
+#: fields.py:1130
 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:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Nie można określić nazwy pliku."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Przesłany plik jest pusty."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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:1113
+#: fields.py:1175
 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:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Oczekiwano słownika, ale otrzymano  \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Niepoprawna strona \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Niepoprawny wskaźnik"
 
 #: relations.py:133
+#, 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:134
+#, 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}."
 
@@ -263,38 +301,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Błędny hyperlink - obiekt nie istnieje."
 
 #: relations.py:160
+#, 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:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Obiekt z polem {slug_name}={value} nie istnieje"
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Niepoprawna wartość."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano  {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 "None"
+
+#: 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 "Nie wybrano wartości."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "Wartość dla tego pola musi być unikalna."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Pola {field_names} muszą tworzyć unikalny zestaw."
 
-#: validators.py:219
+#: validators.py:224
+#, 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:234
+#: validators.py:239
+#, 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:247
+#: validators.py:252
+#, 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}\"."
 
@@ -306,22 +363,14 @@ msgstr "Błędna wersja w nagłówku \"Accept\"."
 msgid "Invalid version in URL path."
 msgstr "Błędna wersja w ścieżce URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Błędna wersja w nazwie hosta."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Błędna wersja w parametrach zapytania."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Konto użytkownika jest nieaktywne."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Podane dane uwierzytelniające nie pozwalają na zalogowanie."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Musi zawierać \"username\" i \"password\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Brak uprawnień."

rest_framework/locale/pt/LC_MESSAGES/django.po

@@ -0,0 +1,373 @@
+# 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-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django-rest-framework/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+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:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, 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:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/pt_BR/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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/django-rest-framework/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +19,49 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Cabeçalho básico inválido. Credenciais não fornecidas."
 
-#: authentication.py:72
+#: authentication.py:73
 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:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Usário ou senha inválido."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Usuário inativo ou removido."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Cabeçalho de token inválido. Credenciais não fornecidas."
 
-#: authentication.py:159
+#: authentication.py:170
 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:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Token inválido."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-msgstr "Usuário inativo ou removido."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr "Conta de usário desabilitada."
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr "Impossível fazer login com as credenciais fornecidas."
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr "Obrigatório incluir \"usuário\" e \"senha\"."
 
 #: exceptions.py:38
 msgid "A server error occurred."
@@ -71,11 +83,12 @@ msgstr "As credenciais de autenticação não foram fornecidas."
 msgid "You do not have permission to perform this action."
 msgstr "Você não tem persmissao para executar essa ação."
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Não encontrado."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Método \"{method}\" não é permitido."
 
@@ -84,6 +97,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Media type \"{media_type}\" no pedido não é suportado."
 
@@ -91,161 +105,185 @@ msgstr "Media type \"{media_type}\" no pedido não é suportado."
 msgid "Request was throttled."
 msgstr "Pedido foi limitado."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Este campo não pode ser nulo."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" não é um valor boleano válido."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Este campo não pode ser em branco."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, 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:552
+#: fields.py:561
+#, 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:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Insira um endereço de email válido."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Este valor não corresponde ao padrão exigido."
 
-#: fields.py:615
+#: fields.py:620
 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:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Entrar um URL válido."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
-msgstr ""
+msgstr "\"{value}\" não é um UUID valid."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Um número inteiro válido é exigido."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, 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:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, 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:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Valor da string é muito grande."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Um número válido é necessário."
 
-#: fields.py:727
+#: fields.py:750
+#, 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:728
+#: fields.py:751
+#, 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:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, 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:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Data e hora são necessários mas apenas data foi encontrada."
 
-#: fields.py:878
+#: fields.py:907
+#, 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:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Necessário uma data mas recebeu uma data e hora."
 
-#: fields.py:936
+#: fields.py:971
+#, 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}."
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" não é um escolha válido."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, 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:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Ficheiro não foi submetido."
 
-#: fields.py:1068
+#: fields.py:1130
 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."
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Nome do arquivo não pode ser determinado."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "O arquivo submetido ésta vázio."
 
-#: fields.py:1071
+#: fields.py:1133
+#, 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})."
 
-#: fields.py:1113
+#: fields.py:1175
 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."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
-msgstr ""
+msgstr "Esperou um dicionário de itens mas recebeu tipo \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Página inválido \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
-msgstr ""
+msgstr "Cursor invalído"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Pk inválido \"{pk_value}\" - objeto não existe."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Tipo incorreto. Necessário valor pk, recebeu {data_type}."
 
@@ -262,38 +300,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Hyperlink inválido - objeto não existe."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Objeto com {slug_name}={value} não existe."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Valor inválido."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Data inválido. Necessário um dicionário mas recebeu {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 "Nenhum(a/as)"
+
+#: 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 "Nenhum itens para escholher."
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr "Esse campo deve ser unico."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Os campos {field_names} devem criar um set unico."
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr "O campo deve ser unico pela data \"{date_field}\"."
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr "O campo deve ser unico pelo anô \"{date_field}\"."
 
-#: validators.py:247
+#: validators.py:252
+#, 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}\"."
 
@@ -305,22 +362,14 @@ msgstr "Versão inválido no cabeçalho \"Accept\"."
 msgid "Invalid version in URL path."
 msgstr "Versão inválido no caminho de URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr "Versão inválido no hostname."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr "Versão inválida no parâmetro de query."
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr "Conta de usário desabilitada."
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr "Impossível fazer login com as credenciais fornecidas."
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr "Obrigatório incluir \"usuário\" e \"senha\"."
+#: views.py:85
+msgid "Permission denied."
+msgstr "Permissão negado."

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-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-02 10:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/django-rest-framework/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: 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:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, 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:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""

rest_framework/locale/ru/LC_MESSAGES/django.po

@@ -4,52 +4,65 @@
 # 
 # Translators:
 # Kirill Tarasenko, 2015
+# koodjo <koodjo@mail.ru>, 2015
 # Mikhail Dmitriev <mktums@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-02-23 10:40+0000\n"
-"Last-Translator: Kirill Tarasenko\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/django-rest-framework/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"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:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr "Недопустимый заголовок. Не предоставлены учетные данные."
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов."
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64."
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr "Недопустимые имя пользователя или пароль."
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr "Пользователь неактивен или удален."
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные."
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов."
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr "Недопустимый токен."
 
-#: authentication.py:171
-msgid "User inactive or deleted."
-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:38
 msgid "A server error occurred."
@@ -71,11 +84,12 @@ msgstr "Учетные данные не были предоставлены."
 msgid "You do not have permission to perform this action."
 msgstr "У вас нет прав для выполнения этой операции."
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr "Не найдено."
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr "Метод \"{method}\" не разрешен."
 
@@ -84,6 +98,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса."
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе."
 
@@ -91,161 +106,185 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в
 msgid "Request was throttled."
 msgstr "Запрос был проигнорирован."
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr "Это поле обязательно."
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr "Это поле не может быть null."
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr "\"{input}\" не является корректным булевым значением."
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr "Это поле не может быть пустым."
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr "Убедитесь что в этом поле не больше {max_length} символов."
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr "Убедитесь что в этом поле как минимум {min_length} символов."
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr "Введите корректный адрес электронной почты."
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr "Значение не соответствует требуемому паттерну."
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов."
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr "Введите корректный URL."
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr "\"{value}\" не является корректным UUID."
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr "Требуется целочисленное значение."
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr "Убедитесь что значение меньше или равно {max_value}."
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr "Убедитесь что значение больше или равно {min_value}."
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr "Слишком длинное значение."
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr "Требуется численное значение."
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr "Убедитесь что в числе не больше {max_digits} знаков."
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части."
 
-#: fields.py:729
+#: fields.py:752
+#, 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:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат datetime. Используйте один из этих форматов:  {format}."
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr "Ожидался datetime, но был получен date."
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат date. Используйте один из этих форматов: {format}."
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr "Ожидался date, но был получен datetime."
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}."
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr "\"{input}\" не является корректным значением."
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr "Ожидался list со значениями, но был получен \"{input_type}\"."
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr "Не был загружен файл."
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr "Загруженный файл не является корректным файлом. "
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr "Невозможно определить имя файла."
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr "Загруженный файл пуст."
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})."
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным."
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"."
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr "Недопустимая страница \"{page_number}\": {message}."
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr "Не корректный курсор"
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует."
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}."
 
@@ -262,65 +301,76 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr "Недопустимая ссылка - объект не существует."
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr "Некорректный тип. Ожидался URL, получен {data_type}."
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr "Объект с {slug_name}={value} не существует."
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr "Недопустимое значение."
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr "Недопустимые данные. Ожидался dictionary, но был получен {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:22
 msgid "This field must be unique."
 msgstr "Это поле должно быть уникально."
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr "Поля {field_names} должны производить массив с уникальными значениями."
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
-msgstr ""
+msgstr "Это поле должно быть уникально для даты \"{date_field}\"."
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
-msgstr ""
+msgstr "Это поле должно быть уникально для месяца \"{date_field}\"."
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
-msgstr ""
+msgstr "Это поле должно быть уникально для года \"{date_field}\"."
 
 #: versioning.py:39
 msgid "Invalid version in \"Accept\" header."
-msgstr ""
+msgstr "Недопустимая версия в заголовке \"Accept\"."
 
 #: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
-msgstr ""
+msgstr "Недопустимая версия в пути URL."
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
-msgstr ""
+msgstr "Недопустимая версия в имени хоста."
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
+msgstr "Недопустимая версия в параметре запроса."
+
+#: views.py:85
+msgid "Permission denied."
 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\"."