diff --git a/.travis.yml b/.travis.yml index c9d9a1648..100a7cd8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ env: - TOX_ENV=py35-django18 - TOX_ENV=py34-django18 - TOX_ENV=py33-django18 - - TOX_ENV=py32-django18 - TOX_ENV=py27-django18 - TOX_ENV=py27-django110 - TOX_ENV=py35-django110 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03865b755..415e42ac0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,6 +61,7 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env source env/bin/activate + pip install django pip install -r requirements.txt # Run the tests diff --git a/README.md b/README.md index fc9bd43a5..155f8dead 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,16 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're a little over 45% of the way towards achieving that. -*Every single sign-up makes a significant impact.* Taking out a -[basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. +*Every single sign-up makes a significant impact towards making that possible.*

+ +

-*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/) and [Sentry](https://getsentry.com/welcome/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* --- @@ -52,7 +52,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.7, 3.2, 3.3, 3.4, 3.5) -* Django (1.8, 1.9) +* Django (1.8, 1.9, 1.10) # Installation @@ -170,7 +170,7 @@ You may also want to [follow the author on Twitter][twitter]. # Security -If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**. +If you believe you've found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**. Send a description of the issue via email to [rest-framework-security@googlegroups.com][security-mail]. The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure. diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 3f981c033..bf3a31eb7 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -44,7 +44,7 @@ The default authentication schemes may be set globally, using the `DEFAULT_AUTHE } You can also set the authentication scheme on a per-view or per-viewset basis, -using the `APIView` class based views. +using the `APIView` class-based views. from rest_framework.authentication import SessionAuthentication, BasicAuthentication from rest_framework.permissions import IsAuthenticated @@ -148,7 +148,7 @@ For clients to authenticate, the token key should be included in the `Authorizat If successfully authenticated, `TokenAuthentication` provides the following credentials. * `request.user` will be a Django `User` instance. -* `request.auth` will be a `rest_framework.authtoken.models.BasicToken` instance. +* `request.auth` will be a `rest_framework.authtoken.models.Token` instance. Unauthenticated responses that are denied permission will result in an `HTTP 401 Unauthorized` response with an appropriate WWW-Authenticate header. For example: diff --git a/docs/api-guide/content-negotiation.md b/docs/api-guide/content-negotiation.md index bc3b09fb7..bd408feba 100644 --- a/docs/api-guide/content-negotiation.md +++ b/docs/api-guide/content-negotiation.md @@ -77,7 +77,7 @@ The default content negotiation class may be set globally, using the `DEFAULT_CO 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'myapp.negotiation.IgnoreClientContentNegotiation', } -You can also set the content negotiation used for an individual view, or viewset, using the `APIView` class based views. +You can also set the content negotiation used for an individual view, or viewset, using the `APIView` class-based views. from myapp.negotiation import IgnoreClientContentNegotiation from rest_framework.response import Response diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 3e4b3e8be..df8cad42d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -98,7 +98,7 @@ Note that the exception handler will only be called for responses generated by r The **base class** for all exceptions raised inside an `APIView` class or `@api_view`. -To provide a custom exception, subclass `APIException` and set the `.status_code` and `.default_detail` properties on the class. +To provide a custom exception, subclass `APIException` and set the `.status_code`, `.default_detail`, and `default_code` attributes on the class. For example, if your API relies on a third party service that may sometimes be unreachable, you might want to implement an exception for the "503 Service Unavailable" HTTP response code. You could do this like so: @@ -107,10 +107,42 @@ For example, if your API relies on a third party service that may sometimes be u class ServiceUnavailable(APIException): status_code = 503 default_detail = 'Service temporarily unavailable, try again later.' + default_code = 'service_unavailable' + +#### Inspecting API exceptions + +There are a number of different properties available for inspecting the status +of an API exception. You can use these to build custom exception handling +for your project. + +The available attributes and methods are: + +* `.detail` - Return the textual description of the error. +* `.get_codes()` - Return the code identifier of the error. +* `.get_full_details()` - Return both the textual description and the code identifier. + +In most cases the error detail will be a simple item: + + >>> print(exc.detail) + You do not have permission to perform this action. + >>> print(exc.get_codes()) + permission_denied + >>> print(exc.get_full_details()) + {'message':'You do not have permission to perform this action.','code':'permission_denied'} + +In the case of validation errors the error detail will be either a list or +dictionary of items: + + >>> print(exc.detail) + {"name":"This field is required.","age":"A valid integer is required."} + >>> print(exc.get_codes()) + {"name":"required","age":"invalid"} + >>> print(exc.get_full_details()) + {"name":{"message":"This field is required.","code":"required"},"age":{"message":"A valid integer is required.","code":"invalid"}} ## ParseError -**Signature:** `ParseError(detail=None)` +**Signature:** `ParseError(detail=None, code=None)` Raised if the request contains malformed data when accessing `request.data`. @@ -118,7 +150,7 @@ By default this exception results in a response with the HTTP status code "400 B ## AuthenticationFailed -**Signature:** `AuthenticationFailed(detail=None)` +**Signature:** `AuthenticationFailed(detail=None, code=None)` Raised when an incoming request includes incorrect authentication. @@ -126,7 +158,7 @@ By default this exception results in a response with the HTTP status code "401 U ## NotAuthenticated -**Signature:** `NotAuthenticated(detail=None)` +**Signature:** `NotAuthenticated(detail=None, code=None)` Raised when an unauthenticated request fails the permission checks. @@ -134,7 +166,7 @@ By default this exception results in a response with the HTTP status code "401 U ## PermissionDenied -**Signature:** `PermissionDenied(detail=None)` +**Signature:** `PermissionDenied(detail=None, code=None)` Raised when an authenticated request fails the permission checks. @@ -142,7 +174,7 @@ By default this exception results in a response with the HTTP status code "403 F ## NotFound -**Signature:** `NotFound(detail=None)` +**Signature:** `NotFound(detail=None, code=None)` Raised when a resource does not exists at the given URL. This exception is equivalent to the standard `Http404` Django exception. @@ -150,7 +182,7 @@ By default this exception results in a response with the HTTP status code "404 N ## MethodNotAllowed -**Signature:** `MethodNotAllowed(method, detail=None)` +**Signature:** `MethodNotAllowed(method, detail=None, code=None)` Raised when an incoming request occurs that does not map to a handler method on the view. @@ -158,7 +190,7 @@ By default this exception results in a response with the HTTP status code "405 M ## NotAcceptable -**Signature:** `NotAcceptable(detail=None)` +**Signature:** `NotAcceptable(detail=None, code=None)` Raised when an incoming request occurs with an `Accept` header that cannot be satisfied by any of the available renderers. @@ -166,7 +198,7 @@ By default this exception results in a response with the HTTP status code "406 N ## UnsupportedMediaType -**Signature:** `UnsupportedMediaType(media_type, detail=None)` +**Signature:** `UnsupportedMediaType(media_type, detail=None, code=None)` Raised if there are no parsers that can handle the content type of the request data when accessing `request.data`. @@ -174,7 +206,7 @@ By default this exception results in a response with the HTTP status code "415 U ## Throttled -**Signature:** `Throttled(wait=None, detail=None)` +**Signature:** `Throttled(wait=None, detail=None, code=None)` Raised when an incoming request fails the throttling checks. @@ -182,7 +214,7 @@ By default this exception results in a response with the HTTP status code "429 T ## ValidationError -**Signature:** `ValidationError(detail)` +**Signature:** `ValidationError(detail, code=None)` The `ValidationError` exception is slightly different from the other `APIException` classes: diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b58d02898..17168b721 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -49,7 +49,9 @@ Defaults to `False` ### `default` -If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behavior is to not populate the attribute at all. +If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behaviour is to not populate the attribute at all. + +The `default` is not applied during partial update operations. In the partial update case only fields that are provided in the incoming data will have a validated value returned. May be set to a function or other callable, in which case the value will be evaluated each time it is used. When called, it will receive no arguments. If the callable has a `set_context` method, that will be called each time before getting the value with the field instance as only argument. This works the same way as for [validators](validators.md#using-set_context). @@ -261,9 +263,10 @@ Corresponds to `django.db.models.fields.DecimalField`. - `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. - `decimal_places` The number of decimal places to store with the number. -- `coerce_to_string` Set to `True` if string values should be returned for the representation, or `False` if `Decimal` objects should be returned. Defaults to the same value as the `COERCE_DECIMAL_TO_STRING` settings key, which will be `True` unless overridden. If `Decimal` objects are returned by the serializer, then the final output format will be determined by the renderer. +- `coerce_to_string` Set to `True` if string values should be returned for the representation, or `False` if `Decimal` objects should be returned. Defaults to the same value as the `COERCE_DECIMAL_TO_STRING` settings key, which will be `True` unless overridden. If `Decimal` objects are returned by the serializer, then the final output format will be determined by the renderer. Note that setting `localize` will force the value to `True`. - `max_value` Validate that the number provided is no greater than this value. - `min_value` Validate that the number provided is no less than this value. +- `localize` Set to `True` to enable localization of input and output based on the current locale. This will also force `coerce_to_string` to `True`. Defaults to `False`. Note that data formatting is enabled if you have set `USE_L10N=True` in your settings file. #### Example usage @@ -289,9 +292,9 @@ A date and time representation. Corresponds to `django.db.models.fields.DateTimeField`. -**Signature:** `DateTimeField(format=None, input_formats=None)` +**Signature:** `DateTimeField(format=api_settings.DATETIME_FORMAT, input_formats=None)` -* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. #### `DateTimeField` format strings. @@ -320,7 +323,7 @@ A date representation. Corresponds to `django.db.models.fields.DateField` -**Signature:** `DateField(format=None, input_formats=None)` +**Signature:** `DateField(format=api_settings.DATE_FORMAT, input_formats=None)` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATE_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `date` objects should be returned by `to_representation`. In this case the date encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. @@ -335,7 +338,7 @@ A time representation. Corresponds to `django.db.models.fields.TimeField` -**Signature:** `TimeField(format=None, input_formats=None)` +**Signature:** `TimeField(format=api_settings.TIME_FORMAT, input_formats=None)` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `TIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `time` objects should be returned by `to_representation`. In this case the time encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. @@ -485,7 +488,7 @@ This field is used by default with `ModelSerializer` when including field names **Signature**: `ReadOnlyField()` -For example, is `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`: +For example, if `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`: class AccountSerializer(serializers.ModelSerializer): class Meta: @@ -623,7 +626,6 @@ The `.fail()` method is a shortcut for raising `ValidationError` that takes a me def to_internal_value(self, data): if not isinstance(data, six.text_type): - msg = 'Incorrect type. Expected a string, but got %s' self.fail('incorrect_type', input_type=type(data).__name__) if not re.match(r'^rgb\([0-9]+,[0-9]+,[0-9]+\)$', data): diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index fcab15a79..1b49d3a73 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -89,24 +89,24 @@ Generic filters can also present themselves as HTML controls in the browsable AP ## Setting filter backends -The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. +The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. REST_FRAMEWORK = { - 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',) + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) } You can also set the filter backends on a per-view, or per-viewset basis, -using the `GenericAPIView` class based views. +using the `GenericAPIView` class-based views. + import django_filters from django.contrib.auth.models import User from myapp.serializers import UserSerializer - from rest_framework import filters from rest_framework import generics class UserListView(generics.ListAPIView): queryset = User.objects.all() serializer_class = UserSerializer - filter_backends = (filters.DjangoFilterBackend,) + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) ## Filtering and object lookups @@ -139,12 +139,27 @@ Note that you can use both an overridden `.get_queryset()` and generic filtering ## DjangoFilterBackend -The `DjangoFilterBackend` class supports highly customizable field filtering, using the [django-filter package][django-filter]. +The `django-filter` library includes a `DjangoFilterBackend` class which +supports highly customizable field filtering for REST framework. -To use REST framework's `DjangoFilterBackend`, first install `django-filter`. +To use `DjangoFilterBackend`, first install `django-filter`. pip install django-filter +You should now either add the filter backend to your settings: + + REST_FRAMEWORK = { + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) + } + +Or add the filter backend to an individual View or ViewSet. + + from django_filters.rest_framework import DjangoFilterBackend + + class UserListView(generics.ListAPIView): + ... + filter_backends = (DjangoFilterBackend,) + If you are using the browsable API or admin API you may also want to install `django-crispy-forms`, which will enhance the presentation of the filter forms in HTML views, by allowing them to render Bootstrap 3 HTML. pip install django-crispy-forms @@ -174,12 +189,11 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): - min_price = django_filters.NumberFilter(name="price", lookup_type='gte') - max_price = django_filters.NumberFilter(name="price", lookup_type='lte') + class ProductFilter(django_filters.rest_framework.FilterSet): + min_price = django_filters.NumberFilter(name="price", lookup_expr='gte') + max_price = django_filters.NumberFilter(name="price", lookup_expr='lte') class Meta: model = Product fields = ['category', 'in_stock', 'min_price', 'max_price'] @@ -187,7 +201,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_backends = (django_filters.rest_framework.DjangoFilterBackend,) filter_class = ProductFilter @@ -199,12 +213,12 @@ You can also span relationships using `django-filter`, let's assume that each product has foreign key to `Manufacturer` model, so we create filter that filters using `Manufacturer` name. For example: + import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): class Meta: model = Product fields = ['category', 'in_stock', 'manufacturer__name'] @@ -218,10 +232,9 @@ This is nice, but it exposes the Django's double underscore convention as part o import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): manufacturer = django_filters.CharFilter(name="manufacturer__name") class Meta: @@ -241,7 +254,6 @@ For more details on using filter sets see the [django-filter documentation][djan * By default filtering is not enabled. If you want to use `DjangoFilterBackend` remember to make sure it is installed by using the `'DEFAULT_FILTER_BACKENDS'` setting. * When using boolean fields, you should use the values `True` and `False` in the URL query parameters, rather than `0`, `1`, `true` or `false`. (The allowed boolean values are currently hardwired in Django's [NullBooleanSelect implementation][nullbooleanselect].) * `django-filter` supports filtering across relationships, using Django's double-underscore syntax. -* For Django 1.3 support, make sure to install `django-filter` version 0.5.4, as later versions drop support for 1.3. --- @@ -417,6 +429,12 @@ Generic filters may also present an interface in the browsable API. To do so you The method should return a rendered HTML string. +## Pagination & schemas + +You can also make the filter controls available to the schema autogeneration +that REST framework provides, by implementing a `get_schema_fields()` method, +which should return a list of `coreapi.Field` instances. + # Third party packages The following third party packages provide additional filter implementations. @@ -433,6 +451,10 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-url-filter][django-url-filter] provides a safe way to filter data via human-friendly URLs. It works very similar to DRF serializers and fields in a sense that they can be nested except they are called filtersets and filters. That provides easy way to filter related data. Also this library is generic-purpose so it can be used to filter other sources of data and not only Django `QuerySet`s. +## drf-url-filters + +[drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements. + [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html @@ -444,3 +466,4 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter +[drf-url-filter]: https://github.com/manjitkumar/drf-url-filters diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md index 13717b05f..05dde47f2 100644 --- a/docs/api-guide/format-suffixes.md +++ b/docs/api-guide/format-suffixes.md @@ -42,7 +42,7 @@ When using `format_suffix_patterns`, you must make sure to add the `'format'` ke def comment_list(request, format=None): # do stuff... -Or with class based views: +Or with class-based views: class CommentList(APIView): def get(self, request, format=None): diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index e6e300561..c368d0b46 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -7,7 +7,7 @@ source: mixins.py > > — [Django Documentation][cite] -One of the key benefits of class based views is the way they allow you to compose bits of reusable behavior. REST framework takes advantage of this by providing a number of pre-built views that provide for commonly used patterns. +One of the key benefits of class-based views is the way they allow you to compose bits of reusable behavior. REST framework takes advantage of this by providing a number of pre-built views that provide for commonly used patterns. The generic views provided by REST framework allow you to quickly build API views that map closely to your database models. @@ -220,8 +220,6 @@ Also provides a `.partial_update(request, *args, **kwargs)` method, which is sim If an object is updated this returns a `200 OK` response, with a serialized representation of the object as the body of the response. -If an object is created, for example when making a `DELETE` request followed by a `PUT` request to the same URL, this returns a `201 Created` response, with a serialized representation of the object as the body of the response. - If the request data provided for updating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response. ## DestroyModelMixin @@ -330,7 +328,8 @@ For example, if you need to lookup objects based on multiple fields in the URL c queryset = self.filter_queryset(queryset) # Apply any filter backends filter = {} for field in self.lookup_fields: - filter[field] = self.kwargs[field] + if self.kwargs[field]: # Ignore empty fields. + filter[field] = self.kwargs[field] return get_object_or_404(queryset, **filter) # Lookup the object You can then simply apply this mixin to a view or viewset anytime you need to apply the custom behavior. diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 0dd935ba3..f82614eca 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -21,12 +21,15 @@ Pagination can be turned off by setting the pagination class to `None`. ## Setting the pagination style -The default pagination style may be set globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example, to use the built-in limit/offset pagination, you would do: +The default pagination style may be set globally, using the `DEFAULT_PAGINATION_CLASS` and `PAGE_SIZE` setting keys. For example, to use the built-in limit/offset pagination, you would do something like this: REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination' + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', + 'PAGE_SIZE': 100 } +Note that you need to set both the pagination class, and the page size that should be used. + You can also set the pagination class on an individual view by using the `pagination_class` attribute. Typically you'll want to use the same pagination style throughout your API, although you might want to vary individual aspects of the pagination, such as default or maximum page size, on a per-view basis. ## Modifying the pagination style @@ -109,7 +112,7 @@ To set these attributes you should override the `PageNumberPagination` class, an ## LimitOffsetPagination -This pagination style mirrors the syntax used when looking up multiple database records. The client includes both a "limit" and an +This pagination style mirrors the syntax used when looking up multiple database records. The client includes both a "limit" and an "offset" query parameter. The limit indicates the maximum number of items to return, and is equivalent to the `page_size` in other styles. The offset indicates the starting position of the query in relation to the complete set of unpaginated items. **Request**: @@ -273,6 +276,12 @@ To have your custom pagination class be used by default, use the `DEFAULT_PAGINA API responses for list endpoints will now include a `Link` header, instead of including the pagination links as part of the body of the response, for example: +## Pagination & schemas + +You can also make the pagination controls available to the schema autogeneration +that REST framework provides, by implementing a `get_schema_fields()` method, +which should return a list of `coreapi.Field` instances. + --- ![Link Header][link-header] @@ -312,9 +321,14 @@ The following third party packages are also available. The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` mixin class][paginate-by-max-mixin] that allows your API clients to specify `?page_size=max` to obtain the maximum allowed page size. +## drf-proxy-pagination + +The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter. + [cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ [github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/ [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin +[drf-proxy-pagination]: https://github.com/tuffnatty/drf-proxy-pagination [disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index e1e6d1d65..ef2859fe1 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -35,7 +35,7 @@ The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSE } You can also set the parsers used for an individual view, or viewset, -using the `APIView` class based views. +using the `APIView` class-based views. from rest_framework.parsers import JSONParser from rest_framework.response import Response diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 5386e4df6..7cdb59531 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -71,7 +71,7 @@ If not specified, this setting defaults to allowing unrestricted access: ) You can also set the authentication policy on a per-view, or per-viewset basis, -using the `APIView` class based views. +using the `APIView` class-based views. from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response @@ -92,7 +92,7 @@ Or, if you're using the `@api_view` decorator with function based views. from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response - @api_view('GET') + @api_view(['GET']) @permission_classes((IsAuthenticated, )) def example_view(request, format=None): content = { @@ -132,7 +132,7 @@ This permission is suitable if you want to your API to allow read permissions to ## DjangoModelPermissions -This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. This permission must only be applied to views that has a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. +This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. This permission must only be applied to views that have a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. * `POST` requests require the user to have the `add` permission on the model. * `PUT` and `PATCH` requests require the user to have the `change` permission on the model. @@ -261,6 +261,10 @@ The [REST Condition][rest-condition] package is another extension for building c The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to define different permissions for individual default and custom actions. This package is made for apps with permissions that are derived from relationships defined in the app's data model. It also supports permission checks being returned to a client app through the API's serializer. Additionally it supports adding permissions to the default and custom list actions to restrict the data they retrive per user. +## Django Rest Framework Roles + +The [Django Rest Framework Roles][django-rest-framework-roles] package makes it easier to parameterize your API over multiple types of users. + [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md @@ -275,3 +279,4 @@ The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to [composed-permissions]: https://github.com/niwibe/djangorestframework-composed-permissions [rest-condition]: https://github.com/caxap/rest_condition [dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions +[django-rest-framework-roles]: https://github.com/computer-lab/django-rest-framework-roles diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 8695b2c1e..aabe49412 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -39,7 +39,7 @@ In order to explain the various types of relational fields, we'll use a couple o artist = models.CharField(max_length=100) class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) order = models.IntegerField() title = models.CharField(max_length=100) duration = models.IntegerField() @@ -99,8 +99,8 @@ For example, the following serializer: Would serialize to a representation like this: { - 'album_name': 'The Roots', - 'artist': 'Undun', + 'album_name': 'Undun', + 'artist': 'The Roots', 'tracks': [ 89, 90, @@ -286,7 +286,7 @@ Would serialize to a nested representation like this: ], } -# Writable nested serializers +## Writable nested serializers By default nested serializers are read-only. If you want to support write-operations to a nested serializer field you'll need to create `create()` and/or `update()` methods in order to explicitly specify how the child relationships should be saved. @@ -324,8 +324,14 @@ By default nested serializers are read-only. If you want to support write-operat >>> serializer.save() +--- + # Custom relational fields +In rare cases where none of the existing relational styles fit the representation you need, +you can implement a completely custom relational field, that describes exactly how the +output representation should be generated from the model instance. + 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. If you want to implement a read-write relational field, you must also implement the `.to_internal_value(self, data)` method. @@ -457,6 +463,8 @@ There are two keyword arguments you can use to control this behavior: - `html_cutoff` - If set this will be the maximum number of choices that will be displayed by a HTML select drop down. Set to `None` to disable any limiting. Defaults to `1000`. - `html_cutoff_text` - If set this will display a textual indicator if the maximum number of items have been cutoff in an HTML select drop down. Defaults to `"More than {count} items…"` +You can also control these globally using the settings `HTML_SELECT_CUTOFF` and `HTML_SELECT_CUTOFF_TEXT`. + In cases where the cutoff is being enforced you may want to instead use a plain input field in the HTML form. You can do so using the `style` keyword argument. For example: assigned_to = serializers.SlugRelatedField( @@ -476,7 +484,7 @@ Note that reverse relationships are not automatically included by the `ModelSeri You'll normally want to ensure that you've set an appropriate `related_name` argument on the relationship, that you can use as the field name. For example: class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) ... If you have not set a related name for the reverse relationship, you'll need to use the automatically generated related name in the `fields` argument. For example: @@ -500,7 +508,7 @@ For example, given the following model for a tag, which has a generic relationsh See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ """ tag_name = models.SlugField() - content_type = models.ForeignKey(ContentType) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) object_id = models.PositiveIntegerField() tagged_object = GenericForeignKey('content_type', 'object_id') diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index f04770a36..a95778350 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -28,7 +28,7 @@ The default set of renderers may be set globally, using the `DEFAULT_RENDERER_CL } You can also set the renderers used for an individual view, or viewset, -using the `APIView` class based views. +using the `APIView` class-based views. from django.contrib.auth.models import User from rest_framework.renderers import JSONRenderer diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 71fb83f9e..35d88e2db 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -23,7 +23,7 @@ There's no requirement for you to use them, but if you do then the self-describi **Signature:** `reverse(viewname, *args, **kwargs)` -Has the same behavior as [`django.core.urlresolvers.reverse`][reverse], except that it returns a fully qualified URL, using the request to determine the host and port. +Has the same behavior as [`django.urls.reverse`][reverse], except that it returns a fully qualified URL, using the request to determine the host and port. You should **include the request as a keyword argument** to the function, for example: @@ -44,7 +44,7 @@ You should **include the request as a keyword argument** to the function, for ex **Signature:** `reverse_lazy(viewname, *args, **kwargs)` -Has the same behavior as [`django.core.urlresolvers.reverse_lazy`][reverse-lazy], except that it returns a fully qualified URL, using the request to determine the host and port. +Has the same behavior as [`django.urls.reverse_lazy`][reverse-lazy], except that it returns a fully qualified URL, using the request to determine the host and port. As with the `reverse` function, you should **include the request as a keyword argument** to the function, for example: diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 9fa1ba2e3..7da619034 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -68,7 +68,7 @@ has to be rendered into the actual bytes that are used in the response. REST framework includes a renderer class for handling this media type, which is available as `renderers.CoreJSONRenderer`. -Other schema formats such as [Open API][open-api] (Formerly "Swagger"), +Other schema formats such as [Open API][open-api] ("Swagger"), [JSON HyperSchema][json-hyperschema], or [API Blueprint][api-blueprint] can also be supported by implementing a custom renderer class. @@ -102,15 +102,20 @@ REST framework includes functionality for auto-generating a schema, or allows you to specify one explicitly. There are a few different ways to add a schema to your API, depending on exactly what you need. -## Using DefaultRouter +## The get_schema_view shortcut -If you're using `DefaultRouter` then you can include an auto-generated schema, -simply by adding a `schema_title` argument to the router. +The simplest way to include a schema in your project is to use the +`get_schema_view()` function. - router = DefaultRouter(schema_title='Server Monitoring API') + schema_view = get_schema_view(title="Server Monitoring API") -The schema will be included at the root URL, `/`, and presented to clients -that include the Core JSON media type in their `Accept` header. + urlpatterns = [ + url('^$', schema_view), + ... + ] + +Once the view has been added, you'll be able to make API requests to retrieve +the auto-generated schema definition. $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json HTTP/1.0 200 OK @@ -125,18 +130,43 @@ that include the Core JSON media type in their `Accept` header. ... } -This is a great zero-configuration option for when you want to get up and -running really quickly. If you want a little more flexibility over the -schema output then you'll need to consider using `SchemaGenerator` instead. +The arguments to `get_schema_view()` are: -## Using SchemaGenerator +#### `title` -The most common way to add a schema to your API is to use the `SchemaGenerator` -class to auto-generate the `Document` instance, and to return that from a view. +May be used to provide a descriptive title for the schema definition. + +#### `url` + +May be used to pass a canonical URL for the schema. + + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/' + ) + +#### `renderer_classes` + +May be used to pass the set of renderer classes that can be used to render the API root endpoint. + + from rest_framework.renderers import CoreJSONRenderer + from my_custom_package import APIBlueprintRenderer + + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/', + renderer_classes=[CoreJSONRenderer, APIBlueprintRenderer] + ) + +## Using an explicit schema view + +If you need a little more control than the `get_schema_view()` shortcut gives you, +then you can use the `SchemaGenerator` class directly to auto-generate the +`Document` instance, and to return that from a view. This option gives you the flexibility of setting up the schema endpoint with whatever behaviour you want. For example, you can apply different -permission, throttling or authentication policies to the schema endpoint. +permission, throttling, or authentication policies to the schema endpoint. Here's an example of using `SchemaGenerator` together with a view to return the schema. @@ -144,14 +174,15 @@ return the schema. **views.py:** from rest_framework.decorators import api_view, renderer_classes - from rest_framework import renderers, schemas + from rest_framework import renderers, response, schemas generator = schemas.SchemaGenerator(title='Bookings API') @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema() + schema = generator.get_schema(request) + return response.Response(schema) **urls.py:** @@ -172,7 +203,8 @@ you need to pass the `request` argument to the `get_schema()` method, like so: @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema(request=request) + generator = schemas.SchemaGenerator(title='Bookings API') + return response.Response(generator.get_schema(request=request)) ## Explicit schema definition @@ -183,7 +215,7 @@ representation. import coreapi from rest_framework.decorators import api_view, renderer_classes - from rest_framework import renderers + from rest_framework import renderers, response schema = coreapi.Document( title='Bookings API', @@ -195,7 +227,7 @@ representation. @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return schema + return response.Response(schema) ## Static schema file @@ -210,6 +242,95 @@ You could then either: --- +# Schemas as documentation + +One common usage of API schemas is to use them to build documentation pages. + +The schema generation in REST framework uses docstrings to automatically +populate descriptions in the schema document. + +These descriptions will be based on: + +* The corresponding method docstring if one exists. +* A named section within the class docstring, which can be either single line or multi-line. +* The class docstring. + +## Examples + +An `APIView`, with an explicit method docstring. + + class ListUsernames(APIView): + def get(self, request): + """ + Return a list of all user names in the system. + """ + usernames = [user.username for user in User.objects.all()] + return Response(usernames) + +A `ViewSet`, with an explict action docstring. + + class ListUsernames(ViewSet): + def list(self, request): + """ + Return a list of all user names in the system. + """ + usernames = [user.username for user in User.objects.all()] + return Response(usernames) + +A generic view with sections in the class docstring, using single-line style. + + class UserList(generics.ListCreateAPIView): + """ + get: Create a new user. + post: List all the users. + """ + queryset = User.objects.all() + serializer_class = UserSerializer + permission_classes = (IsAdminUser,) + +A generic viewset with sections in the class docstring, using multi-line style. + + class UserViewSet(viewsets.ModelViewSet): + """ + API endpoint that allows users to be viewed or edited. + + retrieve: + Return a user instance. + + list: + Return all users, ordered by most recently joined. + """ + queryset = User.objects.all().order_by('-date_joined') + serializer_class = UserSerializer + +--- + +# Alternate schema formats + +In order to support an alternate schema format, you need to implement a custom renderer +class that handles converting a `Document` instance into a bytestring representation. + +If there is a Core API codec package that supports encoding into the format you +want to use then implementing the renderer class can be done by using the codec. + +## Example + +For example, the `openapi_codec` package provides support for encoding or decoding +to the Open API ("Swagger") format: + + from rest_framework import renderers + from openapi_codec import OpenAPICodec + + class SwaggerRenderer(renderers.BaseRenderer): + media_type = 'application/openapi+json' + format = 'swagger' + + def render(self, data, media_type=None, renderer_context=None): + codec = OpenAPICodec() + return codec.dump(data) + +--- + # API Reference ## SchemaGenerator @@ -223,22 +344,63 @@ Typically you'll instantiate `SchemaGenerator` with a single argument, like so: Arguments: -* `title` - The name of the API. **required** +* `title` **required** - The name of the API. +* `url` - The root URL of the API schema. This option is not required unless the schema is included under path prefix. * `patterns` - A list of URLs to inspect when generating the schema. Defaults to the project's URL conf. * `urlconf` - A URL conf module name to use when generating the schema. Defaults to `settings.ROOT_URLCONF`. -### get_schema() +### get_schema(self, request) Returns a `coreapi.Document` instance that represents the API schema. @api_view @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema() + generator = schemas.SchemaGenerator(title='Bookings API') + return Response(generator.get_schema()) -Arguments: +The `request` argument is optional, and may be used if you want to apply per-user +permissions to the resulting schema generation. -* `request` - The incoming request. Optionally used if you want to apply per-user permissions to the schema-generation. +### get_links(self, request) + +Return a nested dictionary containing all the links that should be included in the API schema. + +This is a good point to override if you want to modify the resulting structure of the generated schema, +as you can build a new dictionary with a different layout. + +### get_link(self, path, method, view) + +Returns a `coreapi.Link` instance corresponding to the given view. + +You can override this if you need to provide custom behaviors for particular views. + +### get_description(self, path, method, view) + +Returns a string to use as the link description. By default this is based on the +view docstring as described in the "Schemas as Documentation" section above. + +### get_encoding(self, path, method, view) + +Returns a string to indicate the encoding for any request body, when interacting +with the given view. Eg. `'application/json'`. May return a blank string for views +that do not expect a request body. + +### get_path_fields(self, path, method, view): + +Return a list of `coreapi.Link()` instances. One for each path parameter in the URL. + +### get_serializer_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances. One for each field in the serializer class used by the view. + +### get_pagination_fields(self, path, method, view + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method on any pagination class used by the view. + +### get_filter_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method of any filter classes used by the view. --- diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 038a4d6b9..290e32f4f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -442,7 +442,7 @@ Declaring a `ModelSerializer` looks like this: By default, all the model fields on the class will be mapped to a corresponding serializer fields. -Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as described below. +Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as specified in the [serializer relations][relations] documentation. #### Inspecting a `ModelSerializer` @@ -876,7 +876,7 @@ There are four methods that can be overridden, depending on what functionality y * `.to_internal_value()` - Override this to support deserialization, for write operations. * `.create()` and `.update()` - Override either or both of these to support saving instances. -Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class based views exactly as you would for a regular `Serializer` or `ModelSerializer`. +Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class-based views exactly as you would for a regular `Serializer` or `ModelSerializer`. The only difference you'll notice when doing so is the `BaseSerializer` classes will not generate HTML forms in the browsable API. This is because the data they return does not include all the field information that would allow each field to be rendered into a suitable HTML input. @@ -1089,6 +1089,7 @@ The following third party packages are also available. The [django-rest-marshmallow][django-rest-marshmallow] package provides an alternative implementation for serializers, using the python [marshmallow][marshmallow] library. It exposes the same API as the REST framework serializers, and can be used as a drop-in replacement in some use-cases. ## Serpy + The [serpy][serpy] package is an alternative implementation for serializers that is built for speed. [Serpy][serpy] serializes complex datatypes to simple native types. The native types can be easily converted to JSON or any other format needed. ## MongoengineModelSerializer @@ -1107,7 +1108,12 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelViewSet interfaces, adding API query parameters for filtering, sorting, and including / excluding all fields and relationships defined by your serializers. +## Dynamic Fields Mixin + +The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamically limit the fields per serializer to a subset specified by an URL parameter. + ## HTML JSON Forms + The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `
` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion @@ -1124,3 +1130,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [dynamic-rest]: https://github.com/AltSchool/dynamic-rest [html-json-forms]: https://github.com/wq/html-json-forms [json-form-spec]: https://www.w3.org/TR/html-json-forms/ +[drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index f218d00ad..58ceeeeb4 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -36,7 +36,7 @@ The `api_settings` object will check for any user-defined settings, and otherwis ## API policy settings -*The following settings control the basic API policies, and are applied to every `APIView` class based view, or `@api_view` function based view.* +*The following settings control the basic API policies, and are applied to every `APIView` class-based view, or `@api_view` function based view.* #### DEFAULT_RENDERER_CLASSES @@ -98,7 +98,7 @@ Default: `'rest_framework.negotiation.DefaultContentNegotiation'` ## Generic view settings -*The following settings control the behavior of the generic class based views.* +*The following settings control the behavior of the generic class-based views.* #### DEFAULT_PAGINATION_SERIALIZER_CLASS @@ -181,7 +181,7 @@ If set, this value will restrict the set of versions that may be returned by the Default: `None` -#### VERSION_PARAMETER +#### VERSION_PARAM The string that should used for any versioning parameters, such as in the media type or URL query parameters. @@ -234,6 +234,28 @@ Default: --- +## Schema generation controls + +#### SCHEMA_COERCE_PATH_PK + +If set, this maps the `'pk'` identifier in the URL conf onto the actual field +name when generating a schema path parameter. Typically this will be `'id'`. +This gives a more suitable representation as "primary key" is an implementation +detail, wheras "identifier" is a more general concept. + +Default: `True` + +#### SCHEMA_COERCE_METHOD_NAMES + +If set, this is used to map internal viewset method names onto external action +names used in the schema generation. This allows us to generate names that +are more suitable for an external representation than those that are used +internally in the codebase. + +Default: `{'retrieve': 'read', 'destroy': 'delete'}` + +--- + ## Content type controls #### URL_FORMAT_OVERRIDE @@ -382,6 +404,22 @@ This should be a function with the following signature: Default: `'rest_framework.views.get_view_description'` +## HTML Select Field cutoffs + +Global settings for [select field cutoffs for rendering relational fields](relations.md#select-field-cutoffs) in the browsable API. + +#### HTML_SELECT_CUTOFF + +Global setting for the `html_cutoff` value. Must be an integer. + +Default: 1000 + +#### HTML_SELECT_CUTOFF_TEXT + +A string representing a global setting for `html_cutoff_text`. + +Default: `"More than {count} items..."` + --- ## Miscellaneous settings diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md index 398c04804..f6ec3598f 100644 --- a/docs/api-guide/status-codes.md +++ b/docs/api-guide/status-codes.md @@ -50,6 +50,7 @@ This class of status code indicates that the client's request was successfully r HTTP_204_NO_CONTENT HTTP_205_RESET_CONTENT HTTP_206_PARTIAL_CONTENT + HTTP_207_MULTI_STATUS ## Redirection - 3xx @@ -86,6 +87,9 @@ The 4xx class of status code is intended for cases in which the client seems to HTTP_415_UNSUPPORTED_MEDIA_TYPE HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE HTTP_417_EXPECTATION_FAILED + HTTP_422_UNPROCESSABLE_ENTITY + HTTP_423_LOCKED + HTTP_424_FAILED_DEPENDENCY HTTP_428_PRECONDITION_REQUIRED HTTP_429_TOO_MANY_REQUESTS HTTP_431_REQUEST_HEADER_FIELDS_TOO_LARGE @@ -101,6 +105,7 @@ Response status codes beginning with the digit "5" indicate cases in which the s HTTP_503_SERVICE_UNAVAILABLE HTTP_504_GATEWAY_TIMEOUT HTTP_505_HTTP_VERSION_NOT_SUPPORTED + HTTP_507_INSUFFICIENT_STORAGE HTTP_511_NETWORK_AUTHENTICATION_REQUIRED ## Helper functions diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 69da7d105..1f8c89233 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -184,6 +184,99 @@ As usual CSRF validation will only apply to any session authenticated views. Th --- +# RequestsClient + +REST framework also includes a client for interacting with your application +using the popular Python library, `requests`. + +This exposes exactly the same interface as if you were using a requests session +directly. + + client = RequestsClient() + response = client.get('http://testserver/users/') + assert response.status_code == 200 + +Note that the requests client requires you to pass fully qualified URLs. + +## Headers & Authentication + +Custom headers and authentication credentials can be provided in the same way +as [when using a standard `requests.Session` instance](http://docs.python-requests.org/en/master/user/advanced/#session-objects). + + from requests.auth import HTTPBasicAuth + + client.auth = HTTPBasicAuth('user', 'pass') + client.headers.update({'x-test': 'true'}) + +## CSRF + +If you're using `SessionAuthentication` then you'll need to include a CSRF token +for any `POST`, `PUT`, `PATCH` or `DELETE` requests. + +You can do so by following the same flow that a JavaScript based client would use. +First make a `GET` request in order to obtain a CRSF token, then present that +token in the following request. + +For example... + + client = RequestsClient() + + # Obtain a CSRF token. + response = client.get('/homepage/') + assert response.status_code == 200 + csrftoken = response.cookies['csrftoken'] + + # Interact with the API. + response = client.post('/organisations/', json={ + 'name': 'MegaCorp', + 'status': 'active' + }, headers={'X-CSRFToken': csrftoken}) + assert response.status_code == 200 + +## Live tests + +With careful usage both the `RequestsClient` and the `CoreAPIClient` provide +the ability to write test cases that can run either in development, or be run +directly against your staging server or production environment. + +Using this style to create basic tests of a few core piece of functionality is +a powerful way to validate your live service. Doing so may require some careful +attention to setup and teardown to ensure that the tests run in a way that they +do not directly affect customer data. + +--- + +# CoreAPIClient + +The CoreAPIClient allows you to interact with your API using the Python +`coreapi` client library. + + # Fetch the API schema + client = CoreAPIClient() + schema = client.get('http://testserver/schema/') + + # Create a new organisation + params = {'name': 'MegaCorp', 'status': 'active'} + client.action(schema, ['organisations', 'create'], params) + + # Ensure that the organisation exists in the listing + data = client.action(schema, ['organisations', 'list']) + assert(len(data) == 1) + assert(data == [{'name': 'MegaCorp', 'status': 'active'}]) + +## Headers & Authentication + +Custom headers and authentication may be used with `CoreAPIClient` in a +similar way as with `RequestsClient`. + + from requests.auth import HTTPBasicAuth + + client = CoreAPIClient() + client.session.auth = HTTPBasicAuth('user', 'pass') + client.session.headers.update({'x-test': 'true'}) + +--- + # Test cases REST framework includes the following test case classes, that mirror the existing Django test case classes, but use `APIClient` instead of Django's default `Client`. @@ -197,7 +290,7 @@ REST framework includes the following test case classes, that mirror the existin You can use any of REST framework's test case classes as you would for the regular Django test case classes. The `self.client` attribute will be an `APIClient` instance. - from django.core.urlresolvers import reverse + from django.urls import reverse from rest_framework import status from rest_framework.test import APITestCase from myproject.apps.core.models import Account diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 36753aafc..da4d5f725 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -41,7 +41,7 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. You can also set the throttling policy on a per-view or per-viewset basis, -using the `APIView` class based views. +using the `APIView` class-based views. from rest_framework.response import Response from rest_framework.throttling import UserRateThrottle @@ -184,9 +184,11 @@ If the `.wait()` method is implemented and the request is throttled, then a `Ret The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests. + import random + class RandomRateThrottle(throttling.BaseThrottle): def allow_request(self, request, view): - return random.randint(1, 10) == 1 + return random.randint(1, 10) != 1 [cite]: https://dev.twitter.com/docs/error-codes-responses [permissions]: permissions.md diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 2c3d15676..9df15ec15 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -61,9 +61,12 @@ It takes a single required argument, and an optional `messages` argument: * `queryset` *required* - This is the queryset against which uniqueness should be enforced. * `message` - The error message that should be used when validation fails. +* `lookup` - The lookup used to find an existing instance with the value being validated. Defaults to `'exact'`. This validator should be applied to *serializer fields*, like so: + from rest_framework.validators import UniqueValidator + slug = SlugField( max_length=100, validators=[UniqueValidator(queryset=BlogPost.objects.all())] @@ -80,6 +83,8 @@ It has two required arguments, and a single optional `messages` argument: The validator should be applied to *serializer classes*, like so: + from rest_framework.validators import UniqueTogetherValidator + class ExampleSerializer(serializers.Serializer): # ... class Meta: @@ -114,6 +119,8 @@ These validators can be used to enforce the `unique_for_date`, `unique_for_month The validator should be applied to *serializer classes*, like so: + from rest_framework.validators import UniqueForYearValidator + class ExampleSerializer(serializers.Serializer): # ... class Meta: @@ -183,7 +190,7 @@ It takes a single argument, which is the default value or callable that should b created_at = serializers.DateTimeField( read_only=True, - default=CreateOnlyDefault(timezone.now) + default=serializers.CreateOnlyDefault(timezone.now) ) --- @@ -265,9 +272,9 @@ A validator may be any callable that raises a `serializers.ValidationError` on f if value % 2 != 0: raise serializers.ValidationError('This field must be an even number.') -## Class based +## Class-based -To write a class based validator, use the `__call__` method. Class based validators are useful as they allow you to parameterize and reuse behavior. +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(object): def __init__(self, base): @@ -280,7 +287,7 @@ To write a class based validator, use the `__call__` method. Class based validat #### Using `set_context()` -In some advanced cases you might want a validator to be passed the serializer field it is being used with as additional context. You can do so by declaring a `set_context` method on a class based validator. +In some advanced cases you might want a validator to be passed the serializer field it is being used with as additional context. You can do so by declaring a `set_context` method on a class-based validator. def set_context(self, serializer_field): # Determine if this is an update or a create operation. diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index 54aa0170d..29672c96e 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -71,8 +71,8 @@ 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. 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_PARAM`. The string that should used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`. +* `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 is 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 (unless it is `None`). Defaults to `None`. +* `VERSION_PARAM`. The string that should be 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`: diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 291fe7376..55f6664e0 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -1,9 +1,9 @@ source: decorators.py views.py -# Class Based Views +# Class-based Views -> Django's class based views are a welcome departure from the old-style views. +> Django's class-based views are a welcome departure from the old-style views. > > — [Reinout van Rees][cite] @@ -119,7 +119,7 @@ You won't typically need to override this method. # Function Based Views -> Saying [that Class based views] is always the superior solution is a mistake. +> Saying [that class-based views] is always the superior solution is a mistake. > > — [Nick Coghlan][cite2] @@ -127,7 +127,7 @@ REST framework also allows you to work with regular function based views. It pr ## @api_view() -**Signature:** `@api_view(http_method_names=['GET'])` +**Signature:** `@api_view(http_method_names=['GET'], exclude_from_schema=False)` The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to. For example, this is how you would write a very simple view that just manually returns some data: @@ -139,7 +139,7 @@ The core of this functionality is the `api_view` decorator, which takes a list o This view will use the default renderers, parsers, authentication classes etc specified in the [settings]. -By default only `GET` methods will be accepted. Other methods will respond with "405 Method Not Allowed". To alter this behavior, specify which methods the view allows, like so: +By default only `GET` methods will be accepted. Other methods will respond with "405 Method Not Allowed". To alter this behaviour, specify which methods the view allows, like so: @api_view(['GET', 'POST']) def hello_world(request): @@ -147,6 +147,13 @@ By default only `GET` methods will be accepted. Other methods will respond with return Response({"message": "Got some data!", "data": request.data}) return Response({"message": "Hello, world!"}) +You can also mark an API view as being omitted from any [auto-generated schema][schemas], +using the `exclude_from_schema` argument.: + + @api_view(['GET'], exclude_from_schema=True) + def api_docs(request): + ... + ## API policy decorators To override the default settings, REST framework provides a set of additional decorators which can be added to your views. These must come *after* (below) the `@api_view` decorator. For example, to create a view that uses a [throttle][throttling] to ensure it can only be called once per day by a particular user, use the `@throttle_classes` decorator, passing a list of throttle classes: @@ -178,3 +185,4 @@ Each of these decorators takes a single argument which must be a list or tuple o [cite2]: http://www.boredomandlaziness.org/2012/05/djangos-cbvs-are-not-mistake-but.html [settings]: settings.md [throttling]: throttling.md +[schemas]: schemas.md diff --git a/docs/img/premium/machinalis-readme.png b/docs/img/premium/machinalis-readme.png new file mode 100644 index 000000000..4bdb020c2 Binary files /dev/null and b/docs/img/premium/machinalis-readme.png differ diff --git a/docs/img/premium/rover-readme.png b/docs/img/premium/rover-readme.png index eba3bdd02..c9865f2a9 100644 Binary files a/docs/img/premium/rover-readme.png and b/docs/img/premium/rover-readme.png differ diff --git a/docs/img/premium/sentry-readme.png b/docs/img/premium/sentry-readme.png index 87a4a5b1e..1e869f3b1 100644 Binary files a/docs/img/premium/sentry-readme.png and b/docs/img/premium/sentry-readme.png differ diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png new file mode 100644 index 000000000..955c11429 Binary files /dev/null and b/docs/img/premium/stream-readme.png differ diff --git a/docs/img/raml.png b/docs/img/raml.png new file mode 100644 index 000000000..87790dc48 Binary files /dev/null and b/docs/img/raml.png differ diff --git a/docs/index.md b/docs/index.md index 072d80c66..9b0913f00 100644 --- a/docs/index.md +++ b/docs/index.md @@ -68,17 +68,17 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're a little over 43% of the way towards achieving that. -*Every single sign-up makes a significant impact.* Taking out a -[basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. +*Every single sign-up makes a significant impact towards making that possible.*
-*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/) and [Sentry](https://getsentry.com/welcome/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* --- @@ -87,11 +87,11 @@ Right now we're a little over 43% of the way towards achieving that. REST framework requires the following: * Python (2.7, 3.2, 3.3, 3.4, 3.5) -* Django (1.7+, 1.8, 1.9) +* Django (1.8, 1.9, 1.10) The following packages are optional: -* [coreapi][coreapi] (1.21.0+) - Schema generation support. +* [coreapi][coreapi] (1.32.0+) - Schema generation support. * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [django-filter][django-filter] (0.9.2+) - Filtering support. * [django-crispy-forms][django-crispy-forms] - Improved HTML display for filtering. @@ -184,10 +184,11 @@ The tutorial will walk you through the building blocks that make up REST framewo * [1 - Serialization][tut-1] * [2 - Requests & Responses][tut-2] -* [3 - Class based views][tut-3] +* [3 - Class-based views][tut-3] * [4 - Authentication & permissions][tut-4] * [5 - Relationships & hyperlinked APIs][tut-5] * [6 - Viewsets & routers][tut-6] +* [7 - Schemas & client libraries][tut-7] There is a live example API of the finished tutorial API for testing purposes, [available here][sandbox]. @@ -242,6 +243,8 @@ General guides to using REST framework. * [3.1 Announcement][3.1-announcement] * [3.2 Announcement][3.2-announcement] * [3.3 Announcement][3.3-announcement] +* [3.4 Announcement][3.4-announcement] +* [3.5 Announcement][3.5-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Mozilla Grant][mozilla-grant] * [Funding][funding] @@ -344,7 +347,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [versioning]: api-guide/versioning.md [contentnegotiation]: api-guide/content-negotiation.md [metadata]: api-guide/metadata.md -[schemas]: 'api-guide/schemas.md' +[schemas]: api-guide/schemas.md [formatsuffixes]: api-guide/format-suffixes.md [reverse]: api-guide/reverse.md [exceptions]: api-guide/exceptions.md @@ -367,6 +370,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.1-announcement]: topics/3.1-announcement.md [3.2-announcement]: topics/3.2-announcement.md [3.3-announcement]: topics/3.3-announcement.md +[3.4-announcement]: topics/3.4-announcement.md +[3.5-announcement]: topics/3.5-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index 21d9f1dbc..d9bab39dc 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -6,7 +6,7 @@ REST framework 2.3 makes it even quicker and easier to build your Web APIs. The 2.3 release introduces the [ViewSet][viewset] and [Router][router] classes. -A viewset is simply a type of class based view that allows you to group multiple views into a single common class. +A viewset is simply a type of class-based view that allows you to group multiple views into a single common class. Routers allow you to automatically determine the URLconf for your viewset classes. diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 89f9e8001..e6cbf7238 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -426,7 +426,7 @@ There are four methods that can be overridden, depending on what functionality y * `.to_internal_value()` - Override this to support deserialization, for write operations. * `.create()` and `.update()` - Override either or both of these to support saving instances. -Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class based views exactly as you would for a regular `Serializer` or `ModelSerializer`. +Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class-based views exactly as you would for a regular `Serializer` or `ModelSerializer`. The only difference you'll notice when doing so is the `BaseSerializer` classes will not generate HTML forms in the browsable API. This is because the data they return does not include all the field information that would allow each field to be rendered into a suitable HTML input. @@ -801,7 +801,7 @@ This change means that you can now easily customize the style of error responses ## The metadata API -Behavior for dealing with `OPTIONS` requests was previously built directly into the class based views. This has now been properly separated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. +Behavior for dealing with `OPTIONS` requests was previously built directly into the class-based views. This has now been properly separated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. This makes it far easier to use a different style for `OPTIONS` responses throughout your API, and makes it possible to create third-party metadata policies. diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md new file mode 100644 index 000000000..69343c75e --- /dev/null +++ b/docs/topics/3.4-announcement.md @@ -0,0 +1,194 @@ + + +# Django REST framework 3.4 + +The 3.4 release is the first in a planned series that will be addressing schema +generation, hypermedia support, API clients, and finally realtime support. + +--- + +## Funding + +The 3.4 release has been made possible a recent [Mozilla grant][moss], and by our +[collaborative funding model][funding]. If you use REST framework commercially, and would +like to see this work continue, we strongly encourage you to invest in its +continued development by **[signing up for a paid plan][funding]**. + +The initial aim is to provide a single full-time position on REST framework. +Right now we're over 60% of the way towards achieving that. +*Every single sign-up makes a significant impact.* + + +
+ +*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).* + +--- + +## Schemas & client libraries + +REST framework 3.4 brings built-in support for generating API schemas. + +We provide this support by using [Core API][core-api], a Document Object Model +for describing APIs. + +Because Core API represents the API schema in an format-independent +manner, we're able to render the Core API `Document` object into many different +schema formats, by allowing the renderer class to determine how the internal +representation maps onto the external schema format. + +This approach should also open the door to a range of auto-generated API +documentation options in the future, by rendering the `Document` object into +HTML documentation pages. + +Alongside the built-in schema support, we're also now providing the following: + +* A [command line tool][command-line-client] for interacting with APIs. +* A [Python client library][client-library] for interacting with APIs. + +These API clients are dynamically driven, and able to interact with any API +that exposes a supported schema format. + +Dynamically driven clients allow you to interact with an API at an application +layer interface, rather than a network layer interface, while still providing +the benefits of RESTful Web API design. + +We're expecting to expand the range of languages that we provide client libraries +for over the coming months. + +Further work on maturing the API schema support is also planned, including +documentation on supporting file upload and download, and improved support for +documentation generation and parameter annotation. + +--- + +Current support for schema formats is as follows: + +Name | Support | PyPI package +---------------------------------|-------------------------------------|-------------------------------- +[Core JSON][core-json] | Schema generation & client support. | Built-in support in `coreapi`. +[Swagger / OpenAPI][swagger] | Schema generation & client support. | The `openapi-codec` package. +[JSON Hyper-Schema][hyperschema] | Currrently client support only. | The `hyperschema-codec` package. +[API Blueprint][api-blueprint] | Not yet available. | Not yet available. + +--- + +You can read more about any of this new functionality in the following: + +* New tutorial section on [schemas & client libraries][tut-7]. +* Documentation page on [schema generation][schema-generation]. +* Topic page on [API clients][api-clients]. + +It is also worth noting that Marc Gibbons is currently working towards a 2.0 release of +the popular Django REST Swagger package, which will tie in with our new built-in support. + +--- + +## Supported versions + +The 3.4.0 release adds support for Django 1.10. + +The following versions of Python and Django are now supported: + +* Django versions 1.8, 1.9, and 1.10. +* Python versions 2.7, 3.2(\*), 3.3(\*), 3.4, 3.5. + +(\*) Note that Python 3.2 and 3.3 are not supported from Django 1.9 onwards. + +--- + +## Deprecations and changes + +The 3.4 release includes very limited deprecation or behavioral changes, and +should present a straightforward upgrade. + +### Use fields or exclude on serializer classes. + +The following change in 3.3.0 is now escalated from "pending deprecation" to +"deprecated". Its usage will continue to function but will raise warnings: + +`ModelSerializer` and `HyperlinkedModelSerializer` should include either a `fields` +option, or an `exclude` option. The `fields = '__all__'` shortcut may be used +to explicitly include all fields. + +### Microsecond precision when returning time or datetime. + +Using the default JSON renderer and directly returning a `datetime` or `time` +instance will now render with microsecond precision (6 digits), rather than +millisecond precision (3 digits). This makes the output format consistent with the +default string output of `serializers.DateTimeField` and `serializers.TimeField`. + +This change *does not affect the default behavior when using serializers*, +which is to serialize `datetime` and `time` instances into strings with +microsecond precision. + +The serializer behavior can be modified if needed, using the `DATETIME_FORMAT` +and `TIME_FORMAT` settings. + +The renderer behavior can be modified by setting a custom `encoder_class` +attribute on a `JSONRenderer` subclass. + +### Relational choices no longer displayed in OPTIONS requests. + +Making an `OPTIONS` request to views that have a serializer choice field +will result in a list of the available choices being returned in the response. + +In cases where there is a relational field, the previous behavior would be +to return a list of available instances to choose from for that relational field. + +In order to minimise exposed information the behavior now is to *not* return +choices information for relational fields. + +If you want to override this new behavior you'll need to [implement a custom +metadata class][metadata]. + +See [issue #3751][gh3751] for more information on this behavioral change. + +--- + +## Other improvements + +This release includes further work from a huge number of [pull requests and issues][milestone]. + +Many thanks to all our contributors who've been involved in the release, either through raising issues, giving feedback, improving the documentation, or suggesting and implementing code changes. + +The full set of itemized release notes [are available here][release-notes]. + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[moss]: mozilla-grant.md +[funding]: funding.md +[core-api]: http://www.coreapi.org/ +[command-line-client]: api-clients#command-line-client +[client-library]: api-clients#python-client-library +[core-json]: http://www.coreapi.org/specification/encoding/#core-json-encoding +[swagger]: https://openapis.org/specification +[hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html +[api-blueprint]: https://apiblueprint.org/ +[tut-7]: ../../tutorial/7-schemas-and-client-libraries/ +[schema-generation]: ../../api-guide/schemas/ +[api-clients]: api-clients.md +[milestone]: https://github.com/tomchristie/django-rest-framework/milestone/35 +[release-notes]: release-notes#34 +[metadata]: ../../api-guide/metadata/#custom-metadata-classes +[gh3751]: https://github.com/tomchristie/django-rest-framework/issues/3751 diff --git a/docs/topics/3.5-announcement.md b/docs/topics/3.5-announcement.md new file mode 100644 index 000000000..ea50b2418 --- /dev/null +++ b/docs/topics/3.5-announcement.md @@ -0,0 +1,266 @@ + + +# Django REST framework 3.5 + +The 3.5 release is the second in a planned series that is addressing schema +generation, hypermedia support, API client libraries, and finally realtime support. + +--- + +## Funding + +The 3.5 release would not have been possible without our [collaborative funding model][funding]. +If you use REST framework commercially and would like to see this work continue, +we strongly encourage you to invest in its continued development by +**[signing up for a paid plan][funding]**. + + +
+ +*Many thanks to all our [sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* + +--- + +## Improved schema generation + +Docstrings on views are now pulled through into schema definitions, allowing +you to [use the schema definition to document your API][schema-docs]. + +There is now also a shortcut function, `get_schema_view()`, which makes it easier to +[adding schema views][schema-view] to your API. + +For example, to include a swagger schema to your API, you would do the following: + +* Run `pip install django-rest-swagger`. + +* Add `'rest_framework_swagger'` to your `INSTALLED_APPS` setting. + +* Include the schema view in your URL conf: + +```py +from rest_framework.schemas import get_schema_view +from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer + +schema_view = get_schema_view( + title='Example API', + renderer_classes=[OpenAPIRenderer, SwaggerUIRenderer] +) + +urlpatterns = [ + url(r'^swagger/$', schema_view), + ... +] +``` + +There have been a large number of fixes to the schema generation. These should +resolve issues for anyone using the latest version of the `django-rest-swagger` +package. + +Some of these changes do affect the resulting schema structure, +so if you're already using schema generation you should make sure to review +[the deprecation notes](#deprecations), particularly if you're currently using +a dynamic client library to interact with your API. + +Finally, we're also now exposing the schema generation as a +[publicly documented API][schema-generation-api], allowing you to more easily +override the behaviour. + +## Requests test client + +You can now test your project using the `requests` library. + +This exposes exactly the same interface as if you were using a standard +requests session instance. + + client = RequestsClient() + response = client.get('http://testserver/users/') + assert response.status_code == 200 + +Rather than sending any HTTP requests to the network, this interface will +coerce all outgoing requests into WSGI, and call into your application directly. + +## Core API client + +You can also now test your project by interacting with it using the `coreapi` +client library. + + # Fetch the API schema + client = CoreAPIClient() + schema = client.get('http://testserver/schema/') + + # Create a new organisation + params = {'name': 'MegaCorp', 'status': 'active'} + client.action(schema, ['organisations', 'create'], params) + + # Ensure that the organisation exists in the listing + data = client.action(schema, ['organisations', 'list']) + assert(len(data) == 1) + assert(data == [{'name': 'MegaCorp', 'status': 'active'}]) + +Again, this will call directly into the application using the WSGI interface, +rather than making actual network calls. + +This is a good option if you are planning for clients to mainly interact with +your API using the `coreapi` client library, or some other auto-generated client. + +## Live tests + +One interesting aspect of both the `requests` client and the `coreapi` client +is that they allow you to write tests in such a way that they can also be made +to run against a live service. + +By switching the WSGI based client instances to actual instances of `requests.Session` +or `coreapi.Client` you can have the test cases make actual network calls. + +Being able to write test cases that can exercise your staging or production +environment is a powerful tool. However in order to do this, you'll need to pay +close attention to how you handle setup and teardown to ensure a strict isolation +of test data from other live or staging data. + +## RAML support + +We now have preliminary support for [RAML documentation generation][django-rest-raml]. + +![RAML Example][raml-image] + +Further work on the encoding and documentation generation is planned, in order to +make features such as the 'Try it now' support available at a later date. + +This work also now means that you can use the Core API client libraries to interact +with APIs that expose a RAML specification. The [RAML codec][raml-codec] gives some examples of +interacting with the Spotify API in this way. + +## Validation codes + +Exceptions raised by REST framework now include short code identifiers. +When used together with our customizable error handling, this now allows you to +modify the style of API error messages. + +As an example, this allows for the following style of error responses: + + { + "message": "You do not have permission to perform this action.", + "code": "permission_denied" + } + +This is particularly useful with validation errors, which use appropriate +codes to identify differing kinds of failure... + + { + "name": {"message": "This field is required.", "code": "required"}, + "age": {"message": "A valid integer is required.", "code": "invalid"} + } + +## Client upload & download support + +The Python `coreapi` client library and the Core API command line tool both +now fully support file [uploads][uploads] and [downloads][downloads]. + +--- + +## Deprecations + +### Generating schemas from Router + +The router arguments for generating a schema view, such as `schema_title`, +are now pending deprecation. + +Instead of using `DefaultRouter(schema_title='Example API')`, you should use +the `get_schema_view()` function, and include the view in your URL conf. + +Make sure to include the view before your router urls. For example: + + from rest_framework.schemas import get_schema_view + from my_project.routers import router + + schema_view = get_schema_view(title='Example API') + + urlpatterns = [ + url('^$', schema_view), + url(r'^', include(router.urls)), + ] + +### Schema path representations + +The `'pk'` identifier in schema paths is now mapped onto the actually model field +name by default. This will typically be `'id'`. + +This gives a better external representation for schemas, with less implementation +detail being exposed. It also reflects the behaviour of using a ModelSerializer +class with `fields = '__all__'`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_PATH_PK': False` +in the REST framework settings. + +### Schema action name representations + +The internal `retrieve()` and `destroy()` method names are now coerced to an +external representation of `read` and `delete`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_METHOD_NAMES': {}` +in the REST framework settings. + +### DjangoFilterBackend + +The functionality of the built-in `DjangoFilterBackend` is now completely +included by the `django-filter` package. + +You should change your imports and REST framework filter settings as follows: + +* `rest_framework.filters.DjangoFilterBackend` becomes `django_filters.rest_framework.DjangoFilterBackend`. +* `rest_framework.filters.FilterSet` becomes `django_filters.rest_framework.FilterSet`. + +The existing imports will continue to work but are now pending deprecation. + +### CoreJSON media type + +The media type for `CoreJSON` is now `application/json+coreapi`, rather than +the previous `application/vnd.json+coreapi`. This brings it more into line with +other custom media types, such as those used by Swagger and RAML. + +The clients currently accept either media type. The old style-media type will +be deprecated at a later date. + +### ModelSerializer 'fields' and 'exclude' + +ModelSerializer and HyperlinkedModelSerializer must include either a fields +option, or an exclude option. The `fields = '__all__'` shortcut may be used to +explicitly include all fields. + +Failing to set either `fields` or `exclude` raised a pending deprecation warning +in version 3.3 and raised a deprecation warning in 3.4. Its usage is now mandatory. + +--- + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[funding]: funding.md +[uploads]: http://core-api.github.io/python-client/api-guide/utils/#file +[downloads]: http://core-api.github.io/python-client/api-guide/codecs/#downloadcodec +[schema-generation-api]: ../api-guide/schemas/#schemagenerator +[schema-docs]: ../api-guide/schemas/#schemas-as-documentation +[schema-view]: ../api-guide/schemas/#the-get_schema_view-shortcut +[django-rest-raml]: https://github.com/tomchristie/django-rest-raml +[raml-image]: ../img/raml.png +[raml-codec]: https://github.com/core-api/python-raml-codec diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index 5f09c2a8f..c12551aa6 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -58,12 +58,14 @@ exposes a supported schema format. To install the Core API command line client, use `pip`. - $ pip install coreapi +Note that the command-line client is a separate package to the +python client library. Make sure to install `coreapi-cli`. + + $ pip install coreapi-cli To start inspecting and interacting with an API the schema must first be loaded from the network. - $ coreapi get http://api.example.org/ snippets: { @@ -120,7 +122,14 @@ To inspect the underlying HTTP request and response, use the `--debug` flag. Some actions may include optional or required parameters. - $ coreapi action users create --params username example + $ coreapi action users create --param username=example + +When using `--param`, the type of the input will be determined automatically. + +If you want to be more explicit about the parameter type then use `--data` for +any null, numeric, boolean, list, or object inputs, and use `--string` for string inputs. + + $ coreapi action users edit --string username=tomchristie --data is_admin=true ## Authentication & headers @@ -130,38 +139,53 @@ that credentials are not leaked across differing APIs. The format for adding a new credential is: - coreapi credentials add + $ coreapi credentials add For instance: - coreapi credentials add api.example.org "Token 9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b" + $ coreapi credentials add api.example.org "Token 9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b" The optional `--auth` flag also allows you to add specific types of authentication, handling the encoding for you. Currently only `"basic"` is supported as an option here. For example: - coreapi credentials add api.example.org tomchristie:foobar --auth basic + $ coreapi credentials add api.example.org tomchristie:foobar --auth basic You can also add specific request headers, using the `headers` command: - coreapi headers add api.example.org x-api-version 2 + $ coreapi headers add api.example.org x-api-version 2 For more information and a listing of the available subcommands use `coreapi credentials --help` or `coreapi headers --help`. +## Codecs + +By default the command line client only includes support for reading Core JSON +schemas, however it includes a plugin system for installing additional codecs. + + $ pip install openapi-codec jsonhyperschema-codec hal-codec + $ coreapi codecs show + Codecs + corejson application/vnd.coreapi+json encoding, decoding + hal application/hal+json encoding, decoding + openapi application/openapi+json encoding, decoding + jsonhyperschema application/schema+json decoding + json application/json data + text text/* data + ## Utilities The command line client includes functionality for bookmarking API URLs under a memorable name. For example, you can add a bookmark for the existing API, like so... - coreapi bookmarks add accountmanagement + $ coreapi bookmarks add accountmanagement There is also functionality for navigating forward or backward through the history of which API URLs have been accessed. - coreapi history show - coreapi history back + $ coreapi history show + $ coreapi history back For more information and a listing of the available subcommands use `coreapi bookmarks --help` or `coreapi history --help`. @@ -170,20 +194,24 @@ For more information and a listing of the available subcommands use To display the current `Document`: - coreapi show + $ coreapi show To reload the current `Document` from the network: - coreapi reload + $ coreapi reload To load a schema file from disk: - coreapi load my-api-schema.json --format corejson + $ coreapi load my-api-schema.json --format corejson + +To dump the current document to console in a given format: + + $ coreapi dump --format openapi To remove the current document, along with all currently saved history, credentials, headers and bookmarks: - coreapi clear + $ coreapi clear --- @@ -195,7 +223,9 @@ API that exposes a supported schema format. ## Getting started You'll need to install the `coreapi` package using `pip` before you can get -started. Once you've done so, open up a python terminal. +started. + + $ pip install coreapi In order to start working with an API, we first need a `Client` instance. The client holds any configuration around which codecs and transports are supported @@ -227,7 +257,7 @@ Codecs are responsible for encoding or decoding Documents. The decoding process is used by a client to take a bytestring of an API schema definition, and returning the Core API `Document` that represents that interface. -A codec should be associated with a particular media type, such as **TODO**. +A codec should be associated with a particular media type, such as `'application/coreapi+json'`. This media type is used by the server in the response `Content-Type` header, in order to indicate what kind of data is being returned in the response. @@ -252,14 +282,15 @@ and subsequently to receive JSON responses made against the API. You can use a codec directly, in order to load an existing schema definition, and return the resulting `Document`. - schema_definition = open('my-api-schema.json', 'r').read() + input_file = open('my-api-schema.json', 'rb') + schema_definition = input_file.read() codec = codecs.CoreJSONCodec() schema = codec.load(schema_definition) You can also use a codec directly to generate a schema definition given a `Document` instance: schema_definition = codec.dump(schema) - output_file = open('my-api-schema.json', 'r') + output_file = open('my-api-schema.json', 'rb') output_file.write(schema_definition) ## Transports diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index c4ef0efdf..ed7717ae2 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -61,6 +61,7 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env source env/bin/activate + pip install django pip install -r requirements.txt # Run the tests diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index e84f2acfb..37e5c6882 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -6,7 +6,7 @@ This document outlines our project management processes for REST framework. -The aim is to ensure that the project has a high +The aim is to ensure that the project has a high ["bus factor"][bus-factor], and can continue to remain well supported for the foreseeable future. Suggestions for improvements to our process are welcome. --- @@ -38,27 +38,27 @@ Members of the maintenance team will be added as collaborators to the repository The following template should be used for the description of the issue, and serves as the formal process for selecting the team. This issue is for determining the maintenance team for the *** period. - + Please see the [Project management](http://www.django-rest-framework.org/topics/project-management/) section of our documentation for more details. - + --- - + #### Renewing existing members. - + The following people are the current maintenance team. Please checkmark your name if you wish to continue to have write permission on the repository for the *** period. - + - [ ] @*** - [ ] @*** - [ ] @*** - [ ] @*** - [ ] @*** - + --- - + #### New members. - + If you wish to be considered for this or a future date, please comment against this or subsequent issues. - + To modify this process for future maintenance cycles make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. #### Responsibilities of team members @@ -116,7 +116,7 @@ The following template should be used for the description of the issue, and serv - [ ] Make a release announcement on the [discussion group](https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework). - [ ] Make a release announcement on twitter. - [ ] Close the milestone on GitHub. - + To modify this process for future releases make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. When pushing the release to PyPI ensure that your environment has been installed from our development `requirement.txt`, so that documentation and PyPI installs are consistently being built against a pinned set of packages. @@ -165,7 +165,7 @@ Here's how differences between the old and new source files will be handled: When a translator has finished translating their work needs to be downloaded from Transifex into the REST framework repository. To do this, run: # 3. Pull the translated django.po files from Transifex. - tx pull -a + tx pull -a --minimum-perc 10 cd rest_framework # 4. Compile the binary .mo files for all supported languages. django-admin.py compilemessages diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 201549b45..d25a46ba0 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,14 +38,221 @@ You can determine your currently installed version using `pip freeze`: --- +## 3.5.x series + +### 3.5.2 + +**Date**: [1st November 2016][3.5.2-milestone] + +* Restore exception tracebacks in Python 2.7. ([#4631][gh4631], [#4638][gh4638]) +* Properly display dicts in the admin console. ([#4532][gh4532], [#4636][gh4636]) +* Fix is_simple_callable with variable args, kwargs. ([#4622][gh4622], [#4602][gh4602]) +* Support 'on'/'off' literals with BooleanField. ([#4640][gh4640], [#4624][gh4624]) +* Enable cursor pagination of value querysets. ([#4569][gh4569]) +* Fix support of get_full_details() for Throttled exceptions. ([#4627][gh4627]) +* Fix FilterSet proxy. ([#4620][gh4620]) +* Make serializer fields import explicit. ([#4628][gh4628]) +* Drop redundant requests adapter. ([#4639][gh4639]) + +### 3.5.1 + +**Date**: [21st October 2016][3.5.1-milestone] + +* Make `rest_framework/compat.py` imports. ([#4612][gh4612], [#4608][gh4608], [#4601][gh4601]) +* Fix bug in schema base path generation. ([#4611][gh4611], [#4605][gh4605]) +* Fix broken case of ListSerializer with single item. ([#4609][gh4609], [#4606][gh4606]) +* Remove bare `raise` for Python 3.5 compat. ([#4600][gh4600]) + +### 3.5.0 + +**Date**: [20th October 2016][3.5.0-milestone] + +--- + ## 3.4.x series -### 3.4 +### 3.4.7 -**Unreleased** +**Date**: [21st September 2016][3.4.7-milestone] -* Dropped support for EOL Django 1.7 ([#3933][gh3933]) -* Fixed null foreign keys targeting UUIDField primary keys. ([#3936][gh3936]) +* Fallback behavior for request parsing when request.POST already accessed. ([#3951][gh3951], [#4500][gh4500]) +* Fix regression of `RegexField`. ([#4489][gh4489], [#4490][gh4490], [#2617][gh2617]) +* Missing comma in `admin.html` causing CSRF error. ([#4472][gh4472], [#4473][gh4473]) +* Fix response rendering with empty context. ([#4495][gh4495]) +* Fix indentation regression in API listing. ([#4493][gh4493]) +* Fixed an issue where the incorrect value is set to `ResolverMatch.func_name` of api_view decorated view. ([#4465][gh4465], [#4462][gh4462]) +* Fix `APIClient.get()` when path contains unicode arguments ([#4458][gh4458]) + +### 3.4.6 + +**Date**: [23rd August 2016][3.4.6-milestone] + +* Fix malformed Javascript in browsable API. ([#4435][gh4435]) +* Skip HiddenField from Schema fields. ([#4425][gh4425], [#4429][gh4429]) +* Improve Create to show the original exception traceback. ([#3508][gh3508]) +* Fix `AdminRenderer` display of PK only related fields. ([#4419][gh4419], [#4423][gh4423]) + +### 3.4.5 + +**Date**: [19th August 2016][3.4.5-milestone] + +* Improve debug error handling. ([#4416][gh4416], [#4409][gh4409]) +* Allow custom CSRF_HEADER_NAME setting. ([#4415][gh4415], [#4410][gh4410]) +* Include .action attribute on viewsets when generating schemas. ([#4408][gh4408], [#4398][gh4398]) +* Do not include request.FILES items in request.POST. ([#4407][gh4407]) +* Fix rendering of checkbox multiple. ([#4403][gh4403]) +* Fix docstring of Field.get_default. ([#4404][gh4404]) +* Replace utf8 character with its ascii counterpart in README. ([#4412][gh4412]) + +### 3.4.4 + +**Date**: [12th August 2016][3.4.4-milestone] + +* Ensure views are fully initialized when generating schemas. ([#4373][gh4373], [#4382][gh4382], [#4383][gh4383], [#4279][gh4279], [#4278][gh4278]) +* Add form field descriptions to schemas. ([#4387][gh4387]) +* Fix category generation for schema endpoints. ([#4391][gh4391], [#4394][gh4394], [#4390][gh4390], [#4386][gh4386], [#4376][gh4376], [#4329][gh4329]) +* Don't strip empty query params when paginating. ([#4392][gh4392], [#4393][gh4393], [#4260][gh4260]) +* Do not re-run query for empty results with LimitOffsetPagination. ([#4201][gh4201], [#4388][gh4388]) +* Stricter type validation for CharField. ([#4380][gh4380], [#3394][gh3394]) +* RelatedField.choices should preserve non-string values. ([#4111][gh4111], [#4379][gh4379], [#3365][gh3365]) +* Test case for rendering checkboxes in vertical form style. ([#4378][gh4378], [#3868][gh3868], [#3868][gh3868]) +* Show error traceback HTML in browsable API ([#4042][gh4042], [#4172][gh4172]) +* Fix handling of ALLOWED_VERSIONS and no DEFAULT_VERSION. [#4370][gh4370] +* Allow `max_digits=None` on DecimalField. ([#4377][gh4377], [#4372][gh4372]) +* Limit queryset when rendering relational choices. ([#4375][gh4375], [#4122][gh4122], [#3329][gh3329], [#3330][gh3330], [#3877][gh3877]) +* Resolve form display with ChoiceField, MultipleChoiceField and non-string choices. ([#4374][gh4374], [#4119][gh4119], [#4121][gh4121], [#4137][gh4137], [#4120][gh4120]) +* Fix call to TemplateHTMLRenderer.resolve_context() fallback method. ([#4371][gh4371]) + +### 3.4.3 + +**Date**: [5th August 2016][3.4.3-milestone] + +* Include fallaback for users of older TemplateHTMLRenderer internal API. ([#4361][gh4361]) + +### 3.4.2 + +**Date**: [5th August 2016][3.4.2-milestone] + +* Include kwargs passed to 'as_view' when generating schemas. ([#4359][gh4359], [#4330][gh4330], [#4331][gh4331]) +* Access `request.user.is_authenticated` as property not method, under Django 1.10+ ([#4358][gh4358], [#4354][gh4354]) +* Filter HEAD out from schemas. ([#4357][gh4357]) +* extra_kwargs takes precedence over uniqueness kwargs. ([#4198][gh4198], [#4199][gh4199], [#4349][gh4349]) +* Correct descriptions when tabs are used in code indentation. ([#4345][gh4345], [#4347][gh4347])* +* Change template context generation in TemplateHTMLRenderer. ([#4236][gh4236]) +* Serializer defaults should not be included in partial updates. ([#4346][gh4346], [#3565][gh3565]) +* Consistent behavior & descriptive error from FileUploadParser when filename not included. ([#4340][gh4340], [#3610][gh3610], [#4292][gh4292], [#4296][gh4296]) +* DecimalField quantizes incoming digitals. ([#4339][gh4339], [#4318][gh4318]) +* Handle non-string input for IP fields. ([#4335][gh4335], [#4336][gh4336], [#4338][gh4338]) +* Fix leading slash handling when Schema generation includes a root URL. ([#4332][gh4332]) +* Test cases for DictField with allow_null options. ([#4348][gh4348]) +* Update tests from Django 1.10 beta to Django 1.10. ([#4344][gh4344]) + +### 3.4.1 + +**Date**: [28th July 2016][3.4.1-milestone] + +* Added `root_renderers` argument to `DefaultRouter`. ([#4323][gh4323], [#4268][gh4268]) +* Added `url` and `schema_url` arguments. ([#4321][gh4321], [#4308][gh4308], [#4305][gh4305]) +* Unique together checks should apply to read-only fields which have a default. ([#4316][gh4316], [#4294][gh4294]) +* Set view.format_kwarg in schema generator. ([#4293][gh4293], [#4315][gh4315]) +* Fix schema generator for views with `pagination_class = None`. ([#4314][gh4314], [#4289][gh4289]) +* Fix schema generator for views with no `get_serializer_class`. ([#4265][gh4265], [#4285][gh4285]) +* Fixes for media type parameters in `Accept` and `Content-Type` headers. ([#4287][gh4287], [#4313][gh4313], [#4281][gh4281]) +* Use verbose_name instead of object_name in error messages. ([#4299][gh4299]) +* Minor version update to Twitter Bootstrap. ([#4307][gh4307]) +* SearchFilter raises error when using with related field. ([#4302][gh4302], [#4303][gh4303], [#4298][gh4298]) +* Adding support for RFC 4918 status codes. ([#4291][gh4291]) +* Add LICENSE.md to the built wheel. ([#4270][gh4270]) +* Serializing "complex" field returns None instead of the value since 3.4 ([#4272][gh4272], [#4273][gh4273], [#4288][gh4288]) + +### 3.4.0 + +**Date**: [14th July 2016][3.4.0-milestone] + +* Don't strip microseconds in JSON output. ([#4256][gh4256]) +* Two slightly different iso 8601 datetime serialization. ([#4255][gh4255]) +* Resolve incorrect inclusion of media type parameters. ([#4254][gh4254]) +* Response Content-Type potentially malformed. ([#4253][gh4253]) +* Fix setup.py error on some platforms. ([#4246][gh4246]) +* Move alternate formats in coreapi into separate packages. ([#4244][gh4244]) +* Add localize keyword argument to `DecimalField`. ([#4233][gh4233]) +* Fix issues with routers for custom list-route and detail-routes. ([#4229][gh4229]) +* Namespace versioning with nested namespaces. ([#4219][gh4219]) +* Robust uniqueness checks. ([#4217][gh4217]) +* Minor refactoring of `must_call_distinct`. ([#4215][gh4215]) +* Overridable offset cutoff in CursorPagination. ([#4212][gh4212]) +* Pass through strings as-in with date/time fields. ([#4196][gh4196]) +* Add test confirming that required=False is valid on a relational field. ([#4195][gh4195]) +* In LimitOffsetPagination `limit=0` should revert to default limit. ([#4194][gh4194]) +* Exclude read_only=True fields from unique_together validation & add docs. ([#4192][gh4192]) +* Handle bytestrings in JSON. ([#4191][gh4191]) +* JSONField(binary=True) represents using binary strings, which JSONRenderer does not support. ([#4187][gh4187]) +* JSONField(binary=True) represents using binary strings, which JSONRenderer does not support. ([#4185][gh4185]) +* More robust form rendering in the browsable API. ([#4181][gh4181]) +* Empty cases of `.validated_data` and `.errors` as lists not dicts for ListSerializer. ([#4180][gh4180]) +* Schemas & client libraries. ([#4179][gh4179]) +* Removed `AUTH_USER_MODEL` compat property. ([#4176][gh4176]) +* Clean up existing deprecation warnings. ([#4166][gh4166]) +* Django 1.10 support. ([#4158][gh4158]) +* Updated jQuery version to 1.12.4. ([#4157][gh4157]) +* More robust default behavior on OrderingFilter. ([#4156][gh4156]) +* description.py codes and tests removal. ([#4153][gh4153]) +* Wrap guardian.VERSION in tuple. ([#4149][gh4149]) +* Refine validator for fields with kwargs. ([#4146][gh4146]) +* Fix None values representation in childs of ListField, DictField. ([#4118][gh4118]) +* Resolve TimeField representation for midnight value. ([#4107][gh4107]) +* Set proper status code in AdminRenderer for the redirection after POST/DELETE requests. ([#4106][gh4106]) +* TimeField render returns None instead of 00:00:00. ([#4105][gh4105]) +* Fix incorrectly named zh-hans and zh-hant locale path. ([#4103][gh4103]) +* Prevent raising exception when limit is 0. ([#4098][gh4098]) +* TokenAuthentication: Allow custom keyword in the header. ([#4097][gh4097]) +* Handle incorrectly padded HTTP basic auth header. ([#4090][gh4090]) +* LimitOffset pagination crashes Browseable API when limit=0. ([#4079][gh4079]) +* Fixed DecimalField arbitrary precision support. ([#4075][gh4075]) +* Added support for custom CSRF cookie names. ([#4049][gh4049]) +* Fix regression introduced by #4035. ([#4041][gh4041]) +* No auth view failing permission should raise 403. ([#4040][gh4040]) +* Fix string_types / text_types confusion. ([#4025][gh4025]) +* Do not list related field choices in OPTIONS requests. ([#4021][gh4021]) +* Fix typo. ([#4008][gh4008]) +* Reorder initializing the view. ([#4006][gh4006]) +* Type error in DjangoObjectPermissionsFilter on Python 3.4. ([#4005][gh4005]) +* Fixed use of deprecated Query.aggregates. ([#4003][gh4003]) +* Fix blank lines around docstrings. ([#4002][gh4002]) +* Fixed admin pagination when limit is 0. ([#3990][gh3990]) +* OrderingFilter adjustements. ([#3983][gh3983]) +* Non-required serializer related fields. ([#3976][gh3976]) +* Using safer calling way of "@api_view" in tutorial. ([#3971][gh3971]) +* ListSerializer doesn't handle unique_together constraints. ([#3970][gh3970]) +* Add missing migration file. ([#3968][gh3968]) +* `OrderingFilter` should call `get_serializer_class()` to determine default fields. ([#3964][gh3964]) +* Remove old django checks from tests and compat. ([#3953][gh3953]) +* Support callable as the value of `initial` for any `serializer.Field`. ([#3943][gh3943]) +* Prevented unnecessary distinct() call in SearchFilter. ([#3938][gh3938]) +* Fix None UUID ForeignKey serialization. ([#3936][gh3936]) +* Drop EOL Django 1.7. ([#3933][gh3933]) +* Add missing space in serializer error message. ([#3926][gh3926]) +* Fixed _force_text_recursive typo. ([#3908][gh3908]) +* Attempt to address Django 2.0 deprecate warnings related to `field.rel`. ([#3906][gh3906]) +* Fix parsing multipart data using a nested serializer with list. ([#3820][gh3820]) +* Resolving APIs URL to different namespaces. ([#3816][gh3816]) +* Do not HTML-escape `help_text` in Browsable API forms. ([#3812][gh3812]) +* OPTIONS fetches and shows all possible foreign keys in choices field. ([#3751][gh3751]) +* Django 1.9 deprecation warnings ([#3729][gh3729]) +* Test case for #3598 ([#3710][gh3710]) +* Adding support for multiple values for search filter. ([#3541][gh3541]) +* Use get_serializer_class in ordering filter. ([#3487][gh3487]) +* Serializers with many=True should return empty list rather than empty dict. ([#3476][gh3476]) +* LimitOffsetPagination limit=0 fix. ([#3444][gh3444]) +* Enable Validators to defer string evaluation and handle new string format. ([#3438][gh3438]) +* Unique validator is executed and breaks if field is invalid. ([#3381][gh3381]) +* Do not ignore overridden View.get_view_name() in breadcrumbs. ([#3273][gh3273]) +* Retry form rendering when rendering with serializer fails. ([#3164][gh3164]) +* Unique constraint prevents nested serializers from updating. ([#2996][gh2996]) +* Uniqueness validators should not be run for excluded (read_only) fields. ([#2848][gh2848]) +* UniqueValidator raises exception for nested objects. ([#2403][gh2403]) +* `lookup_type` is deprecated in favor of `lookup_expr`. ([#4259][gh4259]) +--- ## 3.3.x series @@ -127,6 +334,8 @@ You can determine your currently installed version using `pip freeze`: * Removed support for Django 1.5 & 1.6. ([#3421][gh3421], [#3429][gh3429]) * Removed 'south' migrations. ([#3495][gh3495]) +--- + ## 3.2.x series ### 3.2.5 @@ -410,6 +619,17 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.3.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.1+Release%22 [3.3.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.2+Release%22 [3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22 +[3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22 +[3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22 +[3.4.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.2+Release%22 +[3.4.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.3+Release%22 +[3.4.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.4+Release%22 +[3.4.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.5+Release%22 +[3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 +[3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 +[3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 +[3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 +[3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -726,3 +946,255 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3636]: https://github.com/tomchristie/django-rest-framework/issues/3636 [gh3605]: https://github.com/tomchristie/django-rest-framework/issues/3605 [gh3604]: https://github.com/tomchristie/django-rest-framework/issues/3604 + + +[gh2403]: https://github.com/tomchristie/django-rest-framework/issues/2403 +[gh2848]: https://github.com/tomchristie/django-rest-framework/issues/2848 +[gh2996]: https://github.com/tomchristie/django-rest-framework/issues/2996 +[gh3164]: https://github.com/tomchristie/django-rest-framework/issues/3164 +[gh3273]: https://github.com/tomchristie/django-rest-framework/issues/3273 +[gh3381]: https://github.com/tomchristie/django-rest-framework/issues/3381 +[gh3438]: https://github.com/tomchristie/django-rest-framework/issues/3438 +[gh3444]: https://github.com/tomchristie/django-rest-framework/issues/3444 +[gh3476]: https://github.com/tomchristie/django-rest-framework/issues/3476 +[gh3487]: https://github.com/tomchristie/django-rest-framework/issues/3487 +[gh3541]: https://github.com/tomchristie/django-rest-framework/issues/3541 +[gh3710]: https://github.com/tomchristie/django-rest-framework/issues/3710 +[gh3729]: https://github.com/tomchristie/django-rest-framework/issues/3729 +[gh3751]: https://github.com/tomchristie/django-rest-framework/issues/3751 +[gh3812]: https://github.com/tomchristie/django-rest-framework/issues/3812 +[gh3816]: https://github.com/tomchristie/django-rest-framework/issues/3816 +[gh3820]: https://github.com/tomchristie/django-rest-framework/issues/3820 +[gh3906]: https://github.com/tomchristie/django-rest-framework/issues/3906 +[gh3908]: https://github.com/tomchristie/django-rest-framework/issues/3908 +[gh3926]: https://github.com/tomchristie/django-rest-framework/issues/3926 +[gh3933]: https://github.com/tomchristie/django-rest-framework/issues/3933 +[gh3936]: https://github.com/tomchristie/django-rest-framework/issues/3936 +[gh3938]: https://github.com/tomchristie/django-rest-framework/issues/3938 +[gh3943]: https://github.com/tomchristie/django-rest-framework/issues/3943 +[gh3953]: https://github.com/tomchristie/django-rest-framework/issues/3953 +[gh3964]: https://github.com/tomchristie/django-rest-framework/issues/3964 +[gh3968]: https://github.com/tomchristie/django-rest-framework/issues/3968 +[gh3970]: https://github.com/tomchristie/django-rest-framework/issues/3970 +[gh3971]: https://github.com/tomchristie/django-rest-framework/issues/3971 +[gh3976]: https://github.com/tomchristie/django-rest-framework/issues/3976 +[gh3983]: https://github.com/tomchristie/django-rest-framework/issues/3983 +[gh3990]: https://github.com/tomchristie/django-rest-framework/issues/3990 +[gh4002]: https://github.com/tomchristie/django-rest-framework/issues/4002 +[gh4003]: https://github.com/tomchristie/django-rest-framework/issues/4003 +[gh4005]: https://github.com/tomchristie/django-rest-framework/issues/4005 +[gh4006]: https://github.com/tomchristie/django-rest-framework/issues/4006 +[gh4008]: https://github.com/tomchristie/django-rest-framework/issues/4008 +[gh4021]: https://github.com/tomchristie/django-rest-framework/issues/4021 +[gh4025]: https://github.com/tomchristie/django-rest-framework/issues/4025 +[gh4040]: https://github.com/tomchristie/django-rest-framework/issues/4040 +[gh4041]: https://github.com/tomchristie/django-rest-framework/issues/4041 +[gh4049]: https://github.com/tomchristie/django-rest-framework/issues/4049 +[gh4075]: https://github.com/tomchristie/django-rest-framework/issues/4075 +[gh4079]: https://github.com/tomchristie/django-rest-framework/issues/4079 +[gh4090]: https://github.com/tomchristie/django-rest-framework/issues/4090 +[gh4097]: https://github.com/tomchristie/django-rest-framework/issues/4097 +[gh4098]: https://github.com/tomchristie/django-rest-framework/issues/4098 +[gh4103]: https://github.com/tomchristie/django-rest-framework/issues/4103 +[gh4105]: https://github.com/tomchristie/django-rest-framework/issues/4105 +[gh4106]: https://github.com/tomchristie/django-rest-framework/issues/4106 +[gh4107]: https://github.com/tomchristie/django-rest-framework/issues/4107 +[gh4118]: https://github.com/tomchristie/django-rest-framework/issues/4118 +[gh4146]: https://github.com/tomchristie/django-rest-framework/issues/4146 +[gh4149]: https://github.com/tomchristie/django-rest-framework/issues/4149 +[gh4153]: https://github.com/tomchristie/django-rest-framework/issues/4153 +[gh4156]: https://github.com/tomchristie/django-rest-framework/issues/4156 +[gh4157]: https://github.com/tomchristie/django-rest-framework/issues/4157 +[gh4158]: https://github.com/tomchristie/django-rest-framework/issues/4158 +[gh4166]: https://github.com/tomchristie/django-rest-framework/issues/4166 +[gh4176]: https://github.com/tomchristie/django-rest-framework/issues/4176 +[gh4179]: https://github.com/tomchristie/django-rest-framework/issues/4179 +[gh4180]: https://github.com/tomchristie/django-rest-framework/issues/4180 +[gh4181]: https://github.com/tomchristie/django-rest-framework/issues/4181 +[gh4185]: https://github.com/tomchristie/django-rest-framework/issues/4185 +[gh4187]: https://github.com/tomchristie/django-rest-framework/issues/4187 +[gh4191]: https://github.com/tomchristie/django-rest-framework/issues/4191 +[gh4192]: https://github.com/tomchristie/django-rest-framework/issues/4192 +[gh4194]: https://github.com/tomchristie/django-rest-framework/issues/4194 +[gh4195]: https://github.com/tomchristie/django-rest-framework/issues/4195 +[gh4196]: https://github.com/tomchristie/django-rest-framework/issues/4196 +[gh4212]: https://github.com/tomchristie/django-rest-framework/issues/4212 +[gh4215]: https://github.com/tomchristie/django-rest-framework/issues/4215 +[gh4217]: https://github.com/tomchristie/django-rest-framework/issues/4217 +[gh4219]: https://github.com/tomchristie/django-rest-framework/issues/4219 +[gh4229]: https://github.com/tomchristie/django-rest-framework/issues/4229 +[gh4233]: https://github.com/tomchristie/django-rest-framework/issues/4233 +[gh4244]: https://github.com/tomchristie/django-rest-framework/issues/4244 +[gh4246]: https://github.com/tomchristie/django-rest-framework/issues/4246 +[gh4253]: https://github.com/tomchristie/django-rest-framework/issues/4253 +[gh4254]: https://github.com/tomchristie/django-rest-framework/issues/4254 +[gh4255]: https://github.com/tomchristie/django-rest-framework/issues/4255 +[gh4256]: https://github.com/tomchristie/django-rest-framework/issues/4256 +[gh4259]: https://github.com/tomchristie/django-rest-framework/issues/4259 + + +[gh4323]: https://github.com/tomchristie/django-rest-framework/issues/4323 +[gh4268]: https://github.com/tomchristie/django-rest-framework/issues/4268 +[gh4321]: https://github.com/tomchristie/django-rest-framework/issues/4321 +[gh4308]: https://github.com/tomchristie/django-rest-framework/issues/4308 +[gh4305]: https://github.com/tomchristie/django-rest-framework/issues/4305 +[gh4316]: https://github.com/tomchristie/django-rest-framework/issues/4316 +[gh4294]: https://github.com/tomchristie/django-rest-framework/issues/4294 +[gh4293]: https://github.com/tomchristie/django-rest-framework/issues/4293 +[gh4315]: https://github.com/tomchristie/django-rest-framework/issues/4315 +[gh4314]: https://github.com/tomchristie/django-rest-framework/issues/4314 +[gh4289]: https://github.com/tomchristie/django-rest-framework/issues/4289 +[gh4265]: https://github.com/tomchristie/django-rest-framework/issues/4265 +[gh4285]: https://github.com/tomchristie/django-rest-framework/issues/4285 +[gh4287]: https://github.com/tomchristie/django-rest-framework/issues/4287 +[gh4313]: https://github.com/tomchristie/django-rest-framework/issues/4313 +[gh4281]: https://github.com/tomchristie/django-rest-framework/issues/4281 +[gh4299]: https://github.com/tomchristie/django-rest-framework/issues/4299 +[gh4307]: https://github.com/tomchristie/django-rest-framework/issues/4307 +[gh4302]: https://github.com/tomchristie/django-rest-framework/issues/4302 +[gh4303]: https://github.com/tomchristie/django-rest-framework/issues/4303 +[gh4298]: https://github.com/tomchristie/django-rest-framework/issues/4298 +[gh4291]: https://github.com/tomchristie/django-rest-framework/issues/4291 +[gh4270]: https://github.com/tomchristie/django-rest-framework/issues/4270 +[gh4272]: https://github.com/tomchristie/django-rest-framework/issues/4272 +[gh4273]: https://github.com/tomchristie/django-rest-framework/issues/4273 +[gh4288]: https://github.com/tomchristie/django-rest-framework/issues/4288 + + +[gh3565]: https://github.com/tomchristie/django-rest-framework/issues/3565 +[gh3610]: https://github.com/tomchristie/django-rest-framework/issues/3610 +[gh4198]: https://github.com/tomchristie/django-rest-framework/issues/4198 +[gh4199]: https://github.com/tomchristie/django-rest-framework/issues/4199 +[gh4236]: https://github.com/tomchristie/django-rest-framework/issues/4236 +[gh4292]: https://github.com/tomchristie/django-rest-framework/issues/4292 +[gh4296]: https://github.com/tomchristie/django-rest-framework/issues/4296 +[gh4318]: https://github.com/tomchristie/django-rest-framework/issues/4318 +[gh4330]: https://github.com/tomchristie/django-rest-framework/issues/4330 +[gh4331]: https://github.com/tomchristie/django-rest-framework/issues/4331 +[gh4332]: https://github.com/tomchristie/django-rest-framework/issues/4332 +[gh4335]: https://github.com/tomchristie/django-rest-framework/issues/4335 +[gh4336]: https://github.com/tomchristie/django-rest-framework/issues/4336 +[gh4338]: https://github.com/tomchristie/django-rest-framework/issues/4338 +[gh4339]: https://github.com/tomchristie/django-rest-framework/issues/4339 +[gh4340]: https://github.com/tomchristie/django-rest-framework/issues/4340 +[gh4344]: https://github.com/tomchristie/django-rest-framework/issues/4344 +[gh4345]: https://github.com/tomchristie/django-rest-framework/issues/4345 +[gh4346]: https://github.com/tomchristie/django-rest-framework/issues/4346 +[gh4347]: https://github.com/tomchristie/django-rest-framework/issues/4347 +[gh4348]: https://github.com/tomchristie/django-rest-framework/issues/4348 +[gh4349]: https://github.com/tomchristie/django-rest-framework/issues/4349 +[gh4354]: https://github.com/tomchristie/django-rest-framework/issues/4354 +[gh4357]: https://github.com/tomchristie/django-rest-framework/issues/4357 +[gh4358]: https://github.com/tomchristie/django-rest-framework/issues/4358 +[gh4359]: https://github.com/tomchristie/django-rest-framework/issues/4359 + + +[gh4361]: https://github.com/tomchristie/django-rest-framework/issues/4361 + + + +[gh2829]: https://github.com/tomchristie/django-rest-framework/issues/2829 +[gh3329]: https://github.com/tomchristie/django-rest-framework/issues/3329 +[gh3330]: https://github.com/tomchristie/django-rest-framework/issues/3330 +[gh3365]: https://github.com/tomchristie/django-rest-framework/issues/3365 +[gh3394]: https://github.com/tomchristie/django-rest-framework/issues/3394 +[gh3868]: https://github.com/tomchristie/django-rest-framework/issues/3868 +[gh3868]: https://github.com/tomchristie/django-rest-framework/issues/3868 +[gh3877]: https://github.com/tomchristie/django-rest-framework/issues/3877 +[gh4042]: https://github.com/tomchristie/django-rest-framework/issues/4042 +[gh4111]: https://github.com/tomchristie/django-rest-framework/issues/4111 +[gh4119]: https://github.com/tomchristie/django-rest-framework/issues/4119 +[gh4120]: https://github.com/tomchristie/django-rest-framework/issues/4120 +[gh4121]: https://github.com/tomchristie/django-rest-framework/issues/4121 +[gh4122]: https://github.com/tomchristie/django-rest-framework/issues/4122 +[gh4137]: https://github.com/tomchristie/django-rest-framework/issues/4137 +[gh4172]: https://github.com/tomchristie/django-rest-framework/issues/4172 +[gh4201]: https://github.com/tomchristie/django-rest-framework/issues/4201 +[gh4260]: https://github.com/tomchristie/django-rest-framework/issues/4260 +[gh4278]: https://github.com/tomchristie/django-rest-framework/issues/4278 +[gh4279]: https://github.com/tomchristie/django-rest-framework/issues/4279 +[gh4329]: https://github.com/tomchristie/django-rest-framework/issues/4329 +[gh4370]: https://github.com/tomchristie/django-rest-framework/issues/4370 +[gh4371]: https://github.com/tomchristie/django-rest-framework/issues/4371 +[gh4372]: https://github.com/tomchristie/django-rest-framework/issues/4372 +[gh4373]: https://github.com/tomchristie/django-rest-framework/issues/4373 +[gh4374]: https://github.com/tomchristie/django-rest-framework/issues/4374 +[gh4375]: https://github.com/tomchristie/django-rest-framework/issues/4375 +[gh4376]: https://github.com/tomchristie/django-rest-framework/issues/4376 +[gh4377]: https://github.com/tomchristie/django-rest-framework/issues/4377 +[gh4378]: https://github.com/tomchristie/django-rest-framework/issues/4378 +[gh4379]: https://github.com/tomchristie/django-rest-framework/issues/4379 +[gh4380]: https://github.com/tomchristie/django-rest-framework/issues/4380 +[gh4382]: https://github.com/tomchristie/django-rest-framework/issues/4382 +[gh4383]: https://github.com/tomchristie/django-rest-framework/issues/4383 +[gh4386]: https://github.com/tomchristie/django-rest-framework/issues/4386 +[gh4387]: https://github.com/tomchristie/django-rest-framework/issues/4387 +[gh4388]: https://github.com/tomchristie/django-rest-framework/issues/4388 +[gh4390]: https://github.com/tomchristie/django-rest-framework/issues/4390 +[gh4391]: https://github.com/tomchristie/django-rest-framework/issues/4391 +[gh4392]: https://github.com/tomchristie/django-rest-framework/issues/4392 +[gh4393]: https://github.com/tomchristie/django-rest-framework/issues/4393 +[gh4394]: https://github.com/tomchristie/django-rest-framework/issues/4394 + + +[gh4416]: https://github.com/tomchristie/django-rest-framework/issues/4416 +[gh4409]: https://github.com/tomchristie/django-rest-framework/issues/4409 +[gh4415]: https://github.com/tomchristie/django-rest-framework/issues/4415 +[gh4410]: https://github.com/tomchristie/django-rest-framework/issues/4410 +[gh4408]: https://github.com/tomchristie/django-rest-framework/issues/4408 +[gh4398]: https://github.com/tomchristie/django-rest-framework/issues/4398 +[gh4407]: https://github.com/tomchristie/django-rest-framework/issues/4407 +[gh4403]: https://github.com/tomchristie/django-rest-framework/issues/4403 +[gh4404]: https://github.com/tomchristie/django-rest-framework/issues/4404 +[gh4412]: https://github.com/tomchristie/django-rest-framework/issues/4412 + + + +[gh4435]: https://github.com/tomchristie/django-rest-framework/issues/4435 +[gh4425]: https://github.com/tomchristie/django-rest-framework/issues/4425 +[gh4429]: https://github.com/tomchristie/django-rest-framework/issues/4429 +[gh3508]: https://github.com/tomchristie/django-rest-framework/issues/3508 +[gh4419]: https://github.com/tomchristie/django-rest-framework/issues/4419 +[gh4423]: https://github.com/tomchristie/django-rest-framework/issues/4423 + + + +[gh3951]: https://github.com/tomchristie/django-rest-framework/issues/3951 +[gh4500]: https://github.com/tomchristie/django-rest-framework/issues/4500 +[gh4489]: https://github.com/tomchristie/django-rest-framework/issues/4489 +[gh4490]: https://github.com/tomchristie/django-rest-framework/issues/4490 +[gh2617]: https://github.com/tomchristie/django-rest-framework/issues/2617 +[gh4472]: https://github.com/tomchristie/django-rest-framework/issues/4472 +[gh4473]: https://github.com/tomchristie/django-rest-framework/issues/4473 +[gh4495]: https://github.com/tomchristie/django-rest-framework/issues/4495 +[gh4493]: https://github.com/tomchristie/django-rest-framework/issues/4493 +[gh4465]: https://github.com/tomchristie/django-rest-framework/issues/4465 +[gh4462]: https://github.com/tomchristie/django-rest-framework/issues/4462 +[gh4458]: https://github.com/tomchristie/django-rest-framework/issues/4458 + + + +[gh4612]: https://github.com/tomchristie/django-rest-framework/issues/4612 +[gh4608]: https://github.com/tomchristie/django-rest-framework/issues/4608 +[gh4601]: https://github.com/tomchristie/django-rest-framework/issues/4601 +[gh4611]: https://github.com/tomchristie/django-rest-framework/issues/4611 +[gh4605]: https://github.com/tomchristie/django-rest-framework/issues/4605 +[gh4609]: https://github.com/tomchristie/django-rest-framework/issues/4609 +[gh4606]: https://github.com/tomchristie/django-rest-framework/issues/4606 +[gh4600]: https://github.com/tomchristie/django-rest-framework/issues/4600 + + + +[gh4631]: https://github.com/tomchristie/django-rest-framework/issues/4631 +[gh4638]: https://github.com/tomchristie/django-rest-framework/issues/4638 +[gh4532]: https://github.com/tomchristie/django-rest-framework/issues/4532 +[gh4636]: https://github.com/tomchristie/django-rest-framework/issues/4636 +[gh4622]: https://github.com/tomchristie/django-rest-framework/issues/4622 +[gh4602]: https://github.com/tomchristie/django-rest-framework/issues/4602 +[gh4640]: https://github.com/tomchristie/django-rest-framework/issues/4640 +[gh4624]: https://github.com/tomchristie/django-rest-framework/issues/4624 +[gh4569]: https://github.com/tomchristie/django-rest-framework/issues/4569 +[gh4627]: https://github.com/tomchristie/django-rest-framework/issues/4627 +[gh4620]: https://github.com/tomchristie/django-rest-framework/issues/4620 +[gh4628]: https://github.com/tomchristie/django-rest-framework/issues/4628 +[gh4639]: https://github.com/tomchristie/django-rest-framework/issues/4639 diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 4be88d618..3fba9b5da 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -238,6 +238,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-chain][djangorestframework-chain] - Allows arbitrary chaining of both relations and lookup filters. * [django-url-filter][django-url-filter] - Allows a safe way to filter data via human-friendly URLs. It is a generic library which is not tied to DRF but it provides easy integration with DRF. +* [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. ### Misc @@ -273,8 +274,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [Ember and Django Part 1 (Video)][ember-and-django-part 1-video] * [Django Rest Framework Part 1 (Video)][django-rest-framework-part-1-video] -* [Pyowa July 2013 - Django Rest Framework (Video)][pyowa-july-2013-django-rest-framework-video] -* [django-rest-framework and angularjs (Video)][django-rest-framework-and-angularjs-video] ### Articles @@ -335,7 +334,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [ember-django-adapter]: https://github.com/dustinfarris/ember-django-adapter [beginners-guide-to-the-django-rest-framework]: http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786 [getting-started-with-django-rest-framework-and-angularjs]: http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html -[end-to-end-web-app-with-django-rest-framework-angularjs]: http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework +[end-to-end-web-app-with-django-rest-framework-angularjs]: http://mourafiq.com/2013/07/01/end-to-end-web-app-with-django-angular-1.html [start-your-api-django-rest-framework-part-1]: https://godjango.com/41-start-your-api-django-rest-framework-part-1/ [permissions-authentication-django-rest-framework-part-2]: https://godjango.com/43-permissions-authentication-django-rest-framework-part-2/ [viewsets-and-routers-django-rest-framework-part-3]: https://godjango.com/45-viewsets-and-routers-django-rest-framework-part-3/ @@ -343,8 +342,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [check-credentials-using-django-rest-framework]: http://richardtier.com/2014/03/06/110/ [ember-and-django-part 1-video]: http://www.neckbeardrepublic.com/screencasts/ember-and-django-part-1 [django-rest-framework-part-1-video]: http://www.neckbeardrepublic.com/screencasts/django-rest-framework-part-1 -[pyowa-july-2013-django-rest-framework-video]: http://www.youtube.com/watch?v=e1zrehvxpbo -[django-rest-framework-and-angularjs-video]: http://www.youtube.com/watch?v=q8frbgtj020 [web-api-performance-profiling-django-rest-framework]: http://dabapps.com/blog/api-performance-profiling-django-rest-framework/ [api-development-with-django-and-django-rest-framework]: https://bnotions.com/api-development-with-django-and-django-rest-framework/ [django-rest-auth]: https://github.com/Tivix/django-rest-auth/ @@ -355,6 +352,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces [dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions [django-url-filter]: https://github.com/miki725/django-url-filter +[drf-url-filter]: https://github.com/manjitkumar/drf-url-filters [cookiecutter-django-rest]: https://github.com/agconti/cookiecutter-django-rest [drf-haystack]: https://drf-haystack.readthedocs.io/en/latest/ [django-rest-framework-version-transforms]: https://github.com/mrhwick/django-rest-framework-version-transforms diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 87856e037..04fb6914a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -88,7 +88,7 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): - pk = serializers.IntegerField(read_only=True) + id = serializers.IntegerField(read_only=True) title = serializers.CharField(required=False, allow_blank=True, max_length=100) code = serializers.CharField(style={'base_template': 'textarea.html'}) linenos = serializers.BooleanField(required=False) @@ -144,13 +144,13 @@ We've now got a few snippet instances to play with. Let's take a look at serial serializer = SnippetSerializer(snippet) serializer.data - # {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} + # {'id': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} At this point we've translated the model instance into Python native datatypes. To finalize the serialization process we render the data into `json`. content = JSONRenderer().render(serializer.data) content - # '{"pk": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}' + # '{"id": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}' Deserialization is similar. First we parse a stream into Python native datatypes... @@ -175,7 +175,7 @@ We can also serialize querysets instead of model instances. To do so we simply serializer = SnippetSerializer(Snippet.objects.all(), many=True) serializer.data - # [OrderedDict([('pk', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 3), ('title', u''), ('code', u'print "hello, world"'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] + # [OrderedDict([('id', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('id', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('id', 3), ('title', u''), ('code', u'print "hello, world"'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] ## Using ModelSerializers diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 511c50870..5c020a1f7 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -25,7 +25,7 @@ Using numeric HTTP status codes in your views doesn't always make for obvious re REST framework provides two wrappers you can use to write API views. 1. The `@api_view` decorator for working with function based views. -2. The `APIView` class for working with class based views. +2. The `APIView` class for working with class-based views. These wrappers provide a few bits of functionality such as making sure you receive `Request` instances in your view, and adding context to `Response` objects so that content negotiation can be performed. @@ -96,7 +96,7 @@ Notice that we're no longer explicitly tying our requests or responses to a give ## Adding optional format suffixes to our URLs -To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4/.json][json-url]. +To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4.json][json-url]. Start by adding a `format` keyword argument to both of the views, like so. @@ -200,9 +200,9 @@ See the [browsable api][browsable-api] topic for more information about the brow ## What's next? -In [tutorial part 3][tut-3], we'll start using class based views, and see how generic views reduce the amount of code we need to write. +In [tutorial part 3][tut-3], we'll start using class-based views, and see how generic views reduce the amount of code we need to write. -[json-url]: http://example.com/api/items/4/.json +[json-url]: http://example.com/api/items/4.json [devserver]: http://127.0.0.1:8000/snippets/ [browsable-api]: ../topics/browsable-api.md [tut-1]: 1-serialization.md diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index abf82e495..f018666f5 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -1,10 +1,10 @@ -# Tutorial 3: Class Based Views +# Tutorial 3: Class-based Views -We can also write our API views using class based views, rather than function based views. As we'll see this is a powerful pattern that allows us to reuse common functionality, and helps us keep our code [DRY][dry]. +We can also write our API views using class-based views, rather than function based views. As we'll see this is a powerful pattern that allows us to reuse common functionality, and helps us keep our code [DRY][dry]. -## Rewriting our API using class based views +## Rewriting our API using class-based views -We'll start by rewriting the root view as a class based view. All this involves is a little bit of refactoring of `views.py`. +We'll start by rewriting the root view as a class-based view. All this involves is a little bit of refactoring of `views.py`. from snippets.models import Snippet from snippets.serializers import SnippetSerializer @@ -62,7 +62,7 @@ So far, so good. It looks pretty similar to the previous case, but we've got be That's looking good. Again, it's still pretty similar to the function based view right now. -We'll also need to refactor our `urls.py` slightly now we're using class based views. +We'll also need to refactor our `urls.py` slightly now we're using class-based views. from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns @@ -79,7 +79,7 @@ Okay, we're done. If you run the development server everything should be workin ## Using mixins -One of the big wins of using class based views is that it allows us to easily compose reusable bits of behaviour. +One of the big wins of using class-based views is that it allows us to easily compose reusable bits of behaviour. The create/retrieve/update/delete operations that we've been using so far are going to be pretty similar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes. @@ -124,7 +124,7 @@ The base class provides the core functionality, and the mixin classes provide th Pretty similar. Again we're using the `GenericAPIView` class to provide the core functionality, and adding in mixins to provide the `.retrieve()`, `.update()` and `.destroy()` actions. -## Using generic class based views +## Using generic class-based views Using the mixin classes we've rewritten the views to use slightly less code than before, but we can go one step further. REST framework provides a set of already mixed-in generic views that we can use to trim down our `views.py` module even more. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 74fe51895..43ccf9186 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -14,7 +14,7 @@ First, let's add a couple of fields. One of those fields will be used to repres Add the following two fields to the `Snippet` model in `models.py`. - owner = models.ForeignKey('auth.User', related_name='snippets') + owner = models.ForeignKey('auth.User', related_name='snippets', on_delete=models.CASCADE) highlighted = models.TextField() We'd also need to make sure that when the model is saved, that we populate the highlighted field, using the `pygments` code highlighting library. @@ -67,7 +67,7 @@ Now that we've got some users to work with, we'd better add representations of t Because `'snippets'` is a *reverse* relationship on the User model, it will not be included by default when using the `ModelSerializer` class, so we needed to add an explicit field for it. -We'll also add a couple of views to `views.py`. We'd like to just use read-only views for the user representations, so we'll use the `ListAPIView` and `RetrieveAPIView` generic class based views. +We'll also add a couple of views to `views.py`. We'd like to just use read-only views for the user representations, so we'll use the `ListAPIView` and `RetrieveAPIView` generic class-based views. from django.contrib.auth.models import User @@ -150,7 +150,7 @@ The `r'^api-auth/'` part of pattern can actually be whatever URL you want to use Now if you open up the browser again and refresh the page you'll see a 'Login' link in the top right of the page. If you log in as one of the users you created earlier, you'll be able to create code snippets again. -Once you've created a few code snippets, navigate to the '/users/' endpoint, and notice that the representation includes a list of the snippet pks that are associated with each user, in each user's 'snippets' field. +Once you've created a few code snippets, navigate to the '/users/' endpoint, and notice that the representation includes a list of the snippet ids that are associated with each user, in each user's 'snippets' field. ## Object level permissions diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 4b9347bfa..9fd61b414 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -18,7 +18,7 @@ Right now we have endpoints for 'snippets' and 'users', but we don't have a sing 'snippets': reverse('snippet-list', request=request, format=format) }) -Two things should be noticed here. First, we're using REST framework's `reverse` function in order to return fully-qualified URLs; second, URL patterns are identified by convenience names that we will declare later on in our `snippets/urls.py`. +Two things should be noticed here. First, we're using REST framework's `reverse` function in order to return fully-qualified URLs; second, URL patterns are identified by convenience names that we will declare later on in our `snippets/urls.py`. ## Creating an endpoint for the highlighted snippets @@ -67,7 +67,7 @@ In this case we'd like to use a hyperlinked style between entities. In order to The `HyperlinkedModelSerializer` has the following differences from `ModelSerializer`: -* It does not include the `pk` field by default. +* It does not include the `id` field by default. * It includes a `url` field, using `HyperlinkedIdentityField`. * Relationships use `HyperlinkedRelatedField`, instead of `PrimaryKeyRelatedField`. @@ -80,7 +80,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = Snippet - fields = ('url', 'highlight', 'owner', + fields = ('url', 'id', 'highlight', 'owner', 'title', 'code', 'linenos', 'language', 'style') @@ -89,7 +89,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = User - fields = ('url', 'username', 'snippets') + fields = ('url', 'id', 'username', 'snippets') Notice that we've also added a new `'highlight'` field. This field is of the same type as the `url` field, except that it points to the `'snippet-highlight'` url pattern, instead of the `'snippet-detail'` url pattern. diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 00152cc17..6189c7771 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -51,7 +51,7 @@ This time we've used the `ModelViewSet` class in order to get the complete set o Notice that we've also used the `@detail_route` decorator to create a custom action, named `highlight`. This decorator can be used to add any custom endpoints that don't fit into the standard `create`/`update`/`delete` style. -Custom actions which use the `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. +Custom actions which use the `@detail_route` decorator will respond to `GET` requests by default. We can use the `methods` argument if we wanted an action that responded to `POST` requests. The URLs for custom actions by default depend on the method name itself. If you want to change the way url should be constructed, you can include url_path as a decorator keyword argument. diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index 8d772a5bf..eb1982955 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -33,10 +33,17 @@ API schema. $ pip install coreapi -We can now include a schema for our API, by adding a `schema_title` argument to -the router instantiation. +We can now include a schema for our API, by including an autogenerated schema +view in our URL configuration. - router = DefaultRouter(schema_title='Pastebin API') + from rest_framework.schemas import get_schema_view + + schema_view = get_schema_view(title='Pastebin API') + + urlpatterns = [ + url('^schema/$', schema_view), + ... + ] If you visit the API root endpoint in a browser you should now see `corejson` representation become available as an option. @@ -46,10 +53,10 @@ representation become available as an option. We can also request the schema from the command line, by specifying the desired content type in the `Accept` header. - $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json + $ http http://127.0.0.1:8000/schema/ Accept:application/coreapi+json HTTP/1.0 200 OK Allow: GET, HEAD, OPTIONS - Content-Type: application/vnd.coreapi+json + Content-Type: application/coreapi+json { "_meta": { @@ -67,9 +74,13 @@ also supported. Now that our API is exposing a schema endpoint, we can use a dynamic client library to interact with the API. To demonstrate this, let's use the -Core API command line client. We've already installed the `coreapi` package -using `pip`, so the client tool should already be installed. Check that it -is available on the command line... +Core API command line client. + +The command line client is available as the `coreapi-cli` package: + + $ pip install coreapi-cli + +Now check that it is available on the command line... $ coreapi Usage: coreapi [OPTIONS] COMMAND [ARGS]... @@ -87,16 +98,16 @@ is available on the command line... First we'll load the API schema using the command line client. - $ coreapi get http://127.0.0.1:8000/ - + $ coreapi get http://127.0.0.1:8000/schema/ + snippets: { - highlight(pk) + highlight(id) list() - retrieve(pk) + read(id) } users: { list() - retrieve(pk) + read(id) } We haven't authenticated yet, so right now we're only able to see the read only @@ -108,6 +119,7 @@ Let's try listing the existing snippets, using the command line client: [ { "url": "http://127.0.0.1:8000/snippets/1/", + "id": 1, "highlight": "http://127.0.0.1:8000/snippets/1/highlight/", "owner": "lucy", "title": "Example", @@ -121,7 +133,7 @@ Let's try listing the existing snippets, using the command line client: Some of the API endpoints require named parameters. For example, to get back the highlight HTML for a particular snippet we need to provide an id. - $ coreapi action snippets highlight --param pk 1 + $ coreapi action snippets highlight --param id=1 @@ -145,25 +157,25 @@ Now if we fetch the schema again, we should be able to see the full set of available interactions. $ coreapi reload - Pastebin API "http://127.0.0.1:8000/"> + Pastebin API "http://127.0.0.1:8000/schema/"> snippets: { create(code, [title], [linenos], [language], [style]) - destroy(pk) - highlight(pk) + delete(id) + highlight(id) list() - partial_update(pk, [title], [code], [linenos], [language], [style]) - retrieve(pk) - update(pk, code, [title], [linenos], [language], [style]) + partial_update(id, [title], [code], [linenos], [language], [style]) + read(id) + update(id, code, [title], [linenos], [language], [style]) } users: { list() - retrieve(pk) + read(id) } We're now able to interact with these endpoints. For example, to create a new snippet: - $ coreapi action snippets create --param title "Example" --param code "print('hello, world')" + $ coreapi action snippets create --param title="Example" --param code="print('hello, world')" { "url": "http://127.0.0.1:8000/snippets/7/", "id": 7, @@ -178,7 +190,7 @@ snippet: And to delete a snippet: - $ coreapi action snippets destroy --param pk 7 + $ coreapi action snippets delete --param id=7 As well as the command line client, developers can also interact with your API using client libraries. The Python client library is the first of these diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 0c9ddf8f2..96fed2767 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -104,7 +104,7 @@ Okay, now let's wire up the API URLs. On to `tutorial/urls.py`... Because we're using viewsets instead of views, we can automatically generate the URL conf for our API, by simply registering the viewsets with a router class. -Again, if we need more control over the API URLs we can simply drop down to using regular class based views, and writing the URL conf explicitly. +Again, if we need more control over the API URLs we can simply drop down to using regular class-based views, and writing the URL conf explicitly. Finally, we're including default login and logout views for use with the browsable API. That's optional, but useful if your API requires authentication and you want to use the browsable API. diff --git a/mkdocs.yml b/mkdocs.yml index b10fbefb5..01c59caaa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -65,6 +65,8 @@ pages: - '3.1 Announcement': 'topics/3.1-announcement.md' - '3.2 Announcement': 'topics/3.2-announcement.md' - '3.3 Announcement': 'topics/3.3-announcement.md' + - '3.4 Announcement': 'topics/3.4-announcement.md' + - '3.5 Announcement': 'topics/3.5-announcement.md' - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md' - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 54c080491..86c4f7709 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 -django-guardian==1.4.3 -django-filter==0.13.0 -coreapi==1.21.1 +django-guardian==1.4.6 +django-filter==0.15.3 +coreapi==2.0.8 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 6f02b8039..fe82763a9 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.3.3' +__version__ = '3.5.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index df0c48b86..b91a8454f 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -16,15 +16,18 @@ class AuthTokenSerializer(serializers.Serializer): user = authenticate(username=username, password=password) if user: + # From Django 1.10 onwards the `authenticate` call simply + # returns `None` for is_active=False users. + # (Assuming the default `ModelBackend` authentication backend.) if not user.is_active: msg = _('User account is disabled.') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') else: msg = _('Unable to log in with provided credentials.') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') else: msg = _('Must include "username" and "password".') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') attrs['user'] = user return attrs diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 9c69eaa03..b0e076203 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -23,6 +23,22 @@ except ImportError: from django.utils import importlib # Will be removed in Django 1.9 +try: + from django.urls import ( + NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + ) +except ImportError: + from django.core.urlresolvers import ( # Will be removed in Django 2.0 + NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + ) + + +try: + import urlparse # Python 2.x +except ImportError: + import urllib.parse as urlparse + + def unicode_repr(instance): # Get the repr of an instance, but ensure it is a unicode string # on both python 3 (already the case) and 2 (not the case). @@ -116,6 +132,18 @@ def _resolve_model(obj): raise ValueError("{0} is not a Django model".format(obj)) +def is_authenticated(user): + if django.VERSION < (1, 10): + return user.is_authenticated() + return user.is_authenticated + + +def is_anonymous(user): + if django.VERSION < (1, 10): + return user.is_anonymous() + return user.is_anonymous + + def get_related_model(field): if django.VERSION < (1, 9): return _resolve_model(field.rel.to) @@ -125,7 +153,7 @@ def get_related_model(field): def value_from_object(field, obj): if django.VERSION < (1, 9): return field._get_val_from_obj(obj) - field.value_from_object(obj) + return field.value_from_object(obj) # contrib.postgres only supported from 1.8 onwards. @@ -142,6 +170,16 @@ except ImportError: JSONField = None +# coreapi is optional (Note that uritemplate is a dependency of coreapi) +try: + import coreapi + import uritemplate +except (ImportError, SyntaxError): + # SyntaxError is possible under python 3.2 + coreapi = None + uritemplate = None + + # django-filter is optional try: import django_filters @@ -156,14 +194,11 @@ except ImportError: crispy_forms = None -# coreapi is optional (Note that uritemplate is a dependancy of coreapi) +# requests is optional try: - import coreapi - import uritemplate -except (ImportError, SyntaxError): - # SyntaxError is possible under python 3.2 - coreapi = None - uritemplate = None + import requests +except ImportError: + requests = None # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS @@ -172,7 +207,6 @@ guardian = None try: if 'guardian' in settings.INSTALLED_APPS: import guardian - import guardian.shortcuts # Fixes #1624 except ImportError: pass @@ -188,8 +222,13 @@ try: if markdown.version <= '2.2': HEADERID_EXT_PATH = 'headerid' - else: + LEVEL_PARAM = 'level' + elif markdown.version < '2.6': HEADERID_EXT_PATH = 'markdown.extensions.headerid' + LEVEL_PARAM = 'level' + else: + HEADERID_EXT_PATH = 'markdown.extensions.toc' + LEVEL_PARAM = 'baselevel' def apply_markdown(text): """ @@ -199,7 +238,7 @@ try: extensions = [HEADERID_EXT_PATH] extension_configs = { HEADERID_EXT_PATH: { - 'level': '2' + LEVEL_PARAM: '2' } } md = markdown.Markdown( @@ -265,3 +304,11 @@ def template_render(template, context=None, request=None): # backends template, e.g. django.template.backends.django.Template else: return template.render(context, request=request) + + +def set_many(instance, field, value): + if django.VERSION < (1, 10): + setattr(instance, field, value) + else: + field = getattr(instance, field) + field.set(value) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 1b21e643b..bf9b32aaa 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -15,7 +15,7 @@ from django.utils import six from rest_framework.views import APIView -def api_view(http_method_names=None): +def api_view(http_method_names=None, exclude_from_schema=False): """ Decorator that converts a function-based view into an APIView subclass. Takes a list of allowed methods for the view as an argument. @@ -55,6 +55,7 @@ def api_view(http_method_names=None): setattr(WrappedAPIView, method.lower(), handler) WrappedAPIView.__name__ = func.__name__ + WrappedAPIView.__module__ = func.__module__ WrappedAPIView.renderer_classes = getattr(func, 'renderer_classes', APIView.renderer_classes) @@ -71,6 +72,7 @@ def api_view(http_method_names=None): WrappedAPIView.permission_classes = getattr(func, 'permission_classes', APIView.permission_classes) + WrappedAPIView.exclude_from_schema = exclude_from_schema return WrappedAPIView.as_view() return decorator diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 29afaffe0..e84074a07 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -17,27 +17,61 @@ from rest_framework import status from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList -def _force_text_recursive(data): +def _get_error_details(data, default_code=None): """ Descend into a nested data structure, forcing any - lazy translation strings into plain text. + lazy translation strings or strings into `ErrorDetail`. """ if isinstance(data, list): ret = [ - _force_text_recursive(item) for item in data + _get_error_details(item, default_code) for item in data ] if isinstance(data, ReturnList): return ReturnList(ret, serializer=data.serializer) return ret elif isinstance(data, dict): ret = { - key: _force_text_recursive(value) + key: _get_error_details(value, default_code) for key, value in data.items() } if isinstance(data, ReturnDict): return ReturnDict(ret, serializer=data.serializer) return ret - return force_text(data) + + text = force_text(data) + code = getattr(data, 'code', default_code) + return ErrorDetail(text, code) + + +def _get_codes(detail): + if isinstance(detail, list): + return [_get_codes(item) for item in detail] + elif isinstance(detail, dict): + return {key: _get_codes(value) for key, value in detail.items()} + return detail.code + + +def _get_full_details(detail): + if isinstance(detail, list): + return [_get_full_details(item) for item in detail] + elif isinstance(detail, dict): + return {key: _get_full_details(value) for key, value in detail.items()} + return { + 'message': detail, + 'code': detail.code + } + + +class ErrorDetail(six.text_type): + """ + A string-like object that can additionally + """ + code = None + + def __new__(cls, string, code=None): + self = super(ErrorDetail, cls).__new__(cls, string) + self.code = code + return self class APIException(Exception): @@ -47,16 +81,35 @@ class APIException(Exception): """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR default_detail = _('A server error occurred.') + default_code = 'error' - def __init__(self, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) + def __init__(self, detail=None, code=None): + if detail is None: + detail = self.default_detail + if code is None: + code = self.default_code + + self.detail = _get_error_details(detail, code) def __str__(self): return self.detail + def get_codes(self): + """ + Return only the code part of the error details. + + Eg. {"name": ["required"]} + """ + return _get_codes(self.detail) + + def get_full_details(self): + """ + Return both the message & code parts of the error details. + + Eg. {"name": [{"message": "This field is required.", "code": "required"}]} + """ + return _get_full_details(self.detail) + # The recommended style for using `ValidationError` is to keep it namespaced # under `serializers`, in order to minimize potential confusion with Django's @@ -67,13 +120,21 @@ class APIException(Exception): class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST + default_detail = _('Invalid input.') + default_code = 'invalid' - def __init__(self, detail): - # For validation errors the 'detail' key is always required. - # The details should always be coerced to a list if not already. + def __init__(self, detail, code=None): + if detail is None: + detail = self.default_detail + if code is None: + code = self.default_code + + # For validation failures, we may collect may errors together, so the + # details should always be coerced to a list if not already. if not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] - self.detail = _force_text_recursive(detail) + + self.detail = _get_error_details(detail, code) def __str__(self): return six.text_type(self.detail) @@ -82,62 +143,63 @@ class ValidationError(APIException): class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST default_detail = _('Malformed request.') + default_code = 'parse_error' class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = _('Incorrect authentication credentials.') + default_code = 'authentication_failed' class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = _('Authentication credentials were not provided.') + default_code = 'not_authenticated' class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN default_detail = _('You do not have permission to perform this action.') + default_code = 'permission_denied' class NotFound(APIException): status_code = status.HTTP_404_NOT_FOUND default_detail = _('Not found.') + default_code = 'not_found' class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED default_detail = _('Method "{method}" not allowed.') + default_code = 'method_not_allowed' - def __init__(self, method, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail).format(method=method) + def __init__(self, method, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail).format(method=method) + super(MethodNotAllowed, self).__init__(detail, code) class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE default_detail = _('Could not satisfy the request Accept header.') + default_code = 'not_acceptable' - def __init__(self, detail=None, available_renderers=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) + def __init__(self, detail=None, code=None, available_renderers=None): self.available_renderers = available_renderers + super(NotAcceptable, self).__init__(detail, code) class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE default_detail = _('Unsupported media type "{media_type}" in request.') + default_code = 'unsupported_media_type' - def __init__(self, media_type, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail).format( - media_type=media_type - ) + def __init__(self, media_type, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail).format(media_type=media_type) + super(UnsupportedMediaType, self).__init__(detail, code) class Throttled(APIException): @@ -145,19 +207,17 @@ class Throttled(APIException): default_detail = _('Request was throttled.') extra_detail_singular = 'Expected available in {wait} second.' extra_detail_plural = 'Expected available in {wait} seconds.' + default_code = 'throttled' - def __init__(self, wait=None, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) - - if wait is None: - self.wait = None - else: - self.wait = math.ceil(wait) - self.detail += ' ' + force_text(ungettext( - self.extra_detail_singular.format(wait=self.wait), - self.extra_detail_plural.format(wait=self.wait), - self.wait - )) + def __init__(self, wait=None, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail) + if wait is not None: + wait = math.ceil(wait) + detail = ' '.join(( + detail, + force_text(ungettext(self.extra_detail_singular.format(wait=wait), + self.extra_detail_plural.format(wait=wait), + wait)))) + self.wait = wait + super(Throttled, self).__init__(detail, code) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index aaf9ef14f..13b5145ba 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -25,6 +25,7 @@ from django.utils.dateparse import ( ) from django.utils.duration import duration_string from django.utils.encoding import is_protected_type, smart_text +from django.utils.formats import localize_input, sanitize_separators from django.utils.functional import cached_property from django.utils.ipv6 import clean_ipv6_address from django.utils.translation import ugettext_lazy as _ @@ -33,7 +34,7 @@ from rest_framework import ISO_8601 from rest_framework.compat import ( get_remote_field, unicode_repr, unicode_to_repr, value_from_object ) -from rest_framework.exceptions import ValidationError +from rest_framework.exceptions import ErrorDetail, ValidationError from rest_framework.settings import api_settings from rest_framework.utils import html, humanize_datetime, representation @@ -48,20 +49,39 @@ class empty: pass -def is_simple_callable(obj): - """ - True if the object is a callable that takes no arguments. - """ - function = inspect.isfunction(obj) - method = inspect.ismethod(obj) +if six.PY3: + def is_simple_callable(obj): + """ + True if the object is a callable that takes no arguments. + """ + if not (inspect.isfunction(obj) or inspect.ismethod(obj)): + return False - if not (function or method): - return False + sig = inspect.signature(obj) + params = sig.parameters.values() + return all( + param.kind == param.VAR_POSITIONAL or + param.kind == param.VAR_KEYWORD or + param.default != param.empty + for param in params + ) - args, _, _, defaults = inspect.getargspec(obj) - len_args = len(args) if function else len(args) - 1 - len_defaults = len(defaults) if defaults else 0 - return len_args <= len_defaults +else: + def is_simple_callable(obj): + function = inspect.isfunction(obj) + method = inspect.ismethod(obj) + + if not (function or method): + return False + + if method: + is_unbound = obj.im_self is None + + args, _, _, defaults = inspect.getargspec(obj) + + len_args = len(args) if function or is_unbound else len(args) - 1 + len_defaults = len(defaults) if defaults else 0 + return len_args <= len_defaults def get_attribute(instance, attrs): @@ -209,6 +229,18 @@ def iter_options(grouped_choices, cutoff=None, cutoff_text=None): yield Option(value='n/a', display_text=cutoff_text, disabled=True) +def get_error_detail(exc_info): + """ + Given a Django ValidationError, return a list of ErrorDetail, + with the `code` populated. + """ + code = getattr(exc_info, 'code', None) or 'invalid' + return [ + ErrorDetail(msg, code=code) + for msg in exc_info.messages + ] + + class CreateOnlyDefault(object): """ This class may be used to provide default values that are only used @@ -251,6 +283,8 @@ class SkipField(Exception): pass +REGEX_TYPE = type(re.compile('')) + NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' @@ -394,8 +428,8 @@ class Field(object): # determine if we should use null instead. return '' if getattr(self, 'allow_blank', False) else None elif ret == '' and not self.required: - # If the field is blank, and emptyness is valid then - # determine if we should use emptyness instead. + # If the field is blank, and emptiness is valid then + # determine if we should use emptiness instead. return '' if getattr(self, 'allow_blank', False) else empty return ret return dictionary.get(self.field_name, empty) @@ -431,10 +465,11 @@ class Field(object): is provided for this field. If a default has not been set for this field then this will simply - return `empty`, indicating that no value should be set in the + raise `SkipField`, indicating that no value should be set in the validated data for this field. """ - if self.default is empty: + if self.default is empty or getattr(self.root, 'partial', False): + # No default, or this is a partial update. raise SkipField() if callable(self.default): if hasattr(self.default, 'set_context'): @@ -507,7 +542,7 @@ class Field(object): raise errors.extend(exc.detail) except DjangoValidationError as exc: - errors.extend(exc.messages) + errors.extend(get_error_detail(exc)) if errors: raise ValidationError(errors) @@ -545,7 +580,7 @@ class Field(object): msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) message_string = msg.format(**kwargs) - raise ValidationError(message_string) + raise ValidationError(message_string, code=key) @cached_property def root(self): @@ -579,16 +614,17 @@ class Field(object): When cloning fields we instantiate using the arguments it was originally created with, rather than copying the complete state. """ - args = copy.deepcopy(self._args) - kwargs = dict(self._kwargs) - # Bit ugly, but we need to special case 'validators' as Django's - # RegexValidator does not support deepcopy. - # We treat validator callables as immutable objects. + # Treat regexes and validators as immutable. # See https://github.com/tomchristie/django-rest-framework/issues/1954 - validators = kwargs.pop('validators', None) - kwargs = copy.deepcopy(kwargs) - if validators is not None: - kwargs['validators'] = validators + # and https://github.com/tomchristie/django-rest-framework/pull/4489 + args = [ + copy.deepcopy(item) if not isinstance(item, REGEX_TYPE) else item + for item in self._args + ] + kwargs = { + key: (copy.deepcopy(value) if (key not in ('validators', 'regex')) else value) + for key, value in self._kwargs.items() + } return self.__class__(*args, **kwargs) def __repr__(self): @@ -608,8 +644,20 @@ class BooleanField(Field): } default_empty_html = False initial = False - TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} - FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} + TRUE_VALUES = { + 't', 'T', + 'true', 'True', 'TRUE', + 'on', 'On', 'ON', + '1', 1, + True + } + FALSE_VALUES = { + 'f', 'F', + 'false', 'False', 'FALSE', + 'off', 'Off', 'OFF', + '0', 0, 0.0, + False + } def __init__(self, **kwargs): assert 'allow_null' not in kwargs, '`allow_null` is not a valid option. Use `NullBooleanField` instead.' @@ -670,6 +718,7 @@ class NullBooleanField(Field): class CharField(Field): default_error_messages = { + 'invalid': _('Not a valid string.'), 'blank': _('This field may not be blank.'), 'max_length': _('Ensure this field has no more than {max_length} characters.'), 'min_length': _('Ensure this field has at least {min_length} characters.') @@ -700,6 +749,11 @@ class CharField(Field): return super(CharField, self).run_validation(data) def to_internal_value(self, data): + # We're lenient with allowing basic numerics to be coerced into strings, + # but other types should fail. Eg. unclear if booleans should represent as `true` or `True`, + # and composites such as lists are likely user error. + if isinstance(data, bool) or not isinstance(data, six.string_types + six.integer_types + (float,)): + self.fail('invalid') value = six.text_type(data) return value.strip() if self.trim_whitespace else value @@ -803,7 +857,10 @@ class IPAddressField(CharField): self.validators.extend(validators) def to_internal_value(self, data): - if data and ':' in data: + if not isinstance(data, six.string_types): + self.fail('invalid', value=data) + + if ':' in data: try: if self.protocol in ('both', 'ipv6'): return clean_ipv6_address(data, self.unpack_ipv4) @@ -871,6 +928,7 @@ class FloatField(Field): self.validators.append(MinValueValidator(self.min_value, message=message)) def to_internal_value(self, data): + if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: self.fail('max_string_length') @@ -895,11 +953,15 @@ class DecimalField(Field): } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. - def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, **kwargs): + def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, + localize=False, **kwargs): self.max_digits = max_digits self.decimal_places = decimal_places + self.localize = localize if coerce_to_string is not None: self.coerce_to_string = coerce_to_string + if self.localize: + self.coerce_to_string = True self.max_value = max_value self.min_value = min_value @@ -923,7 +985,12 @@ class DecimalField(Field): Validate that the input is a decimal number and return a Decimal instance. """ + data = smart_text(data).strip() + + if self.localize: + data = sanitize_separators(data) + if len(data) > self.MAX_STRING_LENGTH: self.fail('max_string_length') @@ -941,7 +1008,7 @@ class DecimalField(Field): if value in (decimal.Decimal('Inf'), decimal.Decimal('-Inf')): self.fail('invalid') - return self.validate_precision(value) + return self.quantize(self.validate_precision(value)) def validate_precision(self, value): """ @@ -988,6 +1055,9 @@ class DecimalField(Field): if not coerce_to_string: return quantized + if self.localize: + return localize_input(quantized) + return '{0:f}'.format(quantized) def quantize(self, value): @@ -998,10 +1068,12 @@ class DecimalField(Field): return value context = decimal.getcontext().copy() - context.prec = self.max_digits + if self.max_digits is not None: + context.prec = self.max_digits return value.quantize( decimal.Decimal('.1') ** self.decimal_places, - context=context) + context=context + ) # Date & time fields... @@ -1327,7 +1399,7 @@ class FilePathField(ChoiceField): def __init__(self, path, match=None, recursive=False, allow_files=True, allow_folders=False, required=None, **kwargs): - # Defer to Django's FilePathField implmentation to get the + # Defer to Django's FilePathField implementation to get the # valid set of choices. field = DjangoFilePathField( path, match=match, recursive=recursive, allow_files=allow_files, @@ -1539,9 +1611,21 @@ class JSONField(Field): self.binary = kwargs.pop('binary', False) super(JSONField, self).__init__(*args, **kwargs) + def get_value(self, dictionary): + if html.is_html_input(dictionary) and self.field_name in dictionary: + # When HTML form input is used, mark up the input + # as being a JSON string, rather than a JSON primative. + class JSONString(six.text_type): + def __new__(self, value): + ret = six.text_type.__new__(self, value) + ret.is_json_string = True + return ret + return JSONString(dictionary[self.field_name]) + return dictionary.get(self.field_name, empty) + def to_internal_value(self, data): try: - if self.binary: + if self.binary or getattr(data, 'is_json_string', False): if isinstance(data, six.binary_type): data = data.decode('utf-8') return json.loads(data) @@ -1630,7 +1714,7 @@ class SerializerMethodField(Field): def bind(self, field_name, parent): # In order to enforce a consistent style, we error if a redundant # 'method_name' argument has been used. For example: - # my_field = serializer.CharField(source='my_field') + # my_field = serializer.SerializerMethodField(method_name='get_my_field') default_method_name = 'get_{field_name}'.format(field_name=field_name) assert self.method_name != default_method_name, ( "It is redundant to specify `%s` on SerializerMethodField '%s' in " diff --git a/rest_framework/filters.py b/rest_framework/filters.py index caff1c17f..531531efc 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -5,9 +5,9 @@ returned by list views. from __future__ import unicode_literals import operator +import warnings from functools import reduce -from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models.constants import LOOKUP_SEP @@ -16,50 +16,10 @@ from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import ( - crispy_forms, distinct, django_filters, guardian, template_render + coreapi, distinct, django_filters, guardian, template_render ) from rest_framework.settings import api_settings -if 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms and django_filters: - # If django-crispy-forms is installed, use it to get a bootstrap3 rendering - # of the DjangoFilterBackend controls when displayed as HTML. - from crispy_forms.helper import FormHelper - from crispy_forms.layout import Layout, Submit - - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - layout_components = list(self.form.fields.keys()) + [ - Submit('', _('Submit'), css_class='btn-default'), - ] - - helper = FormHelper() - helper.form_method = 'GET' - helper.template_pack = 'bootstrap3' - helper.layout = Layout(*layout_components) - - self.form.helper = helper - - filter_template = 'rest_framework/filters/django_filter_crispyforms.html' - -elif django_filters: - # If django-crispy-forms is not installed, use the standard - # 'form.as_p' rendering when DjangoFilterBackend is displayed as HTML. - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - filter_template = 'rest_framework/filters/django_filter.html' - -else: - FilterSet = None - filter_template = None - class BaseFilterBackend(object): """ @@ -72,75 +32,56 @@ class BaseFilterBackend(object): """ raise NotImplementedError(".filter_queryset() must be overridden.") - def get_fields(self, view): + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' return [] +if django_filters: + from django_filters.filterset import FilterSetMetaclass as DFFilterSetMetaclass + from django_filters.rest_framework.filterset import FilterSet as DFFilterSet + + class FilterSetMetaclass(DFFilterSetMetaclass): + def __new__(cls, name, bases, attrs): + warnings.warn( + "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " + "You should use 'django_filters.rest_framework.FilterSet' instead.", + PendingDeprecationWarning + ) + return super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs) + _BaseFilterSet = DFFilterSet +else: + # Dummy metaclass just so we can give a user-friendly error message. + class FilterSetMetaclass(type): + def __init__(self, name, bases, attrs): + # Assert only on subclasses, so we can define FilterSet below. + if bases != (object,): + assert False, 'django-filter must be installed to use the `FilterSet` class' + super(FilterSetMetaclass, self).__init__(name, bases, attrs) + _BaseFilterSet = object + + +class FilterSet(six.with_metaclass(FilterSetMetaclass, _BaseFilterSet)): + pass + + class DjangoFilterBackend(BaseFilterBackend): """ A filter backend that uses django-filter. """ - default_filter_set = FilterSet - template = filter_template - - def __init__(self): + def __new__(cls, *args, **kwargs): assert django_filters, 'Using DjangoFilterBackend, but django-filter is not installed' + assert django_filters.VERSION >= (0, 15, 3), 'django-filter 0.15.3 and above is required' - def get_filter_class(self, view, queryset=None): - """ - Return the django-filters `FilterSet` used to filter the queryset. - """ - filter_class = getattr(view, 'filter_class', None) - filter_fields = getattr(view, 'filter_fields', None) + warnings.warn( + "The built in 'rest_framework.filters.DjangoFilterBackend' is pending deprecation. " + "You should use 'django_filters.rest_framework.DjangoFilterBackend' instead.", + PendingDeprecationWarning + ) - if filter_class: - filter_model = filter_class.Meta.model + from django_filters.rest_framework import DjangoFilterBackend - assert issubclass(queryset.model, filter_model), \ - 'FilterSet model %s does not match queryset model %s' % \ - (filter_model, queryset.model) - - return filter_class - - if filter_fields: - class AutoFilterSet(self.default_filter_set): - class Meta: - model = queryset.model - fields = filter_fields - - return AutoFilterSet - - return None - - def filter_queryset(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - - if filter_class: - return filter_class(request.query_params, queryset=queryset).qs - - return queryset - - def to_html(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - if not filter_class: - return None - filter_instance = filter_class(request.query_params, queryset=queryset) - context = { - 'filter': filter_instance - } - template = loader.get_template(self.template) - return template_render(template, context) - - def get_fields(self, view): - filter_class = getattr(view, 'filter_class', None) - if filter_class: - return list(filter_class().filters.keys()) - - filter_fields = getattr(view, 'filter_fields', None) - if filter_fields: - return filter_fields - - return [] + return DjangoFilterBackend(*args, **kwargs) class SearchFilter(BaseFilterBackend): @@ -174,8 +115,8 @@ class SearchFilter(BaseFilterBackend): """ Return True if 'distinct()' should be used to query the given lookups. """ - opts = queryset.model._meta for search_field in search_fields: + opts = queryset.model._meta if search_field[0] in self.lookup_prefixes: search_field = search_field[1:] parts = search_field.split(LOOKUP_SEP) @@ -214,7 +155,7 @@ class SearchFilter(BaseFilterBackend): # Filtering against a many-to-many field requires us to # call queryset.distinct() in order to avoid duplicate items # in the resulting queryset. - # We try to avoid this is possible, for performance reasons. + # We try to avoid this if possible, for performance reasons. queryset = distinct(queryset, base) return queryset @@ -231,8 +172,9 @@ class SearchFilter(BaseFilterBackend): template = loader.get_template(self.template) return template_render(template, context) - def get_fields(self, view): - return [self.search_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [coreapi.Field(name=self.search_param, required=False, location='query')] class OrderingFilter(BaseFilterBackend): @@ -252,7 +194,7 @@ class OrderingFilter(BaseFilterBackend): params = request.query_params.get(self.ordering_param) if params: fields = [param.strip() for param in params.split(',')] - ordering = self.remove_invalid_fields(queryset, fields, view) + ordering = self.remove_invalid_fields(queryset, fields, view, request) if ordering: return ordering @@ -265,7 +207,7 @@ class OrderingFilter(BaseFilterBackend): return (ordering,) return ordering - def get_default_valid_fields(self, queryset, view): + def get_default_valid_fields(self, queryset, view, context={}): # If `ordering_fields` is not specified, then we determine a default # based on the serializer class, if one exists on the view. if hasattr(view, 'get_serializer_class'): @@ -288,16 +230,16 @@ class OrderingFilter(BaseFilterBackend): return [ (field.source or field_name, field.label) - for field_name, field in serializer_class().fields.items() + for field_name, field in serializer_class(context=context).fields.items() if not getattr(field, 'write_only', False) and not field.source == '*' ] - def get_valid_fields(self, queryset, view): + def get_valid_fields(self, queryset, view, context={}): valid_fields = getattr(view, 'ordering_fields', self.ordering_fields) if valid_fields is None: # Default to allowing filtering on serializer fields - return self.get_default_valid_fields(queryset, view) + return self.get_default_valid_fields(queryset, view, context) elif valid_fields == '__all__': # View explicitly allows filtering on any model field @@ -316,8 +258,8 @@ class OrderingFilter(BaseFilterBackend): return valid_fields - def remove_invalid_fields(self, queryset, fields, view): - valid_fields = [item[0] for item in self.get_valid_fields(queryset, view)] + def remove_invalid_fields(self, queryset, fields, view, request): + valid_fields = [item[0] for item in self.get_valid_fields(queryset, view, {'request': request})] return [term for term in fields if term.lstrip('-') in valid_fields] def filter_queryset(self, request, queryset, view): @@ -332,23 +274,25 @@ class OrderingFilter(BaseFilterBackend): current = self.get_ordering(request, queryset, view) current = None if current is None else current[0] options = [] - for key, label in self.get_valid_fields(queryset, view): - options.append((key, '%s - %s' % (label, _('ascending')))) - options.append(('-' + key, '%s - %s' % (label, _('descending')))) - return { + context = { 'request': request, 'current': current, 'param': self.ordering_param, - 'options': options, } + for key, label in self.get_valid_fields(queryset, view, context): + options.append((key, '%s - %s' % (label, _('ascending')))) + options.append(('-' + key, '%s - %s' % (label, _('descending')))) + context['options'] = options + return context def to_html(self, request, queryset, view): template = loader.get_template(self.template) context = self.get_template_context(request, queryset, view) return template_render(template, context) - def get_fields(self, view): - return [self.ordering_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [coreapi.Field(name=self.ordering_param, required=False, location='query')] class DjangoObjectPermissionsFilter(BaseFilterBackend): @@ -362,6 +306,11 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): perm_format = '%(app_label)s.view_%(model_name)s' def filter_queryset(self, request, queryset, view): + # We want to defer this import until run-time, rather than import-time. + # See https://github.com/tomchristie/django-rest-framework/issues/4608 + # (Also see #1624 for why we need to make this import explicitly) + from guardian.shortcuts import get_objects_for_user + extra = {} user = request.user model_cls = queryset.model @@ -375,4 +324,4 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): extra = {'accept_global_perms': False} else: extra = {} - return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra) + return get_objects_for_user(user, permission, queryset, **extra) diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.mo b/rest_framework/locale/ach/LC_MESSAGES/django.mo index a91bc8b32..495c1ce7d 100644 Binary files a/rest_framework/locale/ach/LC_MESSAGES/django.mo and b/rest_framework/locale/ach/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.po b/rest_framework/locale/ach/LC_MESSAGES/django.po index bfb8b75cc..a245f1510 100644 --- a/rest_framework/locale/ach/LC_MESSAGES/django.po +++ b/rest_framework/locale/ach/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Acoli (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ach/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ach\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo index 719bb0b31..06471de23 100644 Binary files a/rest_framework/locale/ar/LC_MESSAGES/django.mo and b/rest_framework/locale/ar/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.po b/rest_framework/locale/ar/LC_MESSAGES/django.po index 21c997eb1..314356654 100644 --- a/rest_framework/locale/ar/LC_MESSAGES/django.po +++ b/rest_framework/locale/ar/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bashar Al-Abdulhadi, 2016 # Eyad Toma , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Arabic (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,74 +19,74 @@ 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:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "اسم المستخدم/كلمة السر غير صحيحين." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "المستخدم غير مفعل او تم حذفه." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "رمز غير صحيح" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "رمز التفويض" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "المفتاح" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "المستخدم" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "أنشئ" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "الرمز" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "الرموز" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "اسم المستخدم" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "كلمة المرور" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -124,7 +125,6 @@ msgid "Not found." msgstr "غير موجود." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -133,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -141,214 +140,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "هذا الحقل مطلوب." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ليس قيمة منطقية." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "تأكد ان الحقل {min_length} محرف على الاقل." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "عليك ان تدخل بريد إلكتروني صالح." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "هذه القيمة لا تطابق النمط المطلوب." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "الرجاء إدخال رابط إلكتروني صالح." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "الرجاء إدخال رقم صحيح صالح." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "تأكد ان القيمة أقل أو تساوي {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "الرجاء إدخال رقم صالح." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "لم يتم إرسال أي ملف." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "الملف الذي تم إرساله فارغ." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "أرسل" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "صفحة غير صحيحة" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -365,41 +351,38 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "قيمة غير صالحة." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "مرشحات" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "مرشحات الحقول" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "الترتيب" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "البحث" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 @@ -413,27 +396,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +420,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/be/LC_MESSAGES/django.mo b/rest_framework/locale/be/LC_MESSAGES/django.mo index cf959f6d9..13a9e2569 100644 Binary files a/rest_framework/locale/be/LC_MESSAGES/django.mo and b/rest_framework/locale/be/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po index 6fe59735f..5aaa072ae 100644 --- a/rest_framework/locale/be/LC_MESSAGES/django.po +++ b/rest_framework/locale/be/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Belarusian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo index e9d5355e1..7418c1ed0 100644 Binary files a/rest_framework/locale/ca/LC_MESSAGES/django.mo and b/rest_framework/locale/ca/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.po b/rest_framework/locale/ca/LC_MESSAGES/django.po index f23310d2c..56f46319f 100644 --- a/rest_framework/locale/ca/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Catalan (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Header Basic invàlid. No hi ha disponibles les credencials." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header Basic invàlid. Les credencials no poden contenir espais." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Usuari/Contrasenya incorrectes." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuari inactiu o esborrat." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Token header invàlid. No s'han indicat les credencials." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Token header invàlid. El token no ha de contenir espais." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Token header invàlid. El token no pot contenir caràcters invàlids." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token invàlid." @@ -58,23 +58,23 @@ msgstr "Token invàlid." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "No trobat." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Mètode \"{method}\" no permès." @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "No s'ha pogut satisfer l'Accept header de la petició." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media type \"{media_type}\" no suportat." @@ -140,214 +138,201 @@ msgstr "Media type \"{media_type}\" no suportat." msgid "Request was throttled." msgstr "La petició ha estat limitada pel número màxim de peticions definit." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Aquest camp és obligatori." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Aquest camp no pot ser nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" no és un booleà." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Aquest camp no pot estar en blanc." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Aquest camp no pot tenir més de {max_length} caràcters." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Aquest camp ha de tenir un mínim de {min_length} caràcters." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Introdueixi una adreça de correu vàlida." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Aquest valor no compleix el patró requerit." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Introdueix un \"slug\" vàlid consistent en lletres, números, guions o guions baixos." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Introdueixi una URL vàlida." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" no és un UUID vàlid." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introdueixi una adreça IPv4 o IPv6 vàlida." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Es requereix un nombre enter vàlid." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Aquest valor ha de ser menor o igual a {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Aquest valor ha de ser més gran o igual a {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Valor del text massa gran." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Es requereix un nombre vàlid." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "No pot haver-hi més de {max_digits} dígits en total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "No pot haver-hi més de {max_decimal_places} decimals." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "No pot haver-hi més de {max_whole_digits} dígits abans del punt decimal." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "El Datetime té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "S'espera un Datetime però s'ha rebut un Date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "El Date té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "S'espera un Date però s'ha rebut un Datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "El Time té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durada té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no és una opció vàlida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "S'espera una llista d'ítems però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Aquesta selecció no pot estar buida." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no és un path vàlid." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No s'ha enviat cap fitxer." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Les dades enviades no són un fitxer. Comproveu l'encoding type del formulari." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No s'ha pogut determinar el nom del fitxer." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "El nom del fitxer ha de tenir com a màxim {max_length} caràcters (en té {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Envieu una imatge vàlida. El fitxer enviat no és una imatge o és una imatge corrompuda." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Aquesta llista no pot estar buida." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "S'espera un diccionari però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor invàlid." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "PK invàlida \"{pk_value}\" - l'objecte no existeix." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipus incorrecte. S'espera el valor d'una PK, s'ha rebut {data_type}." @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink invàlid - L'objecte no existeix." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipus incorrecte. S'espera una URL, s'ha rebut {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'objecte amb {slug_name}={value} no existeix." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor invàlid." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Dades invàlides. S'espera un diccionari però s'ha rebut {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "Cap" msgid "No items to select." msgstr "Cap opció seleccionada." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Aquest camp ha de ser únic." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Aquests camps {field_names} han de constituir un conjunt únic." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Aquest camp ha de ser únic per a la data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Aquest camp ha de ser únic per al mes \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"." @@ -440,15 +418,19 @@ msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versió invàlida al header \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versió invàlida a la URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versió invàlida al hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versió invàlida al paràmetre de consulta." diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo index 96a0b1ebb..3a733aa1b 100644 Binary files a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo and b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po index c4f9df6cb..c9ce5fd13 100644 --- a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca_ES/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Catalan (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo index 459b3f01f..1c98eb62d 100644 Binary files a/rest_framework/locale/cs/LC_MESSAGES/django.mo and b/rest_framework/locale/cs/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po index 43c571130..8ba979350 100644 --- a/rest_framework/locale/cs/LC_MESSAGES/django.po +++ b/rest_framework/locale/cs/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Czech (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 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:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Chybné uživatelské jméno nebo heslo." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Uživatelský účet je neaktivní nebo byl smazán." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Chybný token." @@ -60,23 +60,23 @@ msgstr "Chybný token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Nenalezeno." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoda \"{method}\" není povolena." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nelze vyhovět požadavku v hlavičce Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." @@ -142,214 +140,201 @@ msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." msgid "Request was throttled." msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Toto pole je vyžadováno." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Toto pole nesmí být prázdné (null)." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" nelze použít jako typ boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Toto pole nesmí být prázdné." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Vložte platnou e-mailovou adresu." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Vložte platný odkaz." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" není platné UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Je vyžadováno celé číslo." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Řetězec je příliš dlouhý." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Je vyžadováno číslo." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Bylo zadáno pouze datum bez času." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Bylo zadáno datum a čas, místo samotného data." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" není platnou možností." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nebyl zaslán žádný soubor." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nebylo možné zjistit jméno souboru." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Zaslaný soubor je prázdný." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Chybný kurzor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje." #: relations.py:208 -#, 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." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Chybný odkaz - objekt neexistuje." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt s {slug_name}={value} neexistuje." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Chybná hodnota." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Chybná data. Byl přijat typ {datatype} místo očekávaného slovníku." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -414,27 +396,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Tato položka musí být unikátní." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Položka {field_names} musí tvořit unikátní množinu." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Tato položka musí být pro datum \"{date_field}\" unikátní." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Tato položka musí být pro měsíc \"{date_field}\" unikátní." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." @@ -442,15 +420,19 @@ msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." msgid "Invalid version in \"Accept\" header." msgstr "Chybné číslo verze v hlavičce Accept." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Chybné číslo verze v odkazu." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Chybné číslo verze v hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Chybné čislo verze v URL parametru." diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo index 7820bdd3e..9c17c3a40 100644 Binary files a/rest_framework/locale/da/LC_MESSAGES/django.mo and b/rest_framework/locale/da/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po index 3d4e0ada2..2903376ad 100644 --- a/rest_framework/locale/da/LC_MESSAGES/django.po +++ b/rest_framework/locale/da/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Danish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimation angivet." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ugyldigt brugernavn/kodeord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Inaktiv eller slettet bruger." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Token streng bør ikke indeholde ugyldige karakterer." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ugyldigt token." @@ -60,23 +60,23 @@ msgstr "Ugyldigt token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Ikke fundet." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" er ikke tilladt." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke efterkomme forespørgslens Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." @@ -142,214 +140,201 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." msgid "Request was throttled." msgstr "Forespørgslen blev neddroslet." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dette felt er påkrævet." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dette felt må ikke være null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" er ikke en tilladt boolsk værdi." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dette felt må ikke være tomt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Tjek at dette felt indeholder mindst {min_length} tegn." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Angiv en gyldig e-mailadresse." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Denne værdi passer ikke med det påkrævede mønster." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Indtast en gyldig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" er ikke et gyldigt UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Indtast en gyldig IPv4 eller IPv6 adresse." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Et gyldigt heltal er påkrævet." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Strengværdien er for stor." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Et gyldigt tal er påkrævet." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Forventede en datotid, men fik en dato." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Forventede en dato men fik en datotid." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighed har forkert format. Brug istedet et af følgende formater: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldigt valg." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Flere end {count} objekter..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Dette valg kan være tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke et gyldigt valg af adresse." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen medsendt fil." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Filnavnet kunne ikke afgøres." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den medsendte fil er tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Denne liste er muligvis ikke tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Værdi skal være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Indsend." -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ugyldig cursor" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke." #: relations.py:208 -#, 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}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldigt hyperlink - objektet findes ikke." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Forkert type. Forventede en URL-streng, fik {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object med {slug_name}={value} findes ikke." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ugyldig værdi." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtre" @@ -414,27 +396,23 @@ msgstr "Ingen" msgid "No items to select." msgstr "Intet at vælge." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dette felt skal være unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Felterne {field_names} skal udgøre et unikt sæt." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dette felt skal være unikt for \"{date_field}\"-måneden." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette felt skal være unikt for \"{date_field}\"-året." @@ -442,15 +420,19 @@ msgstr "Dette felt skal være unikt for \"{date_field}\"-året." msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig version i \"Accept\" headeren." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ugyldig version i URL-stien." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ugyldig version i hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ugyldig version i forespørgselsparameteren." diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.mo b/rest_framework/locale/da_DK/LC_MESSAGES/django.mo deleted file mode 100644 index 0e1cc36ef..000000000 Binary files a/rest_framework/locale/da_DK/LC_MESSAGES/django.mo and /dev/null differ diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.po b/rest_framework/locale/da_DK/LC_MESSAGES/django.po deleted file mode 100644 index 7ec27dee2..000000000 --- a/rest_framework/locale/da_DK/LC_MESSAGES/django.po +++ /dev/null @@ -1,457 +0,0 @@ -# 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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" -"Language-Team: Danish (Denmark) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da_DK/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da_DK\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: authentication.py:71 -msgid "Invalid basic header. No credentials provided." -msgstr "" - -#: authentication.py:74 -msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" - -#: authentication.py:80 -msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" - -#: authentication.py:97 -msgid "Invalid username/password." -msgstr "" - -#: authentication.py:100 authentication.py:195 -msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" - -#: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" - -#: authentication.py:182 -msgid "" -"Invalid token header. Token string should not contain invalid characters." -msgstr "" - -#: authentication.py:192 -msgid "Invalid token." -msgstr "" - -#: authtoken/apps.py:7 -msgid "Auth Token" -msgstr "" - -#: authtoken/models.py:21 -msgid "Key" -msgstr "" - -#: authtoken/models.py:23 -msgid "User" -msgstr "" - -#: authtoken/models.py:24 -msgid "Created" -msgstr "" - -#: authtoken/models.py:33 -msgid "Token" -msgstr "" - -#: authtoken/models.py:34 -msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" - -#: authtoken/serializers.py:9 -msgid "Password" -msgstr "" - -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 -msgid "Unable to log in with provided credentials." -msgstr "" - -#: authtoken/serializers.py:26 -msgid "Must include \"username\" and \"password\"." -msgstr "" - -#: exceptions.py:49 -msgid "A server error occurred." -msgstr "" - -#: exceptions.py:84 -msgid "Malformed request." -msgstr "" - -#: exceptions.py:89 -msgid "Incorrect authentication credentials." -msgstr "" - -#: exceptions.py:94 -msgid "Authentication credentials were not provided." -msgstr "" - -#: exceptions.py:99 -msgid "You do not have permission to perform this action." -msgstr "" - -#: exceptions.py:104 views.py:81 -msgid "Not found." -msgstr "" - -#: exceptions.py:109 -#, python-brace-format -msgid "Method \"{method}\" not allowed." -msgstr "" - -#: exceptions.py:120 -msgid "Could not satisfy the request Accept header." -msgstr "" - -#: exceptions.py:132 -#, python-brace-format -msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" - -#: exceptions.py:145 -msgid "Request was throttled." -msgstr "" - -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 -msgid "This field is required." -msgstr "" - -#: fields.py:267 -msgid "This field may not be null." -msgstr "" - -#: fields.py:603 fields.py:634 -#, python-brace-format -msgid "\"{input}\" is not a valid boolean." -msgstr "" - -#: fields.py:669 -msgid "This field may not be blank." -msgstr "" - -#: fields.py:670 fields.py:1664 -#, python-brace-format -msgid "Ensure this field has no more than {max_length} characters." -msgstr "" - -#: fields.py:671 -#, python-brace-format -msgid "Ensure this field has at least {min_length} characters." -msgstr "" - -#: fields.py:708 -msgid "Enter a valid email address." -msgstr "" - -#: fields.py:719 -msgid "This value does not match the required pattern." -msgstr "" - -#: fields.py:730 -msgid "" -"Enter a valid \"slug\" consisting of letters, numbers, underscores or " -"hyphens." -msgstr "" - -#: fields.py:742 -msgid "Enter a valid URL." -msgstr "" - -#: fields.py:755 -#, python-brace-format -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:791 -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" - -#: fields.py:816 -msgid "A valid integer is required." -msgstr "" - -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format -msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" - -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format -msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" - -#: fields.py:819 fields.py:854 fields.py:890 -msgid "String value too large." -msgstr "" - -#: fields.py:851 fields.py:884 -msgid "A valid number is required." -msgstr "" - -#: fields.py:887 -#, python-brace-format -msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" - -#: fields.py:888 -#, python-brace-format -msgid "" -"Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" - -#: fields.py:889 -#, python-brace-format -msgid "" -"Ensure that there are no more than {max_whole_digits} digits before the " -"decimal point." -msgstr "" - -#: fields.py:1004 -#, python-brace-format -msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1005 -msgid "Expected a datetime but got a date." -msgstr "" - -#: fields.py:1082 -#, python-brace-format -msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1083 -msgid "Expected a date but got a datetime." -msgstr "" - -#: fields.py:1151 -#, python-brace-format -msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1215 -#, python-brace-format -msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1240 fields.py:1289 -#, python-brace-format -msgid "\"{input}\" is not a valid choice." -msgstr "" - -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format -msgid "More than {count} items..." -msgstr "" - -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format -msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" - -#: fields.py:1291 -msgid "This selection may not be empty." -msgstr "" - -#: fields.py:1328 -#, python-brace-format -msgid "\"{input}\" is not a valid path choice." -msgstr "" - -#: fields.py:1347 -msgid "No file was submitted." -msgstr "" - -#: fields.py:1348 -msgid "" -"The submitted data was not a file. Check the encoding type on the form." -msgstr "" - -#: fields.py:1349 -msgid "No filename could be determined." -msgstr "" - -#: fields.py:1350 -msgid "The submitted file is empty." -msgstr "" - -#: fields.py:1351 -#, python-brace-format -msgid "" -"Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" - -#: fields.py:1399 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" - -#: fields.py:1438 relations.py:439 serializers.py:521 -msgid "This list may not be empty." -msgstr "" - -#: fields.py:1491 -#, python-brace-format -msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" - -#: fields.py:1538 -msgid "Value must be valid JSON." -msgstr "" - -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 -msgid "Submit" -msgstr "" - -#: pagination.py:189 -msgid "Invalid page." -msgstr "" - -#: pagination.py:407 -msgid "Invalid cursor" -msgstr "" - -#: relations.py:207 -#, python-brace-format -msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" - -#: relations.py:208 -#, python-brace-format -msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" - -#: relations.py:240 -msgid "Invalid hyperlink - No URL match." -msgstr "" - -#: relations.py:241 -msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" - -#: relations.py:242 -msgid "Invalid hyperlink - Object does not exist." -msgstr "" - -#: relations.py:243 -#, python-brace-format -msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" - -#: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 -msgid "Invalid value." -msgstr "" - -#: serializers.py:326 -#, python-brace-format -msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" - -#: templates/rest_framework/admin.html:118 -#: templates/rest_framework/base.html:128 -msgid "Filters" -msgstr "" - -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "" - -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "" - -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "" - -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 -msgid "None" -msgstr "" - -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 -msgid "No items to select." -msgstr "" - -#: validators.py:24 -msgid "This field must be unique." -msgstr "" - -#: validators.py:78 -#, python-brace-format -msgid "The fields {field_names} must make a unique set." -msgstr "" - -#: validators.py:226 -#, python-brace-format -msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" - -#: validators.py:241 -#, python-brace-format -msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" - -#: validators.py:254 -#, python-brace-format -msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" - -#: versioning.py:42 -msgid "Invalid version in \"Accept\" header." -msgstr "" - -#: versioning.py:73 versioning.py:115 -msgid "Invalid version in URL path." -msgstr "" - -#: versioning.py:144 -msgid "Invalid version in hostname." -msgstr "" - -#: versioning.py:166 -msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo index ce4458e00..317124886 100644 Binary files a/rest_framework/locale/de/LC_MESSAGES/django.mo and b/rest_framework/locale/de/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po index c30dd7555..057a69f1c 100644 --- a/rest_framework/locale/de/LC_MESSAGES/django.po +++ b/rest_framework/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # Translators: # Fabian Büchler , 2015 # Mads Jensen , 2015 -# Niklas P , 2015 +# Niklas P , 2015-2016 # Thomas Tanner, 2015 # Tom Jaster , 2015 # Xavier Ordoquy , 2015 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: German (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,74 +23,74 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ungültiger Benutzername/Passwort" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Benutzer inaktiv oder gelöscht." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ungültiger token header. Keine Zugangsdaten angegeben." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ungültiger Token Header. Tokens dürfen keine ungültigen Zeichen enthalten." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ungültiges Token" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Auth Token" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Schlüssel" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Benutzer" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Benutzername" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Passwort" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -129,7 +129,6 @@ msgid "Not found." msgstr "Nicht gefunden." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" nicht erlaubt." @@ -138,7 +137,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." @@ -146,214 +144,201 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." msgid "Request was throttled." msgstr "Die Anfrage wurde gedrosselt." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dieses Feld ist erforderlich." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dieses Feld darf nicht Null sein." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ist kein gültiger Wahrheitswert." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dieses Feld darf nicht leer sein." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Gib eine gültige E-Mail Adresse an." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Gib eine gültige URL ein." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" ist keine gültige UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geben Sie eine gültige UPv4 oder IPv6 Adresse an" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Eine gültige Ganzzahl ist erforderlich." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Zeichenkette zu lang." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Eine gültige Zahl ist erforderlich." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Stelle sicher, dass es nicht mehr als {max_whole_digits} Stellen vor dem Komma lang ist." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Laufzeit hat das falsche Format. Benutze stattdessen eines dieser Formate {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ist keine gültige Option." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mehr als {count} Ergebnisse" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Diese Auswahl darf nicht leer sein" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ist ein ungültiger Pfad Wahl." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Es wurde keine Datei übermittelt." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Der Dateiname konnte nicht ermittelt werden." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Die übermittelte Datei ist leer." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Diese Liste darf nicht leer sein." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Wert muss gültiges JSON sein." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Abschicken" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ungültiger Zeiger" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}." @@ -370,25 +355,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ungültiger Hyperlink - Objekt existiert nicht." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt mit {slug_name}={value} existiert nicht." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ungültiger Wert." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filter" @@ -418,27 +400,23 @@ msgstr "Nichts" msgid "No items to select." msgstr "Keine Elemente zum Auswählen." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dieses Feld muss eindeutig sein." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Datums eindeutig sein." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Monats eindeutig sein." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein." @@ -446,15 +424,19 @@ msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein." msgid "Invalid version in \"Accept\" header." msgstr "Ungültige Version in der \"Accept\" Kopfzeile." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ungültige Version im URL Pfad." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ungültige Version im Hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ungültige Version im Anfrageparameter." diff --git a/rest_framework/locale/el/LC_MESSAGES/django.mo b/rest_framework/locale/el/LC_MESSAGES/django.mo index fc2120f7f..c7fb97b2c 100644 Binary files a/rest_framework/locale/el/LC_MESSAGES/django.mo and b/rest_framework/locale/el/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/el/LC_MESSAGES/django.po b/rest_framework/locale/el/LC_MESSAGES/django.po index 407ecf3a7..be9bdf717 100644 --- a/rest_framework/locale/el/LC_MESSAGES/django.po +++ b/rest_framework/locale/el/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Serafeim Papastefanos , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Greek (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +18,423 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δε μπορεί να περιέχουν κενά." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δεν είναι κωδικοποιημένα κατά base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Λανθασμένο όνομα χρήστη/κωδικός." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Ο χρήστης είναι ανενεργός ή διεγραμμένος." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Λανθασμένη επικεφαλίδα token. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Λανθασμένη επικεφαλίδα token. Το token δε πρέπει να περιέχει κενά." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα token. Το token περιέχει μη επιτρεπτούς χαρακτήρες." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Λανθασμένο token" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token πιστοποίησης" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Κλειδί" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Χρήστης" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Δημιουργήθηκε" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Όνομα χρήστη" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Κωδικός" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Ο λογαριασμός χρήστη είναι απενεργοποιημένος." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Δεν είναι δυνατή η σύνδεση με τα διαπιστευτήρια." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Πρέπει να περιέχει \"όνομα χρήστη\" και \"κωδικό\"." #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "Σφάλμα διακομιστή." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Λανθασμένο αίτημα." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Λάθος διαπιστευτήρια." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Δεν δόθηκαν διαπιστευτήρια." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Δεν έχετε δικαίωματα για αυτή την ενέργεια." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Δε βρέθηκε." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Η μέθοδος \"{method\"} δεν επιτρέπεται." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Δεν ήταν δυνατή η ικανοποίηση της επικεφαλίδας Accept της αίτησης." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Δεν υποστηρίζεται το media type \"{media_type}\" της αίτησης." #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Το αίτημα έγινε throttle." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Το πεδίο είναι απαραίτητο." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Το πεδίο δε μπορεί να είναι null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρο boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Το πεδίο δε μπορεί να είναι κενό." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το πεδίο δεν έχει περισσότερους από {max_length} χαρακτήρες." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το πεδίο έχει τουλάχιστον {min_length} χαρακτήρες." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Συμπληρώσατε μια έγκυρη διεύθυνση e-mail." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Η τιμή δε ταιριάζει με το pattern." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Εισάγετε ένα έγκυρο \"slug\" που αποτελείται από γράμματα, αριθμούς παύλες και κάτω παύλες." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Εισάγετε έγκυρο URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "Το \"{value}\" δεν είναι έγκυρο UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4 ή IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Ένας έγκυρος ακέραιος είναι απαραίτητος." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Επιβεβαιώσατε ότι η τιμή είναι μικρότερη ή ίση του {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Επιβεβαιώσατε ότι η τιμή είναι μεγαλύτερη ή ίση του {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Το κείμενο είναι πολύ μεγάλο." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Ένας έγκυρος αριθμός είναι απαραίτητος." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_digits} ψηφία." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_decimal_places} δεκαδικά ψηφία." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_whole_digits} ακέραια ψηφία." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Αναμένεται ημερομηνία και ώρα αλλά δόθηκε μόνο ημερομηνία." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Αναμένεται ημερομηνία αλλά δόθηκε ημερομηνία και ώρα." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ώρα έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η διάρκεια έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Περισσότερα από {count} αντικείμενα..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Αναμένεται μια λίστα αντικειμένον αλλά δόθηκε ο τύπος \"{input_type}\"" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Η επιλογή δε μπορεί να είναι κενή." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή διαδρομής." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Δεν υποβλήθηκε αρχείο." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Τα δεδομένα που υποβλήθηκαν δεν ήταν αρχείο. Ελέγξατε την κωδικοποίηση της φόρμας." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Δε βρέθηκε όνομα αρχείου." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Το αρχείο που υποβλήθηκε είναι κενό." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το όνομα αρχείου έχει ως {max_length} χαρακτήρες (έχει {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Ανεβάστε μια έγκυρη εικόνα. Το αρχείο που ανεβάσατε είτε δεν είναι εικόνα είτε έχει καταστραφεί." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Η λίστα δε μπορεί να είναι κενή." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Αναμένεται ένα λεξικό αντικείμενων αλλά δόθηκε ο τύπος \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Η τιμή πρέπει να είναι μορφής JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Υποβολή" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Λάθος σελίδα." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Λάθος cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Λάθος κλειδί \"{pk_value}\" - το αντικείμενο δεν υπάρχει." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Λάθος τύπος. Αναμένεται τιμή κλειδιού, δόθηκε {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Λάθος σύνδεση - το αντικείμενο δεν υπάρχει." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Λάθος τύπος. Αναμένεται URL, δόθηκε {data_type}." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Το αντικείμενο {slug_name}={value} δεν υπάρχει." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Λάθος τιμή." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Λάθος δεδομένα. Αναμένεται λεξικό αλλά δόθηκε {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Φίλτρα" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Φίλτρα πεδίων" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Ταξινόμηση" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +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 "" +msgstr "Δεν υπάρχουν αντικείμενα προς επιλογή." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Τα πεδία {field_names} πρέπει να αποτελούν ένα μοναδικό σύνολο." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για την ημερομηνία \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για το μήνα \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για το έτος \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Λάθος έκδοση στην επικεφαλίδα \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Λάθος έκδοση στη διαδρομή URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Λάθος έκδοση στο hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Λάθος έκδοση στην παράμετρο" #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Απόρριψη πρόσβασης" diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.mo b/rest_framework/locale/el_GR/LC_MESSAGES/django.mo index 67022a7f7..67018c3f9 100644 Binary files a/rest_framework/locale/el_GR/LC_MESSAGES/django.mo and b/rest_framework/locale/el_GR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.po b/rest_framework/locale/el_GR/LC_MESSAGES/django.po index 645a1a8c6..051a88783 100644 --- a/rest_framework/locale/el_GR/LC_MESSAGES/django.po +++ b/rest_framework/locale/el_GR/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Greek (Greece) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el_GR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo index 06dc754a8..13760f707 100644 Binary files a/rest_framework/locale/en/LC_MESSAGES/django.mo and b/rest_framework/locale/en/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po index bd57a8b1f..ac7f4fa71 100644 --- a/rest_framework/locale/en/LC_MESSAGES/django.po +++ b/rest_framework/locale/en/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Invalid basic header. No credentials provided." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Invalid basic header. Credentials string should not contain spaces." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Invalid basic header. Credentials not correctly base64 encoded." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Invalid username/password." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "User inactive or deleted." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Invalid token header. No credentials provided." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Invalid token header. Token string should not contain spaces." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Invalid token header. Token string should not contain invalid characters." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Invalid token." @@ -58,23 +58,23 @@ msgstr "Invalid token." msgid "Auth Token" msgstr "Auth Token" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Key" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "User" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Created" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokens" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "Not found." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Method \"{method}\" not allowed." @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Could not satisfy the request Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Unsupported media type \"{media_type}\" in request." @@ -140,214 +138,201 @@ msgstr "Unsupported media type \"{media_type}\" in request." msgid "Request was throttled." msgstr "Request was throttled." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "This field is required." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "This field may not be null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" is not a valid boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "This field may not be blank." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Ensure this field has no more than {max_length} characters." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Ensure this field has at least {min_length} characters." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Enter a valid email address." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "This value does not match the required pattern." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Enter a valid URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" is not a valid UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Enter a valid IPv4 or IPv6 address." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "A valid integer is required." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String value too large." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "A valid number is required." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Expected a datetime but got a date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Expected a date but got a datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 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:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is not a valid choice." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "More than {count} items..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Expected a list of items but got type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "This selection may not be empty." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" is not a valid path choice." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No file was submitted." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No filename could be determined." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "The submitted file is empty." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "This list may not be empty." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Expected a dictionary of items but got type \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Value must be valid JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Submit" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "ascending" + +#: filters.py:337 +msgid "descending" +msgstr "descending" + +#: pagination.py:193 msgid "Invalid page." msgstr "Invalid page." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Invalid cursor" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Invalid pk \"{pk_value}\" - object does not exist." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Incorrect type. Expected pk value, received {data_type}." @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Invalid hyperlink - Object does not exist." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Incorrect type. Expected URL string, received {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object with {slug_name}={value} does not exist." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Invalid value." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Invalid data. Expected a dictionary, but got {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filters" @@ -412,27 +394,23 @@ msgstr "None" msgid "No items to select." msgstr "No items to select." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "This field must be unique." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "The fields {field_names} must make a unique set." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "This field must be unique for the \"{date_field}\" date." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "This field must be unique for the \"{date_field}\" month." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "This field must be unique for the \"{date_field}\" year." @@ -440,15 +418,19 @@ msgstr "This field must be unique for the \"{date_field}\" year." msgid "Invalid version in \"Accept\" header." msgstr "Invalid version in \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Invalid version in URL path." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "Invalid version in URL path. Does not match any version namespace." + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Invalid version in hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Invalid version in query parameter." diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.mo b/rest_framework/locale/en_AU/LC_MESSAGES/django.mo index 288595123..d24f22cb4 100644 Binary files a/rest_framework/locale/en_AU/LC_MESSAGES/django.mo and b/rest_framework/locale/en_AU/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.po b/rest_framework/locale/en_AU/LC_MESSAGES/django.po index 9ee758d64..18c70fb96 100644 --- a/rest_framework/locale/en_AU/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_AU/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (Australia) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_AU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en_AU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo index aee511aa1..ef1569c0b 100644 Binary files a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo and b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po index 2bb5b573b..144694345 100644 --- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_CA/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en_CA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo index 1f28ebba0..3714ec8fa 100644 Binary files a/rest_framework/locale/en_US/LC_MESSAGES/django.mo and b/rest_framework/locale/en_US/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index f88a3e567..3733a1e33 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,40 +17,40 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,212 +138,199 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -362,25 +347,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -410,27 +392,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -438,15 +416,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo index fa87eb02f..1ddc885de 100644 Binary files a/rest_framework/locale/es/LC_MESSAGES/django.mo and b/rest_framework/locale/es/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po index f443b2e28..b8a89aeb6 100644 --- a/rest_framework/locale/es/LC_MESSAGES/django.po +++ b/rest_framework/locale/es/LC_MESSAGES/django.po @@ -3,18 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# nnrcschmdt , 2015 +# Ernesto Rico-Schmidt , 2015 # José Padilla , 2015 -# Miguel González , 2015 -# Miguel González , 2015-2016 +# Miguel Gonzalez , 2015 +# Miguel Gonzalez , 2015-2016 # Sergio Infante , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 18:16+0000\n" -"Last-Translator: Miguel González \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Spanish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,40 +22,40 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nombre de usuario/contraseña inválidos." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuario inactivo o borrado." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Cabecera token inválida. Las credenciales no fueron suministradas." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabecera token inválida. La cadena token no debe contener espacios." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabecera token inválida. La cadena token no debe contener caracteres inválidos." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token inválido." @@ -63,23 +63,23 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "Token de autenticación" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Clave" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Usuario" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Fecha de creación" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokens" @@ -128,7 +128,6 @@ msgid "Not found." msgstr "No encontrado." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" no permitido." @@ -137,7 +136,6 @@ msgid "Could not satisfy the request Accept header." msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." @@ -145,214 +143,201 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." msgid "Request was throttled." msgstr "Solicitud fue regulada (throttled)." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Este campo es requerido." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Este campo no puede ser nulo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" no es un booleano válido." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Este campo no puede estar en blanco." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 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:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Introduzca una dirección de correo electrónico válida." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Este valor no coincide con el patrón requerido." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Introduzca una URL válida." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" no es un UUID válido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introduzca una dirección IPv4 o IPv6 válida." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Introduzca un número entero válido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Cadena demasiado larga." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Se requiere un número válido." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Se esperaba un fecha/hora en vez de una fecha." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Se esperaba una fecha en vez de una fecha/hora." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duración con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no es una elección válida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Más de {count} elementos..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Esta selección no puede estar vacía." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no es una elección de ruta válida." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No se envió ningún archivo." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No se pudo determinar un nombre de archivo." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "El archivo enviado está vació." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Esta lista no puede estar vacía." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "El valor debe ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Enviar" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Página inválida." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor inválido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe." #: relations.py:208 -#, 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}." @@ -369,25 +354,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hiperenlace inválido - Objeto no existe." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto con {slug_name}={value} no existe." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor inválido." #: serializers.py:326 -#, 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/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtros" @@ -417,27 +399,23 @@ msgstr "Ninguno" msgid "No items to select." msgstr "No hay elementos para seleccionar." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Este campo debe ser único." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Los campos {field_names} deben formar un conjunto único." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Este campo debe ser único para el día \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Este campo debe ser único para el mes \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Este campo debe ser único para el año \"{date_field}\"." @@ -445,15 +423,19 @@ msgstr "Este campo debe ser único para el año \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versión inválida en la cabecera \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versión inválida en la ruta de la URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versión inválida en el nombre de host." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versión inválida en el parámetro de consulta." diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo index ee9c40c2b..8bed39930 100644 Binary files a/rest_framework/locale/et/LC_MESSAGES/django.mo and b/rest_framework/locale/et/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po index 5ccd9226c..c9701cca7 100644 --- a/rest_framework/locale/et/LC_MESSAGES/django.po +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Estonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Sobimatu kasutajatunnus/salasõna." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kasutaja on inaktiivne või kustutatud." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Sobimatu lubakaart." @@ -59,23 +59,23 @@ msgstr "Sobimatu lubakaart." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Ei leidnud." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Meetod \"{method}\" pole lubatud." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Päringu Accept-päist ei suutnud täita." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Meedia tüüpi {media_type} päringus ei toetata." @@ -141,214 +139,201 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata." msgid "Request was throttled." msgstr "Liiga palju päringuid." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Väli on kohustuslik." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Väli ei tohi olla tühi." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" pole kehtiv kahendarv." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "See väli ei tohi olla tühi." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 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:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Sisestage kehtiv e-posti aadress." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Väärtus ei ühti etteantud mustriga." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Sisestage korrektne URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" pole kehtiv UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Sisendiks peab olema täisarv." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Sõne on liiga pikk." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Sisendiks peab olema arv." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" on sobimatu valik." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ühtegi faili ei esitatud." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Ei suutnud tuvastada failinime." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Esitatud fail oli tühi." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Sobimatu kursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Sobimatu hüperlink - objekti ei eksisteeri." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekti {slug_name}={value} ei eksisteeri." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Sobimatu väärtus." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Selle välja väärtus peab olema unikaalne." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Veerud {field_names} peavad moodustama unikaalse hulga." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Selle välja väärtus peab olema unikaalne veerus \"{date_field}\" märgitud kuupäeval." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud kuul." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 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." @@ -441,15 +419,19 @@ msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märg msgid "Invalid version in \"Accept\" header." msgstr "Sobimatu versioon \"Accept\" päises." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Sobimatu versioon URLi rajas." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Sobimatu versioon hostinimes." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sobimatu versioon päringu parameetris." diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.mo b/rest_framework/locale/fa/LC_MESSAGES/django.mo index 4b0b24bc2..0f9b58f3f 100644 Binary files a/rest_framework/locale/fa/LC_MESSAGES/django.mo and b/rest_framework/locale/fa/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.po b/rest_framework/locale/fa/LC_MESSAGES/django.po index 986c56594..0aa9ae4c6 100644 --- a/rest_framework/locale/fa/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Persian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo b/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo index 05d849e08..9a02cb05e 100644 Binary files a/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo and b/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po b/rest_framework/locale/fa_IR/LC_MESSAGES/django.po index 94388647f..75b6fd156 100644 --- a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa_IR/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Persian (Iran) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa_IR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fa_IR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.mo b/rest_framework/locale/fi/LC_MESSAGES/django.mo index cd904e35c..cb13cdaae 100644 Binary files a/rest_framework/locale/fi/LC_MESSAGES/django.mo and b/rest_framework/locale/fi/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.po b/rest_framework/locale/fi/LC_MESSAGES/django.po index 39315af6b..bf1dd8c10 100644 --- a/rest_framework/locale/fi/LC_MESSAGES/django.po +++ b/rest_framework/locale/fi/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Finnish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Epäkelpo perusotsake. Ei annettuja tunnuksia." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Epäkelpo perusotsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Epäkelpo perusotsake. Tunnukset eivät ole base64-koodattu." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Epäkelpo käyttäjänimi tai salasana." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Käyttäjä ei-aktiivinen tai poistettu." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Epäkelpo Token-otsake. Ei annettuja tunnuksia." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää epäkelpoja merkkejä." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Epäkelpo Token." @@ -60,23 +60,23 @@ msgstr "Epäkelpo Token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Ei löydy." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodi \"{method}\" ei ole sallittu." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Ei voitu vastata pyynnön Accept-otsakkeen mukaisesti." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." @@ -142,214 +140,201 @@ msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." msgid "Request was throttled." msgstr "Pyyntö hidastettu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Tämä kenttä vaaditaan." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Tämän kentän arvo ei voi olla \"null\"." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ei ole kelvollinen totuusarvo." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Tämä kenttä ei voi olla tyhjä." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Arvo saa olla enintään {max_length} merkkiä pitkä." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Arvo tulee olla vähintään {min_length} merkkiä pitkä." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Syötä kelvollinen sähköpostiosoite." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Arvo ei täsmää vaadittuun kuvioon." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala- ja tavuviivoja (_ -)." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Syötä oikea URL-osoite." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "{value} ei ole kelvollinen UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Syötä kelvollinen IPv4- tai IPv6-osoite." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Syötä kelvollinen kokonaisluku." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Tämän arvon on oltava enintään {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Tämän luvun on oltava vähintään {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Liian suuri merkkijonoarvo." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Kelvollinen luku vaaditaan." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Tässä luvussa voi olla yhteensä enintään {max_digits} numeroa." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Tässä luvussa saa olla enintään {max_decimal_places} desimaalia." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Tässä luvussa saa olla enintään {max_whole_digits} numeroa ennen desimaalipilkkua." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen päivämäärän/ajan muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Odotettiin päivämäärää ja aikaa, saatiin vain päivämäärä." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen päivämäärän muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Odotettiin päivämäärää, saatiin päivämäärä ja aika." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen kellonajan muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen keston muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ei ole kelvollinen valinta." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Enemmän kuin {count} kappaletta..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Odotettiin listaa, saatiin tyyppi {input_type}." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Valinta ei saa olla tyhjä." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ei ole kelvollinen polku." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Yhtään tiedostoa ei ole lähetetty." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Tiedostonimeä ei voitu päätellä." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Lähetetty tiedosto on tyhjä." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Varmista että tiedostonimi on enintään {max_length} merkkiä pitkä (nyt {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Lista ei saa olla tyhjä." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {input_type}." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Arvon pitää olla kelvollista JSONia." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Lähetä" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Epäkelpo kursori" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Epäkelpo pääavain {pk_value} - objektia ei ole olemassa." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Väärä tyyppi. Odotettiin pääavainarvoa, saatiin {data_type}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Epäkelpo linkki - objektia ei ole." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Epäkelpo tyyppi. Odotettiin URL-merkkijonoa, saatiin {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objektia ({slug_name}={value}) ei ole." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Epäkelpo arvo." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Suotimet" @@ -414,27 +396,23 @@ msgstr "Ei mitään" msgid "No items to select." msgstr "Ei valittavia kohteita." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Arvon tulee olla uniikki." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Kenttien {field_names} tulee muodostaa uniikki joukko." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Kentän tulee olla uniikki päivämäärän {date_field} suhteen." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Kentän tulee olla uniikki kuukauden {date_field} suhteen." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Kentän tulee olla uniikki vuoden {date_field} suhteen." @@ -442,15 +420,19 @@ msgstr "Kentän tulee olla uniikki vuoden {date_field} suhteen." msgid "Invalid version in \"Accept\" header." msgstr "Epäkelpo versio Accept-otsakkeessa." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Epäkelpo versio URL-polussa." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Epäkelpo versio palvelinosoitteessa." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Epäkelpo versio kyselyparametrissa." diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index 531cc46b5..2bc60c63a 100644 Binary files a/rest_framework/locale/fr/LC_MESSAGES/django.mo and b/rest_framework/locale/fr/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po index 3824b1a2e..284999a8b 100644 --- a/rest_framework/locale/fr/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:40+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: French (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "En-tête « basic » non valide. Informations d'identification non fournies." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 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:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Utilisateur inactif ou supprimé." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "En-tête « token » non valide. Informations d'identification non fournies." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "En-tête « token » non valide. Un token ne doit pas contenir de caractères invalides." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token non valide." @@ -62,23 +62,23 @@ msgstr "Token non valide." msgid "Auth Token" msgstr "Jeton d'authentification" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Clef" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Utilisateur" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Création" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Jeton" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Jetons" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Pas trouvé." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Méthode \"{method}\" non autorisée." @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "L'en-tête « Accept » n'a pas pu être satisfaite." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Type de média \"{media_type}\" non supporté." @@ -144,214 +142,201 @@ msgstr "Type de média \"{media_type}\" non supporté." msgid "Request was throttled." msgstr "Requête ralentie." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ce champ est obligatoire." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ce champ ne peut être nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" n'est pas un booléen valide." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ce champ ne peut être vide." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 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:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Saisissez une adresse email valable." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Cette valeur ne satisfait pas le motif imposé." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Saisissez une URL valide." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" n'est pas un UUID valide." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Saisissez une adresse IPv4 ou IPv6 valide." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Un nombre entier valide est requis." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Chaîne de caractères trop longue." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Un nombre valide est requis." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Attendait une date + heure mais a reçu une date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Attendait une date mais a reçu une date + heure." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" n'est pas un choix valide." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Plus de {count} éléments..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Cette sélection ne peut être vide." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" n'est pas un choix de chemin valide." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Aucun fichier n'a été soumis." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Le nom de fichier n'a pu être déterminé." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Le fichier soumis est vide." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Cette liste ne peut pas être vide." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "La valeur doit être un JSON valide." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Envoyer" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Page invalide." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Curseur non valide" #: relations.py:207 -#, 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:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Lien non valide : l'objet n'existe pas." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'object avec {slug_name}={value} n'existe pas." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valeur non valide." #: serializers.py:326 -#, 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/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtres" @@ -416,27 +398,23 @@ msgstr "Aucune" msgid "No items to select." msgstr "Aucun élément à sélectionner." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ce champ doit être unique." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Les champs {field_names} doivent former un ensemble unique." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Ce champ doit être unique pour la date \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Ce champ doit être unique pour le mois \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." @@ -444,15 +422,19 @@ msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Version non valide dans l'en-tête « Accept »." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Version non valide dans l'URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Version non valide dans le nom d'hôte." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Version non valide dans le paramètre de requête." diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo index cd0a91340..1771787f8 100644 Binary files a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo and b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po index f26ed453b..84cbdf4cc 100644 --- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: French (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.mo b/rest_framework/locale/gl/LC_MESSAGES/django.mo index 761037249..030e25f94 100644 Binary files a/rest_framework/locale/gl/LC_MESSAGES/django.mo and b/rest_framework/locale/gl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po index ba0b788fc..5ec55729e 100644 --- a/rest_framework/locale/gl/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Galician (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo index 281b6e66b..90c4212ba 100644 Binary files a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo and b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po index 07ee4061f..870c0916f 100644 --- a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Galician (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -59,23 +59,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -141,214 +139,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor non válido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "Ningún" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +419,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.mo b/rest_framework/locale/he_IL/LC_MESSAGES/django.mo index feef64e1b..55ffe5403 100644 Binary files a/rest_framework/locale/he_IL/LC_MESSAGES/django.mo and b/rest_framework/locale/he_IL/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.po b/rest_framework/locale/he_IL/LC_MESSAGES/django.po index cee35fedc..686ae6fa7 100644 --- a/rest_framework/locale/he_IL/LC_MESSAGES/django.po +++ b/rest_framework/locale/he_IL/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/he_IL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: he_IL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo index 9053ad62f..cb27fb740 100644 Binary files a/rest_framework/locale/hu/LC_MESSAGES/django.mo and b/rest_framework/locale/hu/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po index 669a7bffa..7f3081fff 100644 --- a/rest_framework/locale/hu/LC_MESSAGES/django.po +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Hungarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 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:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Érvénytelen felhasználónév/jelszó." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "A felhasználó nincs aktiválva vagy törölve lett." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Érvénytelen token." @@ -59,23 +59,23 @@ msgstr "Érvénytelen token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Nem található." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "A \"{method}\" metódus nem megengedett." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nem támogatott média típus \"{media_type}\" a kérésben." @@ -141,214 +139,201 @@ 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:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ennek a mezőnek a megadása kötelező." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ez a mező nem lehet null értékű." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "Az \"{input}\" nem egy érvényes logikai érték." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ez a mező nem lehet üres." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 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:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Adjon meg egy érvényes e-mail címet!" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ez az érték nem illeszkedik a szükséges mintázatra." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Adjon meg egy érvényes URL-t!" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Egy érvényes egész szám megadása szükséges." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "A karakterlánc túl hosszú." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Egy érvényes szám megadása szükséges." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 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:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 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:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "Az \"{input}\" nem egy érvényes elem." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemek listája helyett \"{input_type}\" lett elküldve." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Semmilyen fájl sem került feltöltésre." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "A fájlnév nem megállapítható." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "A küldött fájl üres." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, 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:208 -#, 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." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Érvénytelen link - Az objektum nem létezik." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Érvénytelen érték." #: serializers.py:326 -#, 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/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ennek a mezőnek egyedinek kell lennie." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" dátumra." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" hónapra." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." @@ -441,15 +419,19 @@ msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." msgid "Invalid version in \"Accept\" header." msgstr "Érvénytelen verzió az \"Accept\" fejlécmezőben." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Érvénytelen verzió az URL elérési útban." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Érvénytelen verzió a hosztnévben." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Érvénytelen verzió a lekérdezési paraméterben." diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo index 350d64a3b..beb9643b0 100644 Binary files a/rest_framework/locale/id/LC_MESSAGES/django.mo and b/rest_framework/locale/id/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po index 1137755c8..c84add0a4 100644 --- a/rest_framework/locale/id/LC_MESSAGES/django.po +++ b/rest_framework/locale/id/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Indonesian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo index 8af8bc746..5d52d3dcf 100644 Binary files a/rest_framework/locale/it/LC_MESSAGES/django.mo and b/rest_framework/locale/it/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po index 24101d88e..6a48c53a7 100644 --- a/rest_framework/locale/it/LC_MESSAGES/django.po +++ b/rest_framework/locale/it/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Italian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Header di base invalido. Credenziali non fornite." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Credenziali non correttamente codificate in base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nome utente/password non validi" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Utente inattivo o eliminato." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Header del token non valido. Credenziali non fornite." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Header del token invalido. La stringa del token non dovrebbe contenere caratteri illegali." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token invalido." @@ -62,23 +62,23 @@ msgstr "Token invalido." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Non trovato." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodo \"{method}\" non consentito" @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo di media \"{media_type}\"non supportato." @@ -144,214 +142,201 @@ msgstr "Tipo di media \"{media_type}\"non supportato." msgid "Request was throttled." msgstr "La richiesta è stata limitata (throttled)." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Campo obbligatorio." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Il campo non può essere nullo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" non è un valido valore booleano." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Questo campo non può essere omesso." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Inserisci un indirizzo email valido." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Questo valore non corrisponde alla sequenza richiesta." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Inserisci un URL valido" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" non è un UUID valido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Inserisci un indirizzo IPv4 o IPv6 valido." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "È richiesto un numero intero valido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Stringa troppo lunga." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "È richiesto un numero valido." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durata è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" non è una scelta valida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Più di {count} oggetti..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Questa selezione potrebbe non essere vuota." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" non è un percorso valido." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Non è stato inviato alcun file." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Il nome del file non può essere determinato." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Il file inviato è vuoto." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Questa lista potrebbe non essere vuota." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Il valore deve essere un JSON valido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Invia" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursore non valido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Collegamento non valido - L'oggetto non esiste." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'oggetto con {slug_name}={value} non esiste." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valore non valido." #: serializers.py:326 -#, 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/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtri" @@ -416,27 +398,23 @@ msgstr "Nessuno" msgid "No items to select." msgstr "Nessun elemento da selezionare." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Questo campo deve essere unico." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "I campi {field_names} devono costituire un insieme unico." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Questo campo deve essere unico per la data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Questo campo deve essere unico per il mese \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"." @@ -444,15 +422,19 @@ msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versione non valida nell'header \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versione non valida nella sequenza URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versione non valida nel nome dell'host." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versione non valida nel parametro della query." diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo index 048da56fd..1f934cc37 100644 Binary files a/rest_framework/locale/ja/LC_MESSAGES/django.mo and b/rest_framework/locale/ja/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po index 85c2fa5ae..d2881dec9 100644 --- a/rest_framework/locale/ja/LC_MESSAGES/django.po +++ b/rest_framework/locale/ja/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Japanese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "不正な基本ヘッダです。認証情報が含まれていません。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "ユーザ名かパスワードが違います。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "ユーザが無効か削除されています。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "不正なトークンヘッダです。認証情報が含まれていません。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "不正なトークンです。" @@ -59,23 +59,23 @@ msgstr "不正なトークンです。" msgid "Auth Token" msgstr "認証トークン" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "キー" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "ユーザ" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "作成された" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "トークン" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "トークン" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "見つかりませんでした。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "メソッド \"{method}\" は許されていません。" @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "リクエストのAcceptヘッダを満たすことができませんでした。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "リクエストのメディアタイプ \"{media_type}\" はサポートされていません。" @@ -141,214 +139,201 @@ msgstr "リクエストのメディアタイプ \"{media_type}\" はサポート msgid "Request was throttled." msgstr "リクエストの処理は絞られました。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "この項目は必須です。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "この項目はnullにできません。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" は有効なブーリアンではありません。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "この項目は空にできません。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "この項目が{max_length}文字より長くならないようにしてください。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "この項目は少なくとも{min_length}文字以上にしてください。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "有効なメールアドレスを入力してください。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "この値は所要のパターンにマッチしません。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "文字、数字、アンダースコア、またはハイフンから成る有効な \"slug\" を入力してください。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "有効なURLを入力してください。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" は有効なUUIDではありません。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "有効なIPv4またはIPv6アドレスを入力してください。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "有効な整数を入力してください。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "この値は{max_value}以下にしてください。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "この値は{min_value}以上にしてください。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "文字列が長過ぎます。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "有効な数値を入力してください。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "合計で最大{max_digits}桁以下になるようにしてください。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "小数点以下の桁数を{max_decimal_places}を超えないようにしてください。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "整数部の桁数を{max_whole_digits}を超えないようにしてください。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日時の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "日付ではなく日時を入力してください。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "日時ではなく日付を入力してください。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"は有効な選択肢ではありません。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr " {count} 個より多い..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "空でない項目を選択してください。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"は有効なパスの選択肢ではありません。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "ファイルが添付されていません。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "ファイル名が取得できませんでした。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "添付ファイルの中身が空でした。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "リストは空ではいけません。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "値は有効なJSONでなければなりません。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "提出" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "カーソルが不正です。" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。" @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "ハイパーリンクが不正です - リンク先が存在しません。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} のデータが存在しません。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "不正な値です。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "不正なデータです。{datatype} 型ではなく辞書を入力してください。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "フィルタ" @@ -413,27 +395,23 @@ msgstr "なし" msgid "No items to select." msgstr "選択する項目がありません。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "この項目は一意でなければなりません。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "項目 {field_names} は一意な組でなければなりません。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "この項目は \"{date_field}\" の日に対して一意でなければなりません。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "この項目は \"{date_field}\" の月に対して一意でなければなりません。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "この項目は \"{date_field}\" の年に対して一意でなければなりません。" @@ -441,15 +419,19 @@ msgstr "この項目は \"{date_field}\" の年に対して一意でなければ msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" 内のバージョンが不正です。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URLパス内のバージョンが不正です。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "ホスト名内のバージョンが不正です。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "クエリパラメータ内のバージョンが不正です。" diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index ac88a062d..6410f0b1c 100644 Binary files a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo and b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po index f0d56067f..4ca53b3c3 100644 --- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "아이디/비밀번호가 유효하지 않습니다." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "계정이 중지되었거나 삭제되었습니다." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "토큰이 유효하지 않습니다." @@ -59,23 +59,23 @@ msgstr "토큰이 유효하지 않습니다." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "찾을 수 없습니다." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Accept header 요청을 만족할 수 없습니다." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다." @@ -141,214 +139,201 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니 msgid "Request was throttled." msgstr "요청이 지연(throttled)되었습니다." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "이 항목을 채워주십시오." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "이 칸은 null일 수 없습니다." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "이 칸은 blank일 수 없습니다." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "유효한 이메일 주소를 입력하십시오." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "형식에 맞지 않는 값입니다." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "유효한 URL을 입력하십시오." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\"가 유효하지 않은 UUID 입니다." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "유효한 IPv4 또는 IPv6 주소를 입력하십시오." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "유효한 정수(integer)를 넣어주세요." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "문자열 값이 너무 큽니다." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "유효한 숫자를 넣어주세요." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "소수점 자릿수가 {max_decimal_places} 이하인지 확인하십시오." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "예상된 datatime 대신 date를 받았습니다." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "예상된 date 대신 datetime을 받았습니다." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "파일이 제출되지 않았습니다." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "파일명을 알 수 없습니다." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "제출된 파일이 비어있습니다." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "커서(cursor)가 유효하지 않습니다." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} 객체가 존재하지 않습니다." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "값이 유효하지 않습니다." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "선택할 아이템이 없습니다." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "이 칸은 반드시 고유해야 합니다." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +419,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" header내 버전이 유효하지 않습니다." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL path내 버전이 유효하지 않습니다." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "hostname내 버전이 유효하지 않습니다." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "쿼리 파라메터내 버전이 유효하지 않습니다." diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo index e2a518f71..ac9a48193 100644 Binary files a/rest_framework/locale/mk/LC_MESSAGES/django.mo and b/rest_framework/locale/mk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po index 5818124ae..d53a30677 100644 --- a/rest_framework/locale/mk/LC_MESSAGES/django.po +++ b/rest_framework/locale/mk/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Macedonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Невалиден основен header. Не се внесени податоци за автентикација." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Невалидно корисничко име/лозинка." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Корисникот е деактивиран или избришан." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Невалиден токен header. Не се внесени податоци за најава." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Невалиден токен во header. Токенот не треба да содржи празни места." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Невалиден токен." @@ -59,23 +59,23 @@ msgstr "Невалиден токен." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Не е пронајдено ништо." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Методата \"{method}\" не е дозволена." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Не може да се исполни барањето на Accept header-от." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media типот „{media_type}“ не е поддржан." @@ -141,214 +139,201 @@ msgstr "Media типот „{media_type}“ не е поддржан." msgid "Request was throttled." msgstr "Request-от е забранет заради ограничувања." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ова поле е задолжително." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ова поле не смее да биде недефинирано." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" не е валиден boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ова поле не смее да биде празно." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Ова поле не смее да има повеќе од {max_length} знаци." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Ова поле мора да има барем {min_length} знаци." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Внесете валидна email адреса." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ова поле не е по правилната шема/барање." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Внесете валиден URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Задолжителен е валиден цел број." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Вредноста треба да биде помала или еднаква на {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Вредноста треба да биде поголема или еднаква на {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Вредноста е преголема." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Задолжителен е валиден број." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Не смее да има повеќе од {max_digits} цифри вкупно." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Не смее да има повеќе од {max_decimal_places} децимални места." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Очекувано беше дата и време, а внесено беше само дата." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Датата е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Очекувана беше дата, а внесени беа и дата и време." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Времето е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "„{input}“ не е валиден избор." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очекувана беше листа, а внесено беше „{input_type}“." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ниеден фајл не е качен (upload-иран)." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Не може да се открие име на фајлот." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Качениот (upload-иран) фајл е празен." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Невалиден pk „{pk_value}“ - објектот не постои." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Невалиден хиперлинк - Објектот не постои." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Објектот со {slug_name}={value} не постои." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Невалидна вредност." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ова поле мора да биде уникатно." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Полињата {field_names} заедно мора да формираат уникатен збир." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината." @@ -441,15 +419,19 @@ msgstr "Ова поле мора да биде уникатно за „{date_fi msgid "Invalid version in \"Accept\" header." msgstr "Невалидна верзија во „Accept“ header-от." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Невалидна верзија во URL патеката." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Невалидна верзија во hostname-от." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Невалидна верзија во query параметарот." diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo index a0bdb3a49..d3dfe100a 100644 Binary files a/rest_framework/locale/nb/LC_MESSAGES/django.mo and b/rest_framework/locale/nb/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.po b/rest_framework/locale/nb/LC_MESSAGES/django.po index 3aecbee12..634a24642 100644 --- a/rest_framework/locale/nb/LC_MESSAGES/django.po +++ b/rest_framework/locale/nb/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimasjon gitt." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugylid basic header. Legitimasjonsstreng bør ikke inneholde mellomrom." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimasjonen ikke riktig Base64 kodet." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ugyldig brukernavn eller passord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Bruker inaktiv eller slettet." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header. Ingen legitimasjon gitt." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token streng skal ikke inneholde mellomrom." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Tokenstrengen skal ikke inneholde ugyldige tegn." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ugyldig token." @@ -59,23 +59,23 @@ msgstr "Ugyldig token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Ikke funnet." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" ikke gyldig." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke tilfredsstille request Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Ugyldig media type \"{media_type}\" i request." @@ -141,214 +139,201 @@ msgstr "Ugyldig media type \"{media_type}\" i request." msgid "Request was throttled." msgstr "Forespørselen ble strupet." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dette feltet er påkrevd." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dette feltet må ikke være tomt." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" er ikke en gyldig bolsk verdi." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dette feltet må ikke være blankt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Forsikre deg om at dette feltet ikke har mer enn {max_length} tegn." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Forsikre deg at dette feltet har minst {min_length} tegn." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Oppgi en gyldig epost-adresse." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Denne verdien samsvarer ikke med de påkrevde mønsteret." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Skriv inn en gyldig \"slug\" som består av bokstaver, tall, understrek eller bindestrek." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Skriv inn en gyldig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" er ikke en gyldig UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Skriv inn en gyldig IPv4 eller IPv6-adresse." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "En gyldig heltall er nødvendig." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Sikre denne verdien er mindre enn eller lik {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Sikre denne verdien er større enn eller lik {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Strengverdien for stor." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Et gyldig nummer er nødvendig." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Pass på at det ikke er flere enn {max_digits} siffer totalt." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Pass på at det ikke er flere enn {max_decimal_places} desimaler." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Pass på at det ikke er flere enn {max_whole_digits} siffer før komma." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Forventet en datetime, men fikk en date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Dato har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Forventet en date, men fikk en datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tid har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighet har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldig valg." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mer enn {count} elementer ..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventet en liste over elementer, men fikk type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Dette valget kan ikke være tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke en gyldig bane valg." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De innsendte data var ikke en fil. Kontroller kodingstypen på skjemaet." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Kunne ikke finne filnavn." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den innsendte filen er tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Sikre dette filnavnet har på det meste {max_length} tegn (det har {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Last opp et gyldig bilde. Filen du lastet opp var enten ikke et bilde eller en ødelagt bilde." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Denne listen kan ikke være tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventet en dictionary av flere ting, men fikk typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Verdien må være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Send inn" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ugyldig markør" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig pk \"{pk_value}\" - objektet eksisterer ikke." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Feil type. Forventet pk verdi, fikk {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldig hyperkobling - Objektet eksisterer ikke." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Feil type. Forventet URL streng, fikk {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finnes ikke." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ugyldig verdi." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ugyldige data. Forventet en dicitonary, men fikk {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtre" @@ -413,27 +395,23 @@ msgstr "Ingen" msgid "No items to select." msgstr "Ingenting å velge." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dette feltet må være unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Feltene {field_names} må gjøre et unikt sett." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette feltet må være unikt for \"{date_field}\" dato." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dette feltet må være unikt for \"{date_field}\" måned." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette feltet må være unikt for \"{date_field}\" år." @@ -441,15 +419,19 @@ msgstr "Dette feltet må være unikt for \"{date_field}\" år." msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig versjon på \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ugyldig versjon i URL-banen." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ugyldig versjon i vertsnavn." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ugyldig versjon i søkeparameter." diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo index 8b70ddbd6..8f9c2dcde 100644 Binary files a/rest_framework/locale/nl/LC_MESSAGES/django.mo and b/rest_framework/locale/nl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po index b89af0606..6b9dd127b 100644 --- a/rest_framework/locale/nl/LC_MESSAGES/django.po +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -3,14 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Hans van Luttikhuizen , 2016 # mikedingjan , 2015 +# mikedingjan , 2015 +# Hans van Luttikhuizen , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Dutch (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,78 +21,78 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "Ongeldige basic header. Geen login gegevens opgegeven." +msgstr "Ongeldige basic header. Geen logingegevens opgegeven." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "Ongeldige basic header. login gegevens kunnen geen spaties bevatten." +msgstr "Ongeldige basic header. logingegevens kunnen geen spaties bevatten." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "Ongeldige basic header. login gegevens zijn niet correct base64 versleuteld." +msgstr "Ongeldige basic header. logingegevens zijn niet correct base64-versleuteld." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ongeldige gebruikersnaam/wachtwoord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Gebruiker inactief of verwijderd." -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "Ongeldige token header. Geen login gegevens opgegeven" - #: authentication.py:176 +msgid "Invalid token header. No credentials provided." +msgstr "Ongeldige token header. Geen logingegevens opgegeven" + +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ongeldige token header. Token kan geen spaties bevatten." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Ongeldige token header. Token kan geen ongeldige karakters bevatten." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ongeldige token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autorisatietoken" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Key" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Gebruiker" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Aangemaakt" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Gebruikersnaam" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Wachtwoord" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "Gebruikers account is inactief." +msgstr "Gebruikersaccount is gedeactiveerd." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." @@ -97,11 +100,11 @@ msgstr "Kan niet inloggen met opgegeven gegevens." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "Moet een \"gebruikersnaam\" en \"wachtwoord\" bevatten." +msgstr "Moet \"username\" en \"password\" bevatten." #: exceptions.py:49 msgid "A server error occurred." -msgstr "Er is een server fout opgetreden." +msgstr "Er is een serverfout opgetreden." #: exceptions.py:84 msgid "Malformed request." @@ -109,248 +112,233 @@ msgstr "Ongeldig samengestelde request." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "Ongeldige authenticatie gegevens." +msgstr "Ongeldige authenticatiegegevens." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "Authenticatie gegevens zijn niet opgegeven." +msgstr "Authenticatiegegevens zijn niet opgegeven." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "Je hebt geen toegang om deze actie uit te voeren." +msgstr "Je hebt geen toestemming om deze actie uit te voeren." #: exceptions.py:104 views.py:81 msgid "Not found." msgstr "Niet gevonden." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" niet toegestaan." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "Kan niet voldoen aan de opgegeven \"Accept\" header." +msgstr "Kan niet voldoen aan de opgegeven Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "Ongeldig media type \"{media_type}\" in aanvraag." +msgstr "Ongeldige media type \"{media_type}\" in aanvraag." #: exceptions.py:145 msgid "Request was throttled." msgstr "Aanvraag was verstikt." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "Dit veld is verplicht." +msgstr "Dit veld is vereist." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" is een ongeldige boolean waarde." +msgstr "\"{input}\" is een ongeldige booleanwaarde." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Zorg ervoor dat dit veld niet meer dan {max_length} karakters bevat." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Zorg ervoor dat dit veld minimaal {min_length} karakters bevat." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Voer een geldig e-mailadres in." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "Deze waarde voldoet niet aan het benodigde formaat." +msgstr "Deze waarde voldoet niet aan het vereisde formaat." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "Voer een geldige \"slug\" in bestaande uit letters, cijfers, underscore of streepjes." +msgstr "Voer een geldige \"slug\" in, bestaande uit letters, cijfers, lage streepjes of streepjes." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Voer een geldige URL in." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" in een ongeldige UUID." +msgstr "\"{value}\" is een ongeldige UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Voer een geldig IPv4- of IPv6-adres in." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Een geldig getal is vereist." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "Zorg ervoor dat deze waarde minder of gelijk is aan {max_value}." +msgstr "Zorg ervoor dat deze waarde kleiner is dan of gelijk is aan {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "Zorg ervoor dat deze waarde groter of gelijk is aan {min_value}." +msgstr "Zorg ervoor dat deze waarde groter is dan of gelijk is aan {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "Tekstuele waarde is te lang." +msgstr "Tekstwaarde is te lang." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "Een geldig nummer is verplicht." +msgstr "Een geldig nummer is vereist." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "Zorg ervoor dat er niet meer dan {max_digits} getallen zijn in totaal." +msgstr "Zorg ervoor dat er in totaal niet meer dan {max_digits} cijfers zijn." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "zorg ervoor dat er niet meer dan {max_decimal_places} getallen achter de komma zijn." +msgstr "Zorg ervoor dat er niet meer dan {max_decimal_places} cijfers achter de komma zijn." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} getallen voor de komma zijn." +msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} cijfers voor de komma zijn." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime heeft een ongeldig formaat, gebruik 1 van de volgende formaten: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "Verwacht een datetime, in plaats kreeg een date." +msgstr "Verwachtte een datetime, maar kreeg een date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "Date heeft het verkeerde formaat, gebruik 1 van de onderstaande formaten: {format}." +msgstr "Date heeft het verkeerde formaat, gebruik 1 van deze formaten: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "Verwacht een date, in plaats kreeg een datetime" +msgstr "Verwachtte een date, maar kreeg een datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time heeft het verkeerde formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Tijdsduur heeft een verkeerd formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is een ongeldige keuze." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Meer dan {count} items..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "Verwacht een lijst met items, kreeg een type \"{input_type}\" in plaats." +msgstr "Verwachtte een lijst met items, maar kreeg type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Deze selectie mag niet leeg zijn." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" is niet een geldig pad." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "Er is geen bestand opgestuurd" +msgstr "Er is geen bestand opgestuurd." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De verstuurde data was geen bestand. Controleer de encoding type op het formulier." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "Bestandsnaam kan niet vastgesteld worden." +msgstr "Bestandsnaam kon niet vastgesteld worden." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Het verstuurde bestand is leeg." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "Zorg ervoor dat deze bestandsnaam minstens {max_length} karakters heeft (momenteel {length})." +msgstr "Zorg ervoor dat deze bestandsnaam hoogstens {max_length} karakters heeft (het heeft er {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of mogelijk corrupt geraakt," +msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of is beschadigd geraakt," -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Deze lijst mag niet leeg zijn." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "Verwacht een dictionary van items, in plaats kreeg een type \"{input_type}\"." +msgstr "Verwachtte een dictionary van items, maar kreeg type \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Waarde moet valide JSON zijn." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Verzenden" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Ongeldige pagina." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ongeldige cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "Ongeldig type. Verwacht een pk waarde, ontving {data_type}." +msgstr "Ongeldig type. Verwacht een pk-waarde, ontving {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." @@ -365,41 +353,38 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ongeldige hyperlink - Object bestaat niet." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object met {slug_name}={value} bestaat niet." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ongeldige waarde." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ongeldige data. Verwacht een dictionary, kreeg een {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filters" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Veldfilters" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Sorteer op" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Zoek" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 @@ -413,27 +398,23 @@ msgstr "Geen" msgid "No items to select." msgstr "Geen items geselecteerd." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dit veld moet uniek zijn." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "De velden {field_names} moeten een unieke set zijn." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" datum." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" maand." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year." @@ -441,18 +422,22 @@ msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year." msgid "Invalid version in \"Accept\" header." msgstr "Ongeldige versie in \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." -msgstr "Ongeldige versie in URL pad." +msgstr "Ongeldige versie in URL-pad." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "Ongeldige versie in host naam." +msgstr "Ongeldige versie in hostnaam." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ongeldige versie in query parameter." #: views.py:88 msgid "Permission denied." -msgstr "Toegang niet toegestaan." +msgstr "Toestemming geweigerd." diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.mo b/rest_framework/locale/nn/LC_MESSAGES/django.mo index 43d080aa6..a2c1e01f8 100644 Binary files a/rest_framework/locale/nn/LC_MESSAGES/django.mo and b/rest_framework/locale/nn/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.po b/rest_framework/locale/nn/LC_MESSAGES/django.po index 26a625b6d..bd4d690d2 100644 --- a/rest_framework/locale/nn/LC_MESSAGES/django.po +++ b/rest_framework/locale/nn/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/no/LC_MESSAGES/django.mo b/rest_framework/locale/no/LC_MESSAGES/django.mo index 730768a27..2c058c8c7 100644 Binary files a/rest_framework/locale/no/LC_MESSAGES/django.mo and b/rest_framework/locale/no/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/no/LC_MESSAGES/django.po b/rest_framework/locale/no/LC_MESSAGES/django.po index 4a3d609ca..1ddd6675f 100644 --- a/rest_framework/locale/no/LC_MESSAGES/django.po +++ b/rest_framework/locale/no/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/no/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: no\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index f228dfc7c..8af27437f 100644 Binary files a/rest_framework/locale/pl/LC_MESSAGES/django.mo and b/rest_framework/locale/pl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po index fdf4904bb..b8592e9b7 100644 --- a/rest_framework/locale/pl/LC_MESSAGES/django.po +++ b/rest_framework/locale/pl/LC_MESSAGES/django.po @@ -5,14 +5,14 @@ # Translators: # Janusz Harkot , 2015 # Piotr Jakimiak , 2015 -# Maciek Olko , 2015-2016 +# m_aciek , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-07 21:25+0000\n" -"Last-Translator: Maciek Olko \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Użytkownik nieaktywny lub usunięty." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Błędny nagłówek z tokenem. Token nie może zawierać błędnych znaków." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Niepoprawny token." @@ -61,23 +61,23 @@ msgstr "Niepoprawny token." msgid "Auth Token" msgstr "Token uwierzytelniający" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Klucz" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Użytkownik" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Stworzono" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokeny" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "Nie znaleziono." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Niedozwolona metoda \"{method}\"." @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nie można zaspokoić nagłówka Accept żądania." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." @@ -143,214 +141,201 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." msgid "Request was throttled." msgstr "Żądanie zostało zdławione." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "To pole jest wymagane." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Pole nie może mieć wartości null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" nie jest poprawną wartością logiczną." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "To pole nie może być puste." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Podaj poprawny adres e-mail." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ta wartość nie pasuje do wymaganego wzorca." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Wprowadź poprawny adres URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" nie jest poprawnym UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Wprowadź poprawny adres IPv4 lub IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Wymagana poprawna liczba całkowita." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Za długi ciąg znaków." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Wymagana poprawna liczba." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Oczekiwano datę z czasem, otrzymano tylko datę." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Oczekiwano daty a otrzymano datę z czasem." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 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:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Czas trwania ma zły format. Użyj w zamian jednego z tych formatów: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" nie jest poprawnym wyborem." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Więcej niż {count} elementów..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Zaznaczenie nie może być puste." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" nie jest poprawną ścieżką." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nie przesłano pliku." -#: fields.py:1348 +#: fields.py:1359 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:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nie można określić nazwy pliku." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Przesłany plik jest pusty." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 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:1399 +#: fields.py:1410 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:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Lista nie może być pusta." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Oczekiwano słownika, ale otrzymano \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Wartość musi być poprawnym ciągiem znaków JSON" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Wyślij" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Niepoprawna strona." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Niepoprawny wskaźnik" #: relations.py:207 -#, 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:208 -#, 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}." @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Błędny hyperlink - obiekt nie istnieje." #: relations.py:243 -#, 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:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Obiekt z polem {slug_name}={value} nie istnieje" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Niepoprawna wartość." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtry" @@ -415,27 +397,23 @@ msgstr "None" msgid "No items to select." msgstr "Nie wybrano wartości." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Wartość dla tego pola musi być unikalna." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Pola {field_names} muszą tworzyć unikalny zestaw." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "To pole musi mieć unikalną wartość dla jednej daty z pola \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "To pole musi mieć unikalną wartość dla konkretnego miesiąca z pola \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 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}\"." @@ -443,15 +421,19 @@ msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{da msgid "Invalid version in \"Accept\" header." msgstr "Błędna wersja w nagłówku \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Błędna wersja w ścieżce URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Błędna wersja w nazwie hosta." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Błędna wersja w parametrach zapytania." diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo index 9553b8f7a..9e3c7ab2f 100644 Binary files a/rest_framework/locale/pt/LC_MESSAGES/django.mo and b/rest_framework/locale/pt/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po index c1217b2d6..9f1de1938 100644 --- a/rest_framework/locale/pt/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo index 20a41eb1f..1dd7287f3 100644 Binary files a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo and b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po index 8b55e9ed9..2c90f14ca 100644 --- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." -#: authentication.py:74 +#: authentication.py:76 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:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Usuário ou senha inválido." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuário inativo ou removido." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." -#: authentication.py:176 +#: authentication.py:179 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:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token inválido." @@ -62,23 +62,23 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Não encontrado." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" não é permitido." @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." @@ -144,214 +142,201 @@ msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." msgid "Request was throttled." msgstr "Pedido foi limitado." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Este campo é obrigatório." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Este campo não pode ser nulo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" não é um valor boleano válido." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Este campo não pode ser em branco." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 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:671 -#, python-brace-format +#: fields.py:676 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:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Insira um endereço de email válido." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Este valor não corresponde ao padrão exigido." -#: fields.py:730 +#: fields.py:735 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:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Entrar um URL válido." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" não é um UUID válido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Informe um endereço IPv4 ou IPv6 válido." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Um número inteiro válido é exigido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 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:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 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:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Valor da string é muito grande." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Um número válido é necessário." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 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:888 -#, python-brace-format +#: fields.py:894 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:889 -#, python-brace-format +#: fields.py:895 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:1004 -#, python-brace-format +#: fields.py:1025 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:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Necessário uma data e hora mas recebeu uma data." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 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:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Necessário uma data mas recebeu uma data e hora." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" não é um escolha válido." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mais de {count} itens..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 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:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Esta seleção não pode estar vazia." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" não é uma escolha válida para um caminho." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nenhum arquivo foi submetido." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nome do arquivo não pode ser determinado." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "O arquivo submetido está vázio." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Esta lista não pode estar vazia." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Esperado um dicionário de itens mas recebeu tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Valor devo ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Enviar" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor inválido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk inválido \"{pk_value}\" - objeto não existe." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink inválido - Objeto não existe." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto com {slug_name}={value} não existe." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor inválido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Dado inválido. Necessário um dicionário mas recebeu {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtra" @@ -416,27 +398,23 @@ msgstr "Nenhum(a/as)" msgid "No items to select." msgstr "Nenhum item para escholher." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Esse campo deve ser único." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Os campos {field_names} devem criar um set único." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "O campo \"{date_field}\" deve ser único para a data." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "O campo \"{date_field}\" deve ser único para o mês." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "O campo \"{date_field}\" deve ser único para o ano." @@ -444,15 +422,19 @@ msgstr "O campo \"{date_field}\" deve ser único para o ano." msgid "Invalid version in \"Accept\" header." msgstr "Versão inválida no cabeçalho \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versão inválida no caminho de URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versão inválida no hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versão inválida no parâmetro de query." diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo index 82403c3ca..754e18154 100644 Binary files a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo and b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po index 1727fc42b..eedfa817d 100644 --- a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.mo b/rest_framework/locale/ro/LC_MESSAGES/django.mo index 77dc7d0f2..5a113ab72 100644 Binary files a/rest_framework/locale/ro/LC_MESSAGES/django.mo and b/rest_framework/locale/ro/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.po b/rest_framework/locale/ro/LC_MESSAGES/django.po index f63a1da24..bb3b5e3c0 100644 --- a/rest_framework/locale/ro/LC_MESSAGES/django.po +++ b/rest_framework/locale/ro/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Elena-Adela Neacsu , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Romanian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +18,423 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Antet de bază invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Antet de bază invalid. Şirul de caractere cu datele de autentificare nu trebuie să conțină spații." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Antet de bază invalid. Datele de autentificare nu au fost corect codificate în base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Nume utilizator / Parolă invalid(ă)." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Utilizator inactiv sau șters." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Antet token invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Antet token invalid. Şirul de caractere pentru token nu trebuie să conțină spații." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Antet token invalid. Şirul de caractere pentru token nu trebuie să conțină caractere nevalide." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Token nevalid." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token de autentificare" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Cheie" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Utilizator" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Creat" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokenuri" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Nume de utilizator" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Parola" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Contul de utilizator este dezactivat." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Nu se poate conecta cu datele de conectare furnizate." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Trebuie să includă \"numele de utilizator\" și \"parola\"." #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "A apărut o eroare pe server." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Cerere incorectă." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Date de autentificare incorecte." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Datele de autentificare nu au fost furnizate." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Nu aveți permisiunea de a efectua această acțiune." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Nu a fost găsit(ă)." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Metoda \"{method}\" nu este permisa." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Antetul Accept al cererii nu a putut fi îndeplinit." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Cererea conține tipul media neacceptat \"{media_type}\"" #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Cererea a fost gâtuită." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Acest câmp este obligatoriu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Acest câmp nu poate fi nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "\"{input}\" nu este un boolean valid." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Acest câmp nu poate fi gol." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Asigurați-vă că acest câmp nu are mai mult de {max_length} caractere." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Asigurați-vă că acest câmp are cel puțin{min_length} caractere." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Introduceți o adresă de email validă." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Această valoare nu se potrivește cu şablonul cerut." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Introduceți un \"slug\" valid format din litere, numere, caractere de subliniere sau cratime." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Introduceți un URL valid." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "\"{value}\" nu este un UUID valid." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Introduceți o adresă IPv4 sau IPv6 validă." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Este necesar un întreg valid." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Asigurați-vă că această valoare este mai mică sau egală cu {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Asigurați-vă că această valoare este mai mare sau egală cu {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Valoare șir de caractere prea mare." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Este necesar un număr valid." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_digits} cifre în total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_decimal_places} zecimale." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_whole_digits} cifre înainte de punctul zecimal." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Câmpul datetime are format greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Se aștepta un câmp datetime, dar s-a primit o dată." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Data are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Se aștepta o dată, dar s-a primit un câmp datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Timpul are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Durata are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" nu este o opțiune validă." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Mai mult de {count} articole ..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Se aștepta o listă de elemente, dar s-a primit tip \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Această selecție nu poate fi goală." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" nu este o cale validă." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Nici un fișier nu a fost sumis." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Datele prezentate nu sunt un fișier. Verificați tipul de codificare de pe formular." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Numele fișierului nu a putut fi determinat." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Fișierul sumis este gol." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Asigurați-vă că acest nume de fișier are cel mult {max_length} caractere (momentan are {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Încărcați o imagine validă. Fișierul încărcat a fost fie nu o imagine sau o imagine coruptă." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Această listă nu poate fi goală." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Se aștepta un dicționar de obiecte, dar s-a primit tipul \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Valoarea trebuie să fie JSON valid." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Sumiteţi" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Pagină nevalidă." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Cursor nevalid" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Pk \"{pk_value}\" nevalid - obiectul nu există." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Tip incorect. Se aștepta un pk, dar s-a primit \"{data_type}\"." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Hyperlink nevalid - Nici un URL nu se potrivește." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Hyperlink nevalid - Potrivire URL incorectă." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Hyperlink nevalid - Obiectul nu există." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Tip incorect. Se aștepta un URL, dar s-a primit \"{data_type}\"." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Obiectul cu {slug_name}={value} nu există." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Valoare nevalidă." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Date nevalide. Se aștepta un dicționar de obiecte, dar s-a primit \"{datatype}\"." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filtre" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Filtre câmpuri" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Ordonare" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Căutare" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 #: templates/rest_framework/vertical/radio.html:2 msgid "None" -msgstr "" +msgstr "Nici unul/una" #: 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 "" +msgstr "Nu există elemente pentru a fi selectate." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Acest câmp trebuie să fie unic." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Câmpurile {field_names} trebuie să formeze un set unic." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru luna \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru anul \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Versiune nevalidă în antetul \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Versiune nevalidă în calea URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Versiune nevalidă în numele de gazdă." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Versiune nevalid în parametrul de interogare." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Permisiune refuzată." diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo index ac67f09a3..be0620a33 100644 Binary files a/rest_framework/locale/ru/LC_MESSAGES/django.mo and b/rest_framework/locale/ru/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po index 980a9e5b4..b73270906 100644 --- a/rest_framework/locale/ru/LC_MESSAGES/django.po +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Translators: # Kirill Tarasenko, 2015 # koodjo , 2015 -# Mikhail Dmitriev , 2015 +# Mike TUMS , 2015 +# Sergei Sinitsyn , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Russian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,74 +21,74 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Недопустимый заголовок. Не предоставлены учетные данные." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Недопустимые имя пользователя или пароль." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Пользователь неактивен или удален." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Недопустимый заголовок токена. Токен не должен содержать недопустимые символы." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Недопустимый токен." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Токен аутентификации" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Ключ" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Пользователь" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Создан" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Токен" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Токены" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Имя пользователя" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Пароль" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -126,7 +127,6 @@ msgid "Not found." msgstr "Не найдено." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Метод \"{method}\" не разрешен." @@ -135,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе." @@ -143,214 +142,201 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в msgid "Request was throttled." msgstr "Запрос был проигнорирован." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Это поле обязательно." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Это поле не может быть null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" не является корректным булевым значением." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Это поле не может быть пустым." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Убедитесь что в этом поле не больше {max_length} символов." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Убедитесь что в этом поле как минимум {min_length} символов." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Введите корректный адрес электронной почты." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Значение не соответствует требуемому паттерну." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Введите корректный URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" не является корректным UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Введите действительный адрес IPv4 или IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Требуется целочисленное значение." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Убедитесь что значение меньше или равно {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Убедитесь что значение больше или равно {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Слишком длинное значение." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Требуется численное значение." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Убедитесь что в числе не больше {max_digits} знаков." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Убедитесь что в цисле не больше {max_whole_digits} знаков в целой части." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат datetime. Используйте один из этих форматов: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Ожидался datetime, но был получен date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат date. Используйте один из этих форматов: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Ожидался date, но был получен datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Неправильный формат. Используйте один из этих форматов: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" не является корректным значением." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Элементов больше чем {count}" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Выбор не может быть пустым." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" не является корректным путем до файла" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Не был загружен файл." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Загруженный файл не является корректным файлом. " -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Невозможно определить имя файла." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Загруженный файл пуст." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Этот список не может быть пустым." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Значение должно быть правильным JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Отправить" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Неправильная страница" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Не корректный курсор" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}." @@ -367,75 +353,68 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Недопустимая ссылка - объект не существует." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Некорректный тип. Ожидался URL, получен {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Объект с {slug_name}={value} не существует." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Недопустимое значение." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Фильтры" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Фильтры полей" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Порядок сортировки" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +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 "" +msgstr "Нет элементов для выбора" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Это поле должно быть уникально." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Поля {field_names} должны производить массив с уникальными значениями." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Это поле должно быть уникально для даты \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Это поле должно быть уникально для месяца \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Это поле должно быть уникально для года \"{date_field}\"." @@ -443,18 +422,22 @@ msgstr "Это поле должно быть уникально для года msgid "Invalid version in \"Accept\" header." msgstr "Недопустимая версия в заголовке \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Недопустимая версия в пути URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Недопустимая версия в имени хоста." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Недопустимая версия в параметре запроса." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Доступ запрещен" diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo index 832378898..dda693e32 100644 Binary files a/rest_framework/locale/sk/LC_MESSAGES/django.mo and b/rest_framework/locale/sk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po index 208c063ac..1c22d09f0 100644 --- a/rest_framework/locale/sk/LC_MESSAGES/django.po +++ b/rest_framework/locale/sk/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Slovak (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nesprávne prihlasovacie údaje." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Daný používateľ je neaktívny, alebo zmazaný." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Nesprávny token." @@ -59,23 +59,23 @@ msgstr "Nesprávny token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Nebolo nájdené." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metóda \"{method}\" nie je povolená." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." @@ -141,214 +139,201 @@ msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." msgid "Request was throttled." msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Toto pole je povinné." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Toto pole nemôže byť nulové." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" je validný boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Toto pole nemože byť prázdne." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Uistite sa, že toto pole nemá viac ako {max_length} znakov." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Uistite sa, že toto pole má viac ako {min_length} znakov." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Vložte správnu emailovú adresu." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Toto pole nezodpovedá požadovanému formátu." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Zadajte platný \"slug\", ktorý obsahuje len malé písmená, čísla, spojovník alebopodtržítko." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Zadajte platnú URL adresu." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" nie je platné UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Je vyžadované celé číslo." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Uistite sa, že hodnota je menšia alebo rovná {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Uistite sa, že hodnota je väčšia alebo rovná {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Zadaný textový reťazec je príliš dlhý." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Je vyžadované číslo." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_digits} cifier." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_decimal_places} desatinných miest." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_whole_digits} cifier pred desatinnou čiarkou." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát dátumu a času. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Vložený len dátum - date namiesto dátumu a času - datetime." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát dátumu. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát času. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" je nesprávny výber z daných možností." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Bol očakávaný zoznam položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nebol odoslaný žiadny súbor." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Odoslané dáta neobsahujú súbor. Prosím skontrolujte kódovanie - encoding type daného formuláru." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nebolo možné určiť meno súboru." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Odoslaný súbor je prázdny." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Uistite sa, že meno súboru neobsahuje viac ako {max_length} znakov. (V skutočnosti ich má {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Uploadujte prosím obrázok. Súbor, ktorý ste uploadovali buď nie je obrázok, alebo daný obrázok je poškodený." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Nesprávny kurzor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Nesprávny primárny kľúč \"{pk_value}\" - objekt s daným primárnym kľúčom neexistuje." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Nesprávny typ. Bol prijatý {data_type} namiesto primárneho kľúča." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Nesprávny typ {data_type}. Požadovaný typ: hypertextový odkaz." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt, ktorého atribút \"{slug_name}\" je \"{value}\" neexistuje." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Nesprávna hodnota." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{datatype}\"." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Táto položka musí byť unikátna." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Dané položky: {field_names} musia tvoriť musia spolu tvoriť unikátnu množinu." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Položka musí byť pre špecifický deň \"{date_field}\" unikátna." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Položka musí byť pre mesiac \"{date_field}\" unikátna." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Položka musí byť pre rok \"{date_field}\" unikátna." @@ -441,15 +419,19 @@ msgstr "Položka musí byť pre rok \"{date_field}\" unikátna." msgid "Invalid version in \"Accept\" header." msgstr "Nesprávna verzia v \"Accept\" hlavičke." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Nesprávna verzia v URL adrese." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Nesprávna verzia v \"hostname\"." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Nesprávna verzia v parametri požiadavku." diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo index d560de6e1..cbecec44d 100644 Binary files a/rest_framework/locale/sv/LC_MESSAGES/django.mo and b/rest_framework/locale/sv/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.po b/rest_framework/locale/sv/LC_MESSAGES/django.po index 879b2e991..82dde0d87 100644 --- a/rest_framework/locale/sv/LC_MESSAGES/django.po +++ b/rest_framework/locale/sv/LC_MESSAGES/django.po @@ -4,14 +4,14 @@ # # Translators: # Frank Wickström , 2015 -# Joakim Soderlund, 2015 +# Joakim Soderlund, 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Swedish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,74 +19,74 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ogiltigt användarnamn/lösenord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Användaren borttagen eller inaktiv." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla ogiltiga tecken." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ogiltig \"token\"." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autentiseringstoken" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Nyckel" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Användare" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Skapad" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Användarnamn" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Lösenord" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Hittades inte." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" tillåts inte." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Medietypen \"{media_type}\" stöds inte." @@ -142,214 +140,201 @@ msgstr "Medietypen \"{media_type}\" stöds inte." msgid "Request was throttled." msgstr "Förfrågan stoppades eftersom du har skickat för många." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Det här fältet är obligatoriskt." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Det här fältet får inte vara null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" är inte ett giltigt booleskt värde." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Det här fältet får inte vara blankt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Se till att detta fält inte har fler än {max_length} tecken." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Se till att detta fält har minst {min_length} tecken." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Ange en giltig mejladress." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Det här värdet matchar inte mallen." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Ange en giltig \"slug\" bestående av bokstäver, nummer, understreck eller bindestreck." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Ange en giltig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value} är inte ett giltigt UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Ange en giltig IPv4- eller IPv6-adress." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Ett giltigt heltal krävs." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Se till att detta värde är mindre än eller lika med {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Se till att detta värde är större än eller lika med {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Textvärdet är för långt." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Ett giltigt nummer krävs." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Se till att det inte finns fler än totalt {max_digits} siffror." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Se till att det inte finns fler än {max_decimal_places} decimaler." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Se till att det inte finns fler än {max_whole_digits} siffror före decimalpunkten." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Förväntade en datumtid men fick ett datum." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Förväntade ett datum men fick en datumtid." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Perioden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" är inte ett giltigt val." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Fler än {count} objekt..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Förväntade en lista med element men fick typen \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Det här valet får inte vara tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" är inte ett giltigt val för en sökväg." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen fil skickades." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Inget filnamn kunde bestämmas." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den skickade filen var tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Den här listan får inte vara tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Förväntade en \"dictionary\" med element men fick typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Värdet måste vara giltig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Skicka" -#: pagination.py:189 -msgid "Invalid page." +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:407 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 +msgid "Invalid page." +msgstr "Ogiltig sida." + +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ogiltig cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ogiltig hyperlänk - Objektet finns inte." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finns inte." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ogiltigt värde." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ogiltig data. Förväntade en dictionary, men fick {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filter" @@ -414,27 +396,23 @@ msgstr "Inget" msgid "No items to select." msgstr "Inga valbara objekt." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Det här fältet måste vara unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Fälten {field_names} måste skapa ett unikt set." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Det här fältet måste vara unikt för datumet \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Det här fältet måste vara unikt för månaden \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Det här fältet måste vara unikt för året \"{date_field}\"." @@ -442,15 +420,19 @@ msgstr "Det här fältet måste vara unikt för året \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Ogiltig version i \"Accept\"-headern." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ogiltig version i URL-resursen." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ogiltig version i värdnamnet." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ogiltig version i förfrågningsparametern." diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index 14f5dc981..818aad279 100644 Binary files a/rest_framework/locale/tr/LC_MESSAGES/django.mo and b/rest_framework/locale/tr/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po index 50722b3d8..17e6e4a73 100644 --- a/rest_framework/locale/tr/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # Dogukan Tufekci , 2015 # Emrah BİLBAY , 2015 # Ertaç Paprat , 2015 -# José Alaguna , 2016 +# Yusuf (Josè) Luis , 2016 # Mesut Can Gürle , 2015 # Murat Çorlu , 2015 # Recep KIRMIZI , 2015 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-09 23:45+0000\n" -"Last-Translator: José Alaguna \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,40 +25,40 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı/parola" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Geçersiz token." @@ -66,23 +66,23 @@ msgstr "Geçersiz token." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "İşaretler" @@ -131,7 +131,6 @@ msgid "Not found." msgstr "Bulunamadı." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." @@ -140,7 +139,6 @@ msgid "Could not satisfy the request Accept header." msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." @@ -148,214 +146,201 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" geçerli bir boolean değil." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" geçerli bir UUID değil." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Gönder" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Sayfalandırma imleci geçersiz" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." @@ -372,25 +357,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz bağlantı - Obje bulunamadı." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Geçersiz değer." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. " -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtreler" @@ -420,27 +402,23 @@ msgstr "Hiçbiri" msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Bu alan eşsiz olmalı." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." @@ -448,15 +426,19 @@ msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" başlığındaki sürüm geçersiz." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL dizininde geçersiz versiyon." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Host adında geçersiz versiyon." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sorgu parametresinde geçersiz versiyon." diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index 5fa743b50..a3a8ca0d5 100644 Binary files a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo and b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index efbd689e6..171826a63 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# José Alaguna , 2015-2016 +# Yusuf (Josè) Luis , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-09 23:48+0000\n" -"Last-Translator: José Alaguna \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı / şifre." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Geçersiz simge." @@ -59,23 +59,23 @@ msgstr "Geçersiz simge." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "İşaretler" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Bulunamadı." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." @@ -141,214 +139,201 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" geçerli bir boolean değil." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" geçerli bir UUID değil." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Gönder" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Geçersiz imleç." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz hyper link - Nesne yok.." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Geçersiz değer." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Geçersiz veri. Bir sözlük bekleniyor, ama var {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtreler" @@ -413,27 +395,23 @@ msgstr "Hiç kimse" msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Bu alan benzersiz olmalıdır." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "{field_names} alanları benzersiz bir set yapmak gerekir." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." @@ -441,15 +419,19 @@ msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." msgid "Invalid version in \"Accept\" header." msgstr "\"Kabul et\" başlığında geçersiz sürümü." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL yolu geçersiz sürümü." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Hostname geçersiz sürümü." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sorgu parametresi geçersiz sürümü." diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo index 79396f543..bfcb776e7 100644 Binary files a/rest_framework/locale/uk/LC_MESSAGES/django.mo and b/rest_framework/locale/uk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po index 0e3c82802..51909058f 100644 --- a/rest_framework/locale/uk/LC_MESSAGES/django.po +++ b/rest_framework/locale/uk/LC_MESSAGES/django.po @@ -3,13 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Denis Podlesniy , 2016 +# Illarion , 2016 +# Kirill Tarasenko, 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Ukrainian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +20,423 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані відсутні." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані мають бути без пробілів." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані невірно закодовані у Base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Недійсне iм'я користувача/пароль." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Користувач неактивний або видалений." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Недійсний заголовок токена. Облікові дані відсутні." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Недійсний заголовок токена. Значення токена не повинне містити пробіли." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Недійсний заголовок токена. Значення токена не повинне містити некоректні символи." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Недійсний токен." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Авторизаційний токен" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Ключ" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Користувач" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Створено" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Токен" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Токени" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Ім'я користувача" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Пароль" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Обліковий запис деактивований." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Неможливо зайти з введеними даними." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Має включати iм'я користувача та пароль" #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "Помилка сервера." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Некоректний запит." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Некоректні реквізити перевірки достовірності." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Реквізити перевірки достовірності не надані." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "У вас нема дозволу робити цю дію." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Не знайдено." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Метод \"{method}\" не дозволений." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Неможливо виконати запит прийняття заголовку." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Непідтримуваний тип даних \"{media_type}\" в запиті." #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Запит було проігноровано." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Це поле обов'язкове." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Це поле не може бути null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "\"{input}\" не є коректним бульовим значенням." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Це поле не може бути порожнім." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Переконайтесь, що кількість символів в цьому полі не перевищує {max_length}." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Переконайтесь, що в цьому полі мінімум {min_length} символів." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Введіть коректну адресу електронної пошти." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Значення не відповідає необхідному патерну." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Введіть коректний \"slug\", що складається із букв, цифр, нижніх підкреслень або дефісів. " -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Введіть коректний URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "\"{value}\" не є коректним UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Введіть дійсну IPv4 або IPv6 адресу." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Необхідне цілочисельне значення." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Переконайтесь, що значення менше або дорівнює {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Переконайтесь, що значення більше або дорівнює {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Строкове значення занадто велике." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Необхідне чисельне значення." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_digits} знаків." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_decimal_places} знаків у дробовій частині." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_whole_digits} знаків у цілій частині." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат дата з часом. Використайте один з цих форматів: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Очікувалась дата з часом, але було отримано дату." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат дати. Використайте один з цих форматів: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Очікувалась дата, але було отримано дату з часом." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Неправильний формат часу. Використайте один з цих форматів: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат тривалості. Використайте один з цих форматів: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" не є коректним вибором." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Елементів більше, ніж {count}..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Очікувався список елементів, але було отримано \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Вибір не може бути порожнім." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" вибраний шлях не є коректним." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Файл не було відправленно." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Відправленні дані не є файл. Перевірте тип кодування у формі." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Неможливо визначити ім'я файлу." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Відправленний файл порожній." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Переконайтесь, що ім'я файлу становить менше {max_length} символів (зараз {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Завантажте коректне зображення. Завантажений файл або не є зображенням, або пошкоджений." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Цей список не може бути порожнім." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Очікувався словник зі елементами, але було отримано \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Значення повинно бути коректним JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Відправити" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Недійсна сторінка." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Недійсний курсор." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Недопустимий первинний ключ \"{pk_value}\" - об'єкт не існує." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Некоректний тип. Очікувалось значення первинного ключа, отримано {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Недійсне посилання - немає збігу за URL." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Недійсне посилання - некоректний збіг за URL." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Недійсне посилання - об'єкт не існує." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Некоректний тип. Очікувався URL, отримано {data_type}." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Об'єкт із {slug_name}={value} не існує." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Недійсне значення." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Недопустимі дані. Очікувався словник, але було отримано {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Фільтри" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Фільтри поля" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Впорядкування" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +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 "" +msgstr "Немає елементів для вибору." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Це поле повинне бути унікальним." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Поля {field_names} повинні створювати унікальний масив значень." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Це поле повинне бути унікальним для дати \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Це поле повинне бути унікальним для місяця \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Це поле повинне бути унікальним для року \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Недопустима версія в загаловку \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Недопустима версія в шляху URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Недопустима версія в імені хоста." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Недопустима версія в параметрі запиту." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Доступ заборонено." diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo index a055d763a..578308acf 100644 Binary files a/rest_framework/locale/vi/LC_MESSAGES/django.mo and b/rest_framework/locale/vi/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po index 0f8415b51..ea43efb95 100644 --- a/rest_framework/locale/vi/LC_MESSAGES/django.po +++ b/rest_framework/locale/vi/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Vietnamese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo index ecd7a91eb..5ba81a865 100644 Binary files a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po index 7eca9d517..c21604b42 100644 --- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese (China) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头,没有提供认证信息。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格(基本认证HTTP头无效)。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误(基本认证HTTP头无效)。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息(认证令牌HTTP头无效)。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格(无效的认证令牌HTTP头)。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "认证令牌无效。" @@ -61,23 +61,23 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "认证令牌" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "用户" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "令牌" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "令牌" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "未找到。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" @@ -143,214 +141,201 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "“{input}” 不是合法的布尔值。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“,只能包含字母,数字,下划线或者中划线。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "“{value}”不是合法的UUID。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择:{format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "期望为日期时间,得到的是日期。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择:{format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "期望为日期,得到的是日期时间。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择:{format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个:{format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表,得到的类型是“{input_type}”。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "“{input}” 不是有效路径选项。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "列表字段不能为空值。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典,得到类型为 “{input_type}”。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "保存" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "无效游标" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” - 对象不存在。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键,得到的类型为 {data_type}。" @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 -对象不存在。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串,实际的类型是 {data_type}。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "无效值。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型,得到的是 {datatype} 。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "过滤器" @@ -415,27 +397,23 @@ msgstr "无" msgid "No items to select." msgstr "没有可选项。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" @@ -443,15 +421,19 @@ msgstr "该字段必须在年 “{date_field}” 唯一。" msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo index cffdae362..396aded07 100644 Binary files a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po index 8a0f67382..9f5cd24f1 100644 --- a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ping , 2015 +# cokky , 2015 # hunter007 , 2015 # nypisces , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese Simplified (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hans/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头,没有提供认证信息。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格(基本认证HTTP头无效)。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误(基本认证HTTP头无效)。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息(认证令牌HTTP头无效)。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格(无效的认证令牌HTTP头)。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "认证令牌无效。" @@ -61,23 +61,23 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "未找到。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" @@ -143,214 +141,201 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "“{input}” 不是合法的布尔值。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“,只能包含字母,数字,下划线或者中划线。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "“{value}”不是合法的UUID。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择:{format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "期望为日期时间,获得的是日期。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择:{format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "期望为日期,获得的是日期时间。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择:{format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个:{format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表,得到的类型是“{input_type}”。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"不是一个有效路径选项。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "列表不能为空。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典,得到类型为 “{input_type}”。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "提交" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "无效游标" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” - 对象不存在。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键,获得的类型为 {data_type}。" @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 -对象不存在。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串,实际的类型是 {data_type}。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "无效值。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型,得到的是 {datatype} 。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "过滤器" @@ -415,27 +397,23 @@ msgstr "无" msgid "No items to select." msgstr "没有可选项。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" @@ -443,15 +421,19 @@ msgstr "该字段必须在年 “{date_field}” 唯一。" msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo index d33604524..08954cc4b 100644 Binary files a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po index ea6a45312..1960f1f5d 100644 --- a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hant/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese Traditional (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hant/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: zh-Hant\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo index 6371fcea7..b3158f9eb 100644 Binary files a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po index 8858ce17c..9bfb23c6b 100644 --- a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_TW/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 1104aa29c..47a4923a1 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -68,6 +68,13 @@ class UpdateModelMixin(object): serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) self.perform_update(serializer) + + if getattr(instance, '_prefetched_objects_cache', None): + # If 'prefetch_related' has been applied to a queryset, we need to + # refresh the instance from the database. + instance = self.get_object() + serializer = self.get_serializer(instance) + return Response(serializer.data) def perform_update(self, serializer): diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py index 2a2b6f168..ca1b59f12 100644 --- a/rest_framework/negotiation.py +++ b/rest_framework/negotiation.py @@ -90,7 +90,7 @@ class DefaultContentNegotiation(BaseContentNegotiation): def get_accept_list(self, request): """ - Given the incoming request, return a tokenised list of media + Given the incoming request, return a tokenized list of media type strings. """ header = request.META.get('HTTP_ACCEPT', '*/*') diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 6ad10d860..8ccdc342c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -15,7 +15,7 @@ from django.utils import six from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ -from rest_framework.compat import template_render +from rest_framework.compat import coreapi, template_render from rest_framework.exceptions import NotFound from rest_framework.response import Response from rest_framework.settings import api_settings @@ -64,10 +64,10 @@ def _get_displayed_page_numbers(current, final): This implementation gives one page to each side of the cursor, or two pages to the side when the cursor is at the edge, then - ensures that any breaks between non-continous page numbers never + ensures that any breaks between non-continuous page numbers never remove only a single page. - For an alernativative implementation which gives two pages to each side of + For an alternative implementation which gives two pages to each side of the cursor, eg. as in GitHub issue list pagination, see: https://gist.github.com/tomchristie/321140cebb1c4a558b15 @@ -157,7 +157,8 @@ class BasePagination(object): def get_results(self, data): return data['results'] - def get_fields(self, view): + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' return [] @@ -283,10 +284,16 @@ class PageNumberPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - if self.page_size_query_param is None: - return [self.page_query_param] - return [self.page_query_param, self.page_size_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + fields = [ + coreapi.Field(name=self.page_query_param, required=False, location='query') + ] + if self.page_size_query_param is not None: + fields.append( + coreapi.Field(name=self.page_size_query_param, required=False, location='query') + ) + return fields class LimitOffsetPagination(BasePagination): @@ -312,6 +319,9 @@ class LimitOffsetPagination(BasePagination): self.request = request if self.count > self.limit and self.template is not None: self.display_page_controls = True + + if self.count == 0 or self.offset > self.count: + return [] return list(queryset[self.offset:self.offset + self.limit]) def get_paginated_response(self, data): @@ -412,8 +422,12 @@ class LimitOffsetPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - return [self.limit_query_param, self.offset_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [ + coreapi.Field(name=self.limit_query_param, required=False, location='query'), + coreapi.Field(name=self.offset_query_param, required=False, location='query') + ] class CursorPagination(BasePagination): @@ -476,10 +490,10 @@ class CursorPagination(BasePagination): # Determine the position of the final item following the page. if len(results) > len(self.page): - has_following_postion = True + has_following_position = True following_position = self._get_position_from_instance(results[-1], self.ordering) else: - has_following_postion = False + has_following_position = False following_position = None # If we have a reverse queryset, then the query ordering was in reverse @@ -490,14 +504,14 @@ class CursorPagination(BasePagination): if reverse: # Determine next and previous positions for reverse cursors. self.has_next = (current_position is not None) or (offset > 0) - self.has_previous = has_following_postion + self.has_previous = has_following_position if self.has_next: self.next_position = current_position if self.has_previous: self.previous_position = following_position else: # Determine next and previous positions for forward cursors. - self.has_next = has_following_postion + self.has_next = has_following_position self.has_previous = (current_position is not None) or (offset > 0) if self.has_next: self.next_position = following_position @@ -534,7 +548,7 @@ class CursorPagination(BasePagination): # our marker. break - # The item in this postion has the same position as the item + # The item in this position has the same position as the item # following it, we can't use it as a marker position, so increment # the offset and keep seeking to the previous item. compare = position @@ -582,7 +596,7 @@ class CursorPagination(BasePagination): # our marker. break - # The item in this postion has the same position as the item + # The item in this position has the same position as the item # following it, we can't use it as a marker position, so increment # the offset and keep seeking to the previous item. compare = position @@ -697,7 +711,11 @@ class CursorPagination(BasePagination): return replace_query_param(self.base_url, self.cursor_query_param, encoded) def _get_position_from_instance(self, instance, ordering): - attr = getattr(instance, ordering[0].lstrip('-')) + field_name = ordering[0].lstrip('-') + if isinstance(instance, dict): + attr = instance[field_name] + else: + attr = getattr(instance, field_name) return six.text_type(attr) def get_paginated_response(self, data): @@ -718,5 +736,8 @@ class CursorPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - return [self.cursor_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [ + coreapi.Field(name=self.cursor_query_param, required=False, location='query') + ] diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ab74a6e58..238382364 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -118,6 +118,10 @@ class FileUploadParser(BaseParser): Parser for file upload data. """ media_type = '*/*' + errors = { + 'unhandled': 'FileUpload parse error - none of upload handlers can handle the stream', + 'no_filename': 'Missing filename. Request should include a Content-Disposition header with a filename parameter.', + } def parse(self, stream, media_type=None, parser_context=None): """ @@ -134,6 +138,9 @@ class FileUploadParser(BaseParser): upload_handlers = request.upload_handlers filename = self.get_filename(stream, media_type, parser_context) + if not filename: + raise ParseError(self.errors['no_filename']) + # Note that this code is extracted from Django's handling of # file uploads in MultiPartParser. content_type = meta.get('HTTP_CONTENT_TYPE', @@ -146,7 +153,7 @@ class FileUploadParser(BaseParser): # See if the handler will want to take care of the parsing. for handler in upload_handlers: - result = handler.handle_raw_input(None, + result = handler.handle_raw_input(stream, meta, content_length, None, @@ -178,10 +185,10 @@ class FileUploadParser(BaseParser): for index, handler in enumerate(upload_handlers): file_obj = handler.file_complete(counters[index]) - if file_obj: + if file_obj is not None: return DataAndFiles({}, {'file': file_obj}) - raise ParseError("FileUpload parse error - " - "none of upload handlers can handle the stream") + + raise ParseError(self.errors['unhandled']) def get_filename(self, stream, media_type, parser_context): """ diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 8f5de0256..dd2d35ccd 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -5,6 +5,9 @@ from __future__ import unicode_literals from django.http import Http404 +from rest_framework.compat import is_authenticated + + SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS') @@ -44,7 +47,7 @@ class IsAuthenticated(BasePermission): """ def has_permission(self, request, view): - return request.user and request.user.is_authenticated() + return request.user and is_authenticated(request.user) class IsAdminUser(BasePermission): @@ -65,7 +68,7 @@ class IsAuthenticatedOrReadOnly(BasePermission): return ( request.method in SAFE_METHODS or request.user and - request.user.is_authenticated() + is_authenticated(request.user) ) @@ -127,7 +130,7 @@ class DjangoModelPermissions(BasePermission): return ( request.user and - (request.user.is_authenticated() or not self.authenticated_users_only) and + (is_authenticated(request.user) or not self.authenticated_users_only) and request.user.has_perms(perms) ) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 2e7c51b22..c1898d0d8 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -4,20 +4,21 @@ from __future__ import unicode_literals from collections import OrderedDict from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist -from django.core.urlresolvers import ( - NoReverseMatch, Resolver404, get_script_prefix, resolve -) from django.db.models import Manager from django.db.models.query import QuerySet from django.utils import six -from django.utils.encoding import smart_text +from django.utils.encoding import python_2_unicode_compatible, smart_text from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ +from rest_framework.compat import ( + NoReverseMatch, Resolver404, get_script_prefix, resolve +) from rest_framework.fields import ( Field, empty, get_attribute, is_simple_callable, iter_options ) from rest_framework.reverse import reverse +from rest_framework.settings import api_settings from rest_framework.utils import html @@ -36,17 +37,25 @@ class Hyperlink(six.text_type): We use this for hyperlinked URLs that may render as a named link in some contexts, or render as a plain URL in others. """ - def __new__(self, url, name): + def __new__(self, url, obj): ret = six.text_type.__new__(self, url) - ret.name = name + ret.obj = obj return ret def __getnewargs__(self): return(str(self), self.name,) + @property + def name(self): + # This ensures that we only called `__str__` lazily, + # as in some cases calling __str__ on a model instances *might* + # involve a database lookup. + return six.text_type(self.obj) + is_hyperlink = True +@python_2_unicode_compatible class PKOnlyObject(object): """ This is a mock object, used for when we only need the pk of the object @@ -56,6 +65,9 @@ class PKOnlyObject(object): def __init__(self, pk): self.pk = pk + def __str__(self): + return "%s" % self.pk + # We assume that 'validators' are intended for the child serializer, # rather than the parent serializer. @@ -67,14 +79,19 @@ MANY_RELATION_KWARGS = ( class RelatedField(Field): queryset = None - html_cutoff = 1000 - html_cutoff_text = _('More than {count} items...') + html_cutoff = None + html_cutoff_text = None def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', self.queryset) - self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) - self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) - + self.html_cutoff = kwargs.pop( + 'html_cutoff', + self.html_cutoff or int(api_settings.HTML_SELECT_CUTOFF) + ) + self.html_cutoff_text = kwargs.pop( + 'html_cutoff_text', + self.html_cutoff_text or _(api_settings.HTML_SELECT_CUTOFF_TEXT) + ) if not method_overridden('get_queryset', RelatedField, self): assert self.queryset is not None or kwargs.get('read_only', None), ( 'Relational field must provide a `queryset` argument, ' @@ -156,29 +173,35 @@ class RelatedField(Field): # Standard case, return the object instance. return get_attribute(instance, self.source_attrs) - @property - def choices(self): + def get_choices(self, cutoff=None): queryset = self.get_queryset() if queryset is None: # Ensure that field.choices returns something sensible # even when accessed with a read-only field. return {} + if cutoff is not None: + queryset = queryset[:cutoff] + return OrderedDict([ ( - six.text_type(self.to_representation(item)), + self.to_representation(item), self.display_value(item) ) for item in queryset ]) + @property + def choices(self): + return self.get_choices() + @property def grouped_choices(self): return self.choices def iter_options(self): return iter_options( - self.grouped_choices, + self.get_choices(cutoff=self.html_cutoff), cutoff=self.html_cutoff, cutoff_text=self.html_cutoff_text ) @@ -287,9 +310,6 @@ class HyperlinkedRelatedField(RelatedField): kwargs = {self.lookup_url_kwarg: lookup_value} return self.reverse(view_name, kwargs=kwargs, request=request, format=format) - def get_name(self, obj): - return six.text_type(obj) - def to_internal_value(self, data): request = self.context.get('request', None) try: @@ -368,8 +388,7 @@ class HyperlinkedRelatedField(RelatedField): if url is None: return None - name = self.get_name(value) - return Hyperlink(url, name) + return Hyperlink(url, value) class HyperlinkedIdentityField(HyperlinkedRelatedField): @@ -437,15 +456,20 @@ class ManyRelatedField(Field): 'not_a_list': _('Expected a list of items but got type "{input_type}".'), 'empty': _('This list may not be empty.') } - html_cutoff = 1000 - html_cutoff_text = _('More than {count} items...') + html_cutoff = None + html_cutoff_text = None def __init__(self, child_relation=None, *args, **kwargs): self.child_relation = child_relation self.allow_empty = kwargs.pop('allow_empty', True) - self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) - self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) - + self.html_cutoff = kwargs.pop( + 'html_cutoff', + self.html_cutoff or int(api_settings.HTML_SELECT_CUTOFF) + ) + self.html_cutoff_text = kwargs.pop( + 'html_cutoff_text', + self.html_cutoff_text or _(api_settings.HTML_SELECT_CUTOFF_TEXT) + ) assert child_relation is not None, '`child_relation` is a required argument.' super(ManyRelatedField, self).__init__(*args, **kwargs) self.child_relation.bind(field_name='', parent=self) @@ -487,9 +511,12 @@ class ManyRelatedField(Field): for value in iterable ] + def get_choices(self, cutoff=None): + return self.child_relation.get_choices(cutoff) + @property def choices(self): - return self.child_relation.choices + return self.get_choices() @property def grouped_choices(self): @@ -497,7 +524,7 @@ class ManyRelatedField(Field): def iter_options(self): return iter_options( - self.grouped_choices, + self.get_choices(cutoff=self.html_cutoff), cutoff=self.html_cutoff, cutoff_text=self.html_cutoff_text ) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e313998d1..97984daf9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -166,13 +166,18 @@ class TemplateHTMLRenderer(BaseRenderer): template_names = self.get_template_names(response, view) template = self.resolve_template(template_names) - context = self.resolve_context(data, request, response) + if hasattr(self, 'resolve_context'): + # Fallback for older versions. + context = self.resolve_context(data, request, response) + else: + context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) def resolve_template(self, template_names): return loader.select_template(template_names) - def resolve_context(self, data, request, response): + def get_template_context(self, data, renderer_context): + response = renderer_context['response'] if response.exception: data['status_code'] = response.status_code return data @@ -228,7 +233,10 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): if response and response.exception: request = renderer_context['request'] template = self.get_exception_template(response) - context = self.resolve_context(data, request, response) + if hasattr(self, 'resolve_context'): + context = self.resolve_context(data, request, response) + else: + context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) return data @@ -268,6 +276,10 @@ class HTMLFormRenderer(BaseRenderer): 'base_template': 'input.html', 'input_type': 'number' }, + serializers.FloatField: { + 'base_template': 'input.html', + 'input_type': 'number' + }, serializers.DateTimeField: { 'base_template': 'input.html', 'input_type': 'datetime-local' @@ -637,6 +649,12 @@ class BrowsableAPIRenderer(BaseRenderer): else: paginator = None + csrf_cookie_name = settings.CSRF_COOKIE_NAME + csrf_header_name = getattr(settings, 'CSRF_HEADER_NAME', 'HTTP_X_CSRFToken') # Fallback for Django 1.8 + if csrf_header_name.startswith('HTTP_'): + csrf_header_name = csrf_header_name[5:] + csrf_header_name = csrf_header_name.replace('_', '-') + context = { 'content': self.get_content(renderer, data, accepted_media_type, renderer_context), 'view': view, @@ -667,7 +685,8 @@ class BrowsableAPIRenderer(BaseRenderer): 'display_edit_forms': bool(response.status_code != 403), 'api_settings': api_settings, - 'csrf_cookie_name': settings.CSRF_COOKIE_NAME, + 'csrf_cookie_name': csrf_cookie_name, + 'csrf_header_name': csrf_header_name } return context @@ -794,7 +813,7 @@ class MultiPartRenderer(BaseRenderer): class CoreJSONRenderer(BaseRenderer): - media_type = 'application/vnd.coreapi+json' + media_type = 'application/coreapi+json' charset = None format = 'corejson' diff --git a/rest_framework/request.py b/rest_framework/request.py index aafafcb32..7121689d2 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -15,6 +15,7 @@ import sys from django.conf import settings from django.http import QueryDict from django.http.multipartparser import parse_header +from django.http.request import RawPostDataException from django.utils import six from django.utils.datastructures import MultiValueDict @@ -263,10 +264,20 @@ class Request(object): if content_length == 0: self._stream = None - elif hasattr(self._request, 'read'): + elif not self._request._read_started: self._stream = self._request else: - self._stream = six.BytesIO(self.raw_post_data) + self._stream = six.BytesIO(self.body) + + def _supports_form_parsing(self): + """ + Return True if this requests supports parsing form data. + """ + form_media = ( + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ) + return any([parser.media_type in form_media for parser in self.parsers]) def _parse(self): """ @@ -274,11 +285,24 @@ class Request(object): May raise an `UnsupportedMediaType`, or `ParseError` exception. """ - stream = self.stream media_type = self.content_type + try: + stream = self.stream + except RawPostDataException: + if not hasattr(self._request, '_post'): + raise + # If request.POST has been accessed in middleware, and a method='POST' + # request was made with 'multipart/form-data', then the request stream + # will already have been exhausted. + if self._supports_form_parsing(): + return (self._request.POST, self._request.FILES) + stream = None if stream is None or media_type is None: - empty_data = QueryDict('', encoding=self._request._encoding) + if media_type and not is_form_media_type(media_type): + empty_data = QueryDict('', encoding=self._request._encoding) + else: + empty_data = {} empty_files = MultiValueDict() return (empty_data, empty_files) @@ -373,7 +397,7 @@ class Request(object): if not _hasattr(self, '_data'): self._load_data_and_files() if is_form_media_type(self.content_type): - return self.data + return self._data return QueryDict('', encoding=self._request._encoding) @property @@ -391,3 +415,8 @@ class Request(object): '`request.QUERY_PARAMS` has been deprecated in favor of `request.query_params` ' 'since version 3.0, and has been fully removed as of version 3.2.' ) + + def force_plaintext_errors(self, value): + # Hack to allow our exception handler to force choice of + # plaintext or html error responses. + self._request.is_ajax = lambda: value diff --git a/rest_framework/response.py b/rest_framework/response.py index 0e97668eb..cb0f290ce 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -51,14 +51,15 @@ class Response(SimpleTemplateResponse): @property def rendered_content(self): renderer = getattr(self, 'accepted_renderer', None) - media_type = getattr(self, 'accepted_media_type', None) + accepted_media_type = getattr(self, 'accepted_media_type', None) context = getattr(self, 'renderer_context', None) assert renderer, ".accepted_renderer not set on Response" - assert media_type, ".accepted_media_type not set on Response" - assert context, ".renderer_context not set on Response" + assert accepted_media_type, ".accepted_media_type not set on Response" + assert context is not None, ".renderer_context not set on Response" context['response'] = self + media_type = renderer.media_type charset = renderer.charset content_type = self.content_type @@ -68,7 +69,7 @@ class Response(SimpleTemplateResponse): content_type = media_type self['Content-Type'] = content_type - ret = renderer.render(self.data, media_type, context) + ret = renderer.render(self.data, accepted_media_type, context) if isinstance(ret, six.text_type): assert charset, ( 'renderer returned unicode, and did not specify ' diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index 5a7ba09a8..fd418dcca 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,11 +3,11 @@ Provide urlresolver functions that return fully qualified URLs or view names """ from __future__ import unicode_literals -from django.core.urlresolvers import reverse as django_reverse -from django.core.urlresolvers import NoReverseMatch from django.utils import six from django.utils.functional import lazy +from rest_framework.compat import reverse as django_reverse +from rest_framework.compat import NoReverseMatch from rest_framework.settings import api_settings from rest_framework.utils.urls import replace_query_param @@ -54,7 +54,7 @@ def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra def _reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): """ - Same as `django.core.urlresolvers.reverse`, but optionally takes a request + Same as `django.urls.reverse`, but optionally takes a request and returns a fully qualified URL, using the request to get the base URL. """ if format is not None: diff --git a/rest_framework/routers.py b/rest_framework/routers.py index a71bb7791..7a2d981a3 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -16,13 +16,15 @@ For example, you might have a `urls.py` that looks something like this: from __future__ import unicode_literals import itertools +import warnings from collections import OrderedDict, namedtuple from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured -from django.core.urlresolvers import NoReverseMatch from rest_framework import exceptions, renderers, views +from rest_framework.compat import NoReverseMatch +from rest_framework.renderers import BrowsableAPIRenderer from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.schemas import SchemaGenerator @@ -83,6 +85,7 @@ class BaseRouter(object): class SimpleRouter(BaseRouter): + routes = [ # List route. Route( @@ -258,6 +261,13 @@ class SimpleRouter(BaseRouter): trailing_slash=self.trailing_slash ) + # If there is no prefix, the first part of the url is probably + # controlled by project's urls.py and the router is in an app, + # so a slash in the beginning will (A) cause Django to give + # warnings and (B) generate URLS that will require using '//'. + if not prefix and regex[:2] == '^/': + regex = '^' + regex[2:] + view = viewset.as_view(mapping, **route.initkwargs) name = route.name.format(basename=basename) ret.append(url(regex, view, name=name)) @@ -273,47 +283,66 @@ class DefaultRouter(SimpleRouter): include_root_view = True include_format_suffixes = True root_view_name = 'api-root' - schema_renderers = [renderers.CoreJSONRenderer] + default_schema_renderers = [renderers.CoreJSONRenderer, BrowsableAPIRenderer] def __init__(self, *args, **kwargs): + if 'schema_title' in kwargs: + warnings.warn( + "Including a schema directly via a router is now pending " + "deprecation. Use `get_schema_view()` instead.", + PendingDeprecationWarning + ) + if 'schema_renderers' in kwargs: + assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' + if 'schema_url' in kwargs: + assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' self.schema_title = kwargs.pop('schema_title', None) + self.schema_url = kwargs.pop('schema_url', None) + self.schema_renderers = kwargs.pop('schema_renderers', self.default_schema_renderers) + if 'root_renderers' in kwargs: + self.root_renderers = kwargs.pop('root_renderers') + else: + self.root_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) super(DefaultRouter, self).__init__(*args, **kwargs) - def get_api_root_view(self, schema_urls=None): + def get_schema_root_view(self, api_urls=None): """ - Return a view to use as the API root. + Return a schema root view. + """ + schema_renderers = self.schema_renderers + schema_generator = SchemaGenerator( + title=self.schema_title, + url=self.schema_url, + patterns=api_urls + ) + + class APISchemaView(views.APIView): + _ignore_model_permissions = True + exclude_from_schema = True + renderer_classes = schema_renderers + + def get(self, request, *args, **kwargs): + schema = schema_generator.get_schema(request) + if schema is None: + raise exceptions.PermissionDenied() + return Response(schema) + + return APISchemaView.as_view() + + def get_api_root_view(self, api_urls=None): + """ + Return a basic root view. """ api_root_dict = OrderedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) - view_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) - schema_media_types = [] - - if schema_urls and self.schema_title: - view_renderers += list(self.schema_renderers) - schema_generator = SchemaGenerator( - title=self.schema_title, - patterns=schema_urls - ) - schema_media_types = [ - renderer.media_type - for renderer in self.schema_renderers - ] - - class APIRoot(views.APIView): + class APIRootView(views.APIView): _ignore_model_permissions = True - renderer_classes = view_renderers + exclude_from_schema = True def get(self, request, *args, **kwargs): - if request.accepted_renderer.media_type in schema_media_types: - # Return a schema response. - schema = schema_generator.get_schema(request) - if schema is None: - raise exceptions.PermissionDenied() - return Response(schema) - # Return a plain {"name": "hyperlink"} response. ret = OrderedDict() namespace = request.resolver_match.namespace @@ -334,7 +363,7 @@ class DefaultRouter(SimpleRouter): return Response(ret) - return APIRoot.as_view() + return APIRootView.as_view() def get_urls(self): """ @@ -344,7 +373,10 @@ class DefaultRouter(SimpleRouter): urls = super(DefaultRouter, self).get_urls() if self.include_root_view: - view = self.get_api_root_view(schema_urls=urls) + if self.schema_title: + view = self.get_schema_root_view(api_urls=urls) + else: + view = self.get_api_root_view(api_urls=urls) root_url = url(r'^$', view, name=self.root_view_name) urls.append(root_url) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index cf84aca74..9439cb691 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -1,25 +1,58 @@ +import re +from collections import OrderedDict from importlib import import_module from django.conf import settings from django.contrib.admindocs.views import simplify_regex -from django.core.urlresolvers import RegexURLPattern, RegexURLResolver +from django.core.exceptions import PermissionDenied +from django.http import Http404 from django.utils import six +from django.utils.encoding import force_text, smart_text -from rest_framework import exceptions, serializers -from rest_framework.compat import coreapi, uritemplate +from rest_framework import exceptions, renderers, serializers +from rest_framework.compat import ( + RegexURLPattern, RegexURLResolver, coreapi, uritemplate, urlparse +) from rest_framework.request import clone_request +from rest_framework.response import Response +from rest_framework.settings import api_settings +from rest_framework.utils import formatting +from rest_framework.utils.field_mapping import ClassLookupDict +from rest_framework.utils.model_meta import _get_pk from rest_framework.views import APIView -def as_query_fields(items): - """ - Take a list of Fields and plain strings. - Convert any pain strings into `location='query'` Field instances. - """ - return [ - item if isinstance(item, coreapi.Field) else coreapi.Field(name=item, required=False, location='query') - for item in items - ] +header_regex = re.compile('^[a-zA-Z][0-9A-Za-z_]*:') + +types_lookup = ClassLookupDict({ + serializers.Field: 'string', + serializers.IntegerField: 'integer', + serializers.FloatField: 'number', + serializers.DecimalField: 'number', + serializers.BooleanField: 'boolean', + serializers.FileField: 'file', + serializers.MultipleChoiceField: 'array', + serializers.ManyRelatedField: 'array', + serializers.Serializer: 'object', + serializers.ListSerializer: 'array' +}) + + +def common_path(paths): + split_paths = [path.strip('/').split('/') for path in paths] + s1 = min(split_paths) + s2 = max(split_paths) + common = s1 + for i, c in enumerate(s1): + if c != s2[i]: + common = s1[:i] + break + return '/' + '/'.join(common) + + +def get_pk_name(model): + meta = model._meta.concrete_model._meta + return _get_pk(meta).name def is_api_view(callback): @@ -30,96 +63,92 @@ def is_api_view(callback): return (cls is not None) and issubclass(cls, APIView) -def insert_into(target, keys, item): +def insert_into(target, keys, value): """ - Insert `item` into the nested dictionary `target`. + Nested dictionary insertion. - For example: - - target = {} - insert_into(target, ('users', 'list'), Link(...)) - insert_into(target, ('users', 'detail'), Link(...)) - assert target == {'users': {'list': Link(...), 'detail': Link(...)}} + >>> example = {} + >>> insert_into(example, ['a', 'b', 'c'], 123) + >>> example + {'a': {'b': {'c': 123}}} """ - for key in keys[:1]: + for key in keys[:-1]: if key not in target: target[key] = {} target = target[key] - target[keys[-1]] = item + target[keys[-1]] = value -class SchemaGenerator(object): - default_mapping = { - 'get': 'read', - 'post': 'create', - 'put': 'update', - 'patch': 'partial_update', - 'delete': 'destroy', - } +def is_custom_action(action): + return action not in set([ + 'retrieve', 'list', 'create', 'update', 'partial_update', 'destroy' + ]) - def __init__(self, title=None, patterns=None, urlconf=None): - assert coreapi, '`coreapi` must be installed for schema support.' - if patterns is None and urlconf is not None: +def is_list_view(path, method, view): + """ + Return True if the given path/method appears to represent a list view. + """ + if hasattr(view, 'action'): + # Viewsets have an explicitly defined action, which we can inspect. + return view.action == 'list' + + if method.lower() != 'get': + return False + path_components = path.strip('/').split('/') + if path_components and '{' in path_components[-1]: + return False + return True + + +def endpoint_ordering(endpoint): + path, method, callback = endpoint + method_priority = { + 'GET': 0, + 'POST': 1, + 'PUT': 2, + 'PATCH': 3, + 'DELETE': 4 + }.get(method, 5) + return (path, method_priority) + + +class EndpointInspector(object): + """ + A class to determine the available API endpoints that a project exposes. + """ + def __init__(self, patterns=None, urlconf=None): + if patterns is None: + if urlconf is None: + # Use the default Django URL conf + urlconf = settings.ROOT_URLCONF + + # Load the given URLconf module if isinstance(urlconf, six.string_types): urls = import_module(urlconf) else: urls = urlconf patterns = urls.urlpatterns - elif patterns is None and urlconf is None: - urls = import_module(settings.ROOT_URLCONF) - patterns = urls.urlpatterns - self.title = title - self.endpoints = self.get_api_endpoints(patterns) + self.patterns = patterns - def get_schema(self, request=None): - if request is None: - endpoints = self.endpoints - else: - # Filter the list of endpoints to only include those that - # the user has permission on. - endpoints = [] - for key, link, callback in self.endpoints: - method = link.action.upper() - view = callback.cls() - view.request = clone_request(request, method) - try: - view.check_permissions(view.request) - except exceptions.APIException: - pass - else: - endpoints.append((key, link, callback)) - - if not endpoints: - return None - - # Generate the schema content structure, from the endpoints. - # ('users', 'list'), Link -> {'users': {'list': Link()}} - content = {} - for key, link, callback in endpoints: - insert_into(content, key, link) - - # Return the schema document. - return coreapi.Document(title=self.title, content=content) - - def get_api_endpoints(self, patterns, prefix=''): + def get_api_endpoints(self, patterns=None, prefix=''): """ Return a list of all available API endpoints by inspecting the URL conf. """ + if patterns is None: + patterns = self.patterns + api_endpoints = [] for pattern in patterns: path_regex = prefix + pattern.regex.pattern - if isinstance(pattern, RegexURLPattern): - path = self.get_path(path_regex) + path = self.get_path_from_regex(path_regex) callback = pattern.callback if self.should_include_endpoint(path, callback): for method in self.get_allowed_methods(callback): - key = self.get_key(path, method, callback) - link = self.get_link(path, method, callback) - endpoint = (key, link, callback) + endpoint = (path, method, callback) api_endpoints.append(endpoint) elif isinstance(pattern, RegexURLResolver): @@ -129,9 +158,11 @@ class SchemaGenerator(object): ) api_endpoints.extend(nested_endpoints) + api_endpoints = sorted(api_endpoints, key=endpoint_ordering) + return api_endpoints - def get_path(self, path_regex): + def get_path_from_regex(self, path_regex): """ Given a URL conf regex, return a URI template string. """ @@ -149,9 +180,6 @@ class SchemaGenerator(object): if path.endswith('.{format}') or path.endswith('.{format}/'): return False # Ignore .json style URLs. - if path == '/': - return False # Ignore the root endpoint. - return True def get_allowed_methods(self, callback): @@ -163,53 +191,238 @@ class SchemaGenerator(object): return [ method for method in - callback.cls().allowed_methods if method != 'OPTIONS' + callback.cls().allowed_methods if method not in ('OPTIONS', 'HEAD') ] - def get_key(self, path, method, callback): - """ - Return a tuple of strings, indicating the identity to use for a - given endpoint. eg. ('users', 'list'). - """ - category = None - for item in path.strip('/').split('/'): - if '{' in item: - break - category = item - actions = getattr(callback, 'actions', self.default_mapping) - action = actions[method.lower()] +class SchemaGenerator(object): + # Map HTTP methods onto actions. + default_mapping = { + 'get': 'retrieve', + 'post': 'create', + 'put': 'update', + 'patch': 'partial_update', + 'delete': 'destroy', + } + endpoint_inspector_cls = EndpointInspector - if category: - return (category, action) - return (action,) + # Map the method names we use for viewset actions onto external schema names. + # These give us names that are more suitable for the external representation. + # Set by 'SCHEMA_COERCE_METHOD_NAMES'. + coerce_method_names = None + + # 'pk' isn't great as an externally exposed name for an identifier, + # so by default we prefer to use the actual model field name for schemas. + # Set by 'SCHEMA_COERCE_PATH_PK'. + coerce_path_pk = None + + def __init__(self, title=None, url=None, patterns=None, urlconf=None): + assert coreapi, '`coreapi` must be installed for schema support.' + + if url and not url.endswith('/'): + url += '/' + + self.coerce_method_names = api_settings.SCHEMA_COERCE_METHOD_NAMES + self.coerce_path_pk = api_settings.SCHEMA_COERCE_PATH_PK + + self.patterns = patterns + self.urlconf = urlconf + self.title = title + self.url = url + self.endpoints = None + + def get_schema(self, request=None): + """ + Generate a `coreapi.Document` representing the API schema. + """ + if self.endpoints is None: + inspector = self.endpoint_inspector_cls(self.patterns, self.urlconf) + self.endpoints = inspector.get_api_endpoints() + + links = self.get_links(request) + if not links: + return None + return coreapi.Document(title=self.title, url=self.url, content=links) + + def get_links(self, request=None): + """ + Return a dictionary containing all the links that should be + included in the API schema. + """ + links = OrderedDict() + + # Generate (path, method, view) given (path, method, callback). + paths = [] + view_endpoints = [] + for path, method, callback in self.endpoints: + view = self.create_view(callback, method, request) + if getattr(view, 'exclude_from_schema', False): + continue + path = self.coerce_path(path, method, view) + paths.append(path) + view_endpoints.append((path, method, view)) + + # Only generate the path prefix for paths that will be included + prefix = self.determine_path_prefix(paths) + + for path, method, view in view_endpoints: + if not self.has_view_permissions(path, method, view): + continue + link = self.get_link(path, method, view) + subpath = path[len(prefix):] + keys = self.get_keys(subpath, method, view) + insert_into(links, keys, link) + return links + + # Methods used when we generate a view instance from the raw callback... + + def determine_path_prefix(self, paths): + """ + Given a list of all paths, return the common prefix which should be + discounted when generating a schema structure. + + This will be the longest common string that does not include that last + component of the URL, or the last component before a path parameter. + + For example: + + /api/v1/users/ + /api/v1/users/{pk}/ + + The path prefix is '/api/v1/' + """ + prefixes = [] + for path in paths: + components = path.strip('/').split('/') + initial_components = [] + for component in components: + if '{' in component: + break + initial_components.append(component) + prefix = '/'.join(initial_components[:-1]) + if not prefix: + # We can just break early in the case that there's at least + # one URL that doesn't have a path prefix. + return '/' + prefixes.append('/' + prefix + '/') + return common_path(prefixes) + + def create_view(self, callback, method, request=None): + """ + Given a callback, return an actual view instance. + """ + view = callback.cls() + for attr, val in getattr(callback, 'initkwargs', {}).items(): + setattr(view, attr, val) + view.args = () + view.kwargs = {} + view.format_kwarg = None + view.request = None + view.action_map = getattr(callback, 'actions', None) + + actions = getattr(callback, 'actions', None) + if actions is not None: + if method == 'OPTIONS': + view.action = 'metadata' + else: + view.action = actions.get(method.lower()) + + if request is not None: + view.request = clone_request(request, method) + + return view + + def has_view_permissions(self, path, method, view): + """ + Return `True` if the incoming request has the correct view permissions. + """ + if view.request is None: + return True + + try: + view.check_permissions(view.request) + except (exceptions.APIException, Http404, PermissionDenied): + return False + return True + + def coerce_path(self, path, method, view): + """ + Coerce {pk} path arguments into the name of the model field, + where possible. This is cleaner for an external representation. + (Ie. "this is an identifier", not "this is a database primary key") + """ + if not self.coerce_path_pk or '{pk}' not in path: + return path + model = getattr(getattr(view, 'queryset', None), 'model', None) + if model: + field_name = get_pk_name(model) + else: + field_name = 'id' + return path.replace('{pk}', '{%s}' % field_name) # Methods for generating each individual `Link` instance... - def get_link(self, path, method, callback): + def get_link(self, path, method, view): """ Return a `coreapi.Link` instance for the given endpoint. """ - view = callback.cls() - - fields = self.get_path_fields(path, method, callback, view) - fields += self.get_serializer_fields(path, method, callback, view) - fields += self.get_pagination_fields(path, method, callback, view) - fields += self.get_filter_fields(path, method, callback, view) + fields = self.get_path_fields(path, method, view) + fields += self.get_serializer_fields(path, method, view) + fields += self.get_pagination_fields(path, method, view) + fields += self.get_filter_fields(path, method, view) if fields and any([field.location in ('form', 'body') for field in fields]): - encoding = self.get_encoding(path, method, callback, view) + encoding = self.get_encoding(path, method, view) else: encoding = None + description = self.get_description(path, method, view) + + if self.url and path.startswith('/'): + path = path[1:] + return coreapi.Link( - url=path, + url=urlparse.urljoin(self.url, path), action=method.lower(), encoding=encoding, - fields=fields + fields=fields, + description=description ) - def get_encoding(self, path, method, callback, view): + def get_description(self, path, method, view): + """ + Determine a link description. + + This will be based on the method docstring if one exists, + or else the class docstring. + """ + method_name = getattr(view, 'action', method.lower()) + method_docstring = getattr(view, method_name, None).__doc__ + if method_docstring: + # An explicit docstring on the method or action. + return formatting.dedent(smart_text(method_docstring)) + + description = view.get_view_description() + lines = [line.strip() for line in description.splitlines()] + current_section = '' + sections = {'': ''} + + for line in lines: + if header_regex.match(line): + current_section, seperator, lead = line.partition(':') + sections[current_section] = lead.strip() + else: + sections[current_section] += line + '\n' + + header = getattr(view, 'action', method.lower()) + if header in sections: + return sections[header].strip() + if header in self.coerce_method_names: + if self.coerce_method_names[header] in sections: + return sections[self.coerce_method_names[header]].strip() + return sections[''].strip() + + def get_encoding(self, path, method, view): """ Return the 'encoding' parameter to use for a given endpoint. """ @@ -230,7 +443,7 @@ class SchemaGenerator(object): return None - def get_path_fields(self, path, method, callback, view): + def get_path_fields(self, path, method, view): """ Return a list of `coreapi.Field` instances corresponding to any templated path variables. @@ -243,7 +456,7 @@ class SchemaGenerator(object): return fields - def get_serializer_fields(self, path, method, callback, view): + def get_serializer_fields(self, path, method, view): """ Return a list of `coreapi.Field` instances corresponding to any request body input, as determined by the serializer class. @@ -251,50 +464,133 @@ class SchemaGenerator(object): if method not in ('PUT', 'PATCH', 'POST'): return [] - fields = [] + if not hasattr(view, 'get_serializer'): + return [] - serializer_class = view.get_serializer_class() - serializer = serializer_class() + serializer = view.get_serializer() if isinstance(serializer, serializers.ListSerializer): - return coreapi.Field(name='data', location='body', required=True) + return [ + coreapi.Field( + name='data', + location='body', + required=True, + type='array' + ) + ] if not isinstance(serializer, serializers.Serializer): return [] + fields = [] for field in serializer.fields.values(): - if field.read_only: + if field.read_only or isinstance(field, serializers.HiddenField): continue + required = field.required and method != 'PATCH' - field = coreapi.Field(name=field.source, location='form', required=required) + description = force_text(field.help_text) if field.help_text else '' + field = coreapi.Field( + name=field.field_name, + location='form', + required=required, + description=description, + type=types_lookup[field] + ) fields.append(field) return fields - def get_pagination_fields(self, path, method, callback, view): - if method != 'GET': + def get_pagination_fields(self, path, method, view): + if not is_list_view(path, method, view): return [] - if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): - return [] - - if not hasattr(view, 'pagination_class'): + if not getattr(view, 'pagination_class', None): return [] paginator = view.pagination_class() - return as_query_fields(paginator.get_fields(view)) + return paginator.get_schema_fields(view) - def get_filter_fields(self, path, method, callback, view): - if method != 'GET': + def get_filter_fields(self, path, method, view): + if not is_list_view(path, method, view): return [] - if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): - return [] - - if not hasattr(view, 'filter_backends'): + if not getattr(view, 'filter_backends', None): return [] fields = [] for filter_backend in view.filter_backends: - fields += as_query_fields(filter_backend().get_fields(view)) + fields += filter_backend().get_schema_fields(view) return fields + + # Method for generating the link layout.... + + def get_keys(self, subpath, method, view): + """ + Return a list of keys that should be used to layout a link within + the schema document. + + /users/ ("users", "list"), ("users", "create") + /users/{pk}/ ("users", "read"), ("users", "update"), ("users", "delete") + /users/enabled/ ("users", "enabled") # custom viewset list action + /users/{pk}/star/ ("users", "star") # custom viewset detail action + /users/{pk}/groups/ ("users", "groups", "list"), ("users", "groups", "create") + /users/{pk}/groups/{pk}/ ("users", "groups", "read"), ("users", "groups", "update"), ("users", "groups", "delete") + """ + if hasattr(view, 'action'): + # Viewsets have explicitly named actions. + action = view.action + else: + # Views have no associated action, so we determine one from the method. + if is_list_view(subpath, method, view): + action = 'list' + else: + action = self.default_mapping[method.lower()] + + named_path_components = [ + component for component + in subpath.strip('/').split('/') + if '{' not in component + ] + + if is_custom_action(action): + # Custom action, eg "/users/{pk}/activate/", "/users/active/" + if len(view.action_map) > 1: + action = self.default_mapping[method.lower()] + if action in self.coerce_method_names: + action = self.coerce_method_names[action] + return named_path_components + [action] + else: + return named_path_components[:-1] + [action] + + if action in self.coerce_method_names: + action = self.coerce_method_names[action] + + # Default action, eg "/users/", "/users/{pk}/" + return named_path_components + [action] + + +def get_schema_view(title=None, url=None, renderer_classes=None): + """ + Return a schema view. + """ + generator = SchemaGenerator(title=title, url=url) + if renderer_classes is None: + if renderers.BrowsableAPIRenderer in api_settings.DEFAULT_RENDERER_CLASSES: + rclasses = [renderers.CoreJSONRenderer, renderers.BrowsableAPIRenderer] + else: + rclasses = [renderers.CoreJSONRenderer] + else: + rclasses = renderer_classes + + class SchemaView(APIView): + _ignore_model_permissions = True + exclude_from_schema = True + renderer_classes = rclasses + + def get(self, request, *args, **kwargs): + schema = generator.get_schema(request) + if schema is None: + raise exceptions.PermissionDenied() + return Response(schema) + + return SchemaView.as_view() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3fcc85c3b..1bdcd12c3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,18 +12,27 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals -import warnings +import copy +import inspect +import traceback +from collections import OrderedDict +from django.core.exceptions import ValidationError as DjangoValidationError +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models import DurationField as ModelDurationField from django.db.models.fields import Field as DjangoModelField from django.db.models.fields import FieldDoesNotExist +from django.utils import six, timezone from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import JSONField as ModelJSONField -from rest_framework.compat import postgres_fields, unicode_to_repr -from rest_framework.utils import model_meta +from rest_framework.compat import postgres_fields, set_many, unicode_to_repr +from rest_framework.exceptions import ErrorDetail, ValidationError +from rest_framework.fields import get_error_detail, set_value +from rest_framework.settings import api_settings +from rest_framework.utils import html, model_meta, representation from rest_framework.utils.field_mapping import ( ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs, get_relation_kwargs, get_url_kwargs @@ -42,9 +51,23 @@ from rest_framework.validators import ( # # This helps keep the separation between model fields, form fields, and # serializer fields more explicit. +from rest_framework.fields import ( # NOQA # isort:skip + BooleanField, CharField, ChoiceField, DateField, DateTimeField, DecimalField, + DictField, DurationField, EmailField, Field, FileField, FilePathField, FloatField, + HiddenField, IPAddressField, ImageField, IntegerField, JSONField, ListField, + ModelField, MultipleChoiceField, NullBooleanField, ReadOnlyField, RegexField, + SerializerMethodField, SlugField, TimeField, URLField, UUIDField, +) +from rest_framework.relations import ( # NOQA # isort:skip + HyperlinkedIdentityField, HyperlinkedRelatedField, ManyRelatedField, + PrimaryKeyRelatedField, RelatedField, SlugRelatedField, StringRelatedField, +) -from rest_framework.fields import * # NOQA # isort:skip -from rest_framework.relations import * # NOQA # isort:skip +# Non-field imports, but public API +from rest_framework.fields import ( # NOQA # isort:skip + CreateOnlyDefault, CurrentUserDefault, SkipField, empty +) +from rest_framework.relations import Hyperlink, PKOnlyObject # NOQA # isort:skip # We assume that 'validators' are intended for the child serializer, # rather than the parent serializer. @@ -291,32 +314,29 @@ class SerializerMetaclass(type): return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) -def get_validation_error_detail(exc): +def as_serializer_error(exc): assert isinstance(exc, (ValidationError, DjangoValidationError)) if isinstance(exc, DjangoValidationError): - # Normally you should raise `serializers.ValidationError` - # inside your codebase, but we handle Django's validation - # exception class as well for simpler compat. - # Eg. Calling Model.clean() explicitly inside Serializer.validate() - return { - api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) - } - elif isinstance(exc.detail, dict): + detail = get_error_detail(exc) + else: + detail = exc.detail + + if isinstance(detail, dict): # If errors may be a dict we use the standard {key: list of values}. # Here we ensure that all the values are *lists* of errors. return { key: value if isinstance(value, (list, dict)) else [value] - for key, value in exc.detail.items() + for key, value in detail.items() } - elif isinstance(exc.detail, list): + elif isinstance(detail, list): # Errors raised as a list are non-field errors. return { - api_settings.NON_FIELD_ERRORS_KEY: exc.detail + api_settings.NON_FIELD_ERRORS_KEY: detail } # Errors raised as a string are non-field errors. return { - api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] + api_settings.NON_FIELD_ERRORS_KEY: [detail] } @@ -410,7 +430,7 @@ class Serializer(BaseSerializer): value = self.validate(value) assert value is not None, '.validate() should return the validated data' except (ValidationError, DjangoValidationError) as exc: - raise ValidationError(detail=get_validation_error_detail(exc)) + raise ValidationError(detail=as_serializer_error(exc)) return value @@ -424,7 +444,7 @@ class Serializer(BaseSerializer): ) raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='invalid') ret = OrderedDict() errors = OrderedDict() @@ -440,7 +460,7 @@ class Serializer(BaseSerializer): except ValidationError as exc: errors[field.field_name] = exc.detail except DjangoValidationError as exc: - errors[field.field_name] = list(exc.messages) + errors[field.field_name] = get_error_detail(exc) except SkipField: pass else: @@ -510,6 +530,11 @@ class Serializer(BaseSerializer): @property def errors(self): ret = super(Serializer, self).errors + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': + # Edge case. Provide a more descriptive error than + # "this field may not be null", when no data is passed. + detail = ErrorDetail('No data provided', code='null') + ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]} return ReturnDict(ret, serializer=self) @@ -564,7 +589,7 @@ class ListSerializer(BaseSerializer): value = self.validate(value) assert value is not None, '.validate() should return the validated data' except (ValidationError, DjangoValidationError) as exc: - raise ValidationError(detail=get_validation_error_detail(exc)) + raise ValidationError(detail=as_serializer_error(exc)) return value @@ -581,13 +606,13 @@ class ListSerializer(BaseSerializer): ) raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='not_a_list') if not self.allow_empty and len(data) == 0: message = self.error_messages['empty'] raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='empty') ret = [] errors = [] @@ -703,6 +728,11 @@ class ListSerializer(BaseSerializer): @property def errors(self): ret = super(ListSerializer, self).errors + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': + # Edge case. Provide a more descriptive error than + # "this field may not be null", when no data is passed. + detail = ErrorDetail('No data provided', code='null') + ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]} if isinstance(ret, dict): return ReturnDict(ret, serializer=self) return ReturnList(ret, serializer=self) @@ -737,8 +767,8 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # profile = ProfileSerializer() assert not any( isinstance(field, BaseSerializer) and - (key in validated_data) and - isinstance(validated_data[key], (list, dict)) + (field.source in validated_data) and + isinstance(validated_data[field.source], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable nested ' @@ -870,19 +900,20 @@ class ModelSerializer(Serializer): try: instance = ModelClass.objects.create(**validated_data) - except TypeError as exc: + except TypeError: + tb = traceback.format_exc() msg = ( 'Got a `TypeError` when calling `%s.objects.create()`. ' 'This may be because you have a writable field on the ' 'serializer class that is not a valid argument to ' '`%s.objects.create()`. You may need to make the field ' 'read-only, or override the %s.create() method to handle ' - 'this correctly.\nOriginal exception text was: %s.' % + 'this correctly.\nOriginal exception was:\n %s' % ( ModelClass.__name__, ModelClass.__name__, self.__class__.__name__, - exc + tb ) ) raise TypeError(msg) @@ -890,19 +921,23 @@ class ModelSerializer(Serializer): # Save many-to-many relationships after the instance is created. if many_to_many: for field_name, value in many_to_many.items(): - setattr(instance, field_name, value) + set_many(instance, field_name, value) return instance def update(self, instance, validated_data): raise_errors_on_nested_writes('update', self, validated_data) + info = model_meta.get_field_info(instance) # Simply set each attribute on the instance, and then save it. # Note that unlike `.create()` we don't need to treat many-to-many # relationships as being a special case. During updates we already # have an instance pk for the relationships to be associated with. for attr, value in validated_data.items(): - setattr(instance, attr, value) + if attr in info.relations and info.relations[attr].to_many: + set_many(instance, attr, value) + else: + setattr(instance, attr, value) instance.save() return instance @@ -1010,16 +1045,14 @@ class ModelSerializer(Serializer): ) ) - if fields is None and exclude is None: - warnings.warn( - "Creating a ModelSerializer without either the 'fields' " - "attribute or the 'exclude' attribute is pending deprecation " - "since 3.3.0. Add an explicit fields = '__all__' to the " - "{serializer_class} serializer.".format( - serializer_class=self.__class__.__name__ - ), - PendingDeprecationWarning - ) + assert not (fields is None and exclude is None), ( + "Creating a ModelSerializer without either the 'fields' attribute " + "or the 'exclude' attribute has been deprecated since 3.3.0, " + "and is now disallowed. Add an explicit fields = '__all__' to the " + "{serializer_class} serializer.".format( + serializer_class=self.__class__.__name__ + ), + ) if fields == ALL_FIELDS: fields = None @@ -1157,7 +1190,7 @@ class ModelSerializer(Serializer): field_kwargs = get_relation_kwargs(field_name, relation_info) to_field = field_kwargs.pop('to_field', None) - if to_field and not relation_info.related_model._meta.get_field(to_field).primary_key: + if to_field and not relation_info.reverse and not relation_info.related_model._meta.get_field(to_field).primary_key: field_kwargs['slug_field'] = to_field field_class = self.serializer_related_to_field @@ -1324,9 +1357,8 @@ class ModelSerializer(Serializer): # Update `extra_kwargs` with any new options. for key, value in uniqueness_extra_kwargs.items(): if key in extra_kwargs: - extra_kwargs[key].update(value) - else: - extra_kwargs[key] = value + value.update(extra_kwargs[key]) + extra_kwargs[key] = value return extra_kwargs, hidden_fields @@ -1384,7 +1416,7 @@ class ModelSerializer(Serializer): def get_unique_together_validators(self): """ - Determine a default set of validators for any unique_together contraints. + Determine a default set of validators for any unique_together constraints. """ model_class_inheritance_tree = ( [self.Meta.model] + @@ -1396,9 +1428,8 @@ class ModelSerializer(Serializer): # cannot map to a field, and must be a traversal, so we're not # including those. field_names = { - field.source for field in self.fields.values() + field.source for field in self._writable_fields if (field.source != '*') and ('.' not in field.source) - and not field.read_only } # Note that we make sure to check `unique_together` both on the @@ -1416,7 +1447,7 @@ class ModelSerializer(Serializer): def get_unique_for_date_validators(self): """ - Determine a default set of validators for the following contraints: + Determine a default set of validators for the following constraints: * unique_for_date * unique_for_month diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 946b905c6..6d9ed2355 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -19,8 +19,6 @@ back to the defaults. """ from __future__ import unicode_literals -import warnings - from django.conf import settings from django.test.signals import setting_changed from django.utils import six @@ -113,6 +111,17 @@ DEFAULTS = { 'COMPACT_JSON': True, 'COERCE_DECIMAL_TO_STRING': True, 'UPLOADED_FILES_USE_URL': True, + + # Browseable API + 'HTML_SELECT_CUTOFF': 1000, + 'HTML_SELECT_CUTOFF_TEXT': "More than {count} items...", + + # Schemas + 'SCHEMA_COERCE_PATH_PK': True, + 'SCHEMA_COERCE_METHOD_NAMES': { + 'retrieve': 'read', + 'destroy': 'delete' + }, } @@ -218,7 +227,7 @@ class APISettings(object): SETTINGS_DOC = "http://www.django-rest-framework.org/api-guide/settings/" for setting in REMOVED_SETTINGS: if setting in user_settings: - warnings.warn("The '%s' setting has been removed. Please refer to '%s' for available settings." % (setting, SETTINGS_DOC), DeprecationWarning) + raise RuntimeError("The '%s' setting has been removed. Please refer to '%s' for available settings." % (setting, SETTINGS_DOC)) return user_settings diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 17085b49d..c2fcb303d 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -32,7 +32,6 @@ a single block in the template. position: fixed; left: 0; top: 0; - z-index: 3; } .navbar { diff --git a/rest_framework/static/rest_framework/css/bootstrap.min.css b/rest_framework/static/rest_framework/css/bootstrap.min.css index d65c66b1b..ed3905e0e 100644 --- a/rest_framework/static/rest_framework/css/bootstrap.min.css +++ b/rest_framework/static/rest_framework/css/bootstrap.min.css @@ -1,5 +1,6 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} +/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file diff --git a/rest_framework/static/rest_framework/js/bootstrap.min.js b/rest_framework/static/rest_framework/js/bootstrap.min.js index 133aeecb9..9bcd2fcca 100644 --- a/rest_framework/static/rest_framework/js/bootstrap.min.js +++ b/rest_framework/static/rest_framework/js/bootstrap.min.js @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. * Licensed under the MIT license */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/rest_framework/static/rest_framework/js/csrf.js b/rest_framework/static/rest_framework/js/csrf.js index f8ab4428c..97c8d0124 100644 --- a/rest_framework/static/rest_framework/js/csrf.js +++ b/rest_framework/static/rest_framework/js/csrf.js @@ -46,7 +46,7 @@ $.ajaxSetup({ // Send the token to same-origin, relative URLs only. // Send the token only if the method warrants CSRF protection // Using the CSRFToken value acquired earlier - xhr.setRequestHeader("X-CSRFToken", csrftoken); + xhr.setRequestHeader(window.drf.csrfHeaderName, csrftoken); } } }); diff --git a/rest_framework/status.py b/rest_framework/status.py index ed1b4784b..c016b63c6 100644 --- a/rest_framework/status.py +++ b/rest_framework/status.py @@ -3,6 +3,7 @@ Descriptive HTTP status codes, for code readability. See RFC 2616 - http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html And RFC 6585 - http://tools.ietf.org/html/rfc6585 +And RFC 4918 - https://tools.ietf.org/html/rfc4918 """ from __future__ import unicode_literals @@ -36,6 +37,7 @@ HTTP_203_NON_AUTHORITATIVE_INFORMATION = 203 HTTP_204_NO_CONTENT = 204 HTTP_205_RESET_CONTENT = 205 HTTP_206_PARTIAL_CONTENT = 206 +HTTP_207_MULTI_STATUS = 207 HTTP_300_MULTIPLE_CHOICES = 300 HTTP_301_MOVED_PERMANENTLY = 301 HTTP_302_FOUND = 302 @@ -62,6 +64,9 @@ HTTP_414_REQUEST_URI_TOO_LONG = 414 HTTP_415_UNSUPPORTED_MEDIA_TYPE = 415 HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE = 416 HTTP_417_EXPECTATION_FAILED = 417 +HTTP_422_UNPROCESSABLE_ENTITY = 422 +HTTP_423_LOCKED = 423 +HTTP_424_FAILED_DEPENDENCY = 424 HTTP_428_PRECONDITION_REQUIRED = 428 HTTP_429_TOO_MANY_REQUESTS = 429 HTTP_431_REQUEST_HEADER_FIELDS_TOO_LARGE = 431 @@ -72,4 +77,5 @@ HTTP_502_BAD_GATEWAY = 502 HTTP_503_SERVICE_UNAVAILABLE = 503 HTTP_504_GATEWAY_TIMEOUT = 504 HTTP_505_HTTP_VERSION_NOT_SUPPORTED = 505 +HTTP_507_INSUFFICIENT_STORAGE = 507 HTTP_511_NETWORK_AUTHENTICATION_REQUIRED = 511 diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html index 89af81ef7..de011cd09 100644 --- a/rest_framework/templates/rest_framework/admin.html +++ b/rest_framework/templates/rest_framework/admin.html @@ -232,6 +232,7 @@ {% block script %} diff --git a/rest_framework/templates/rest_framework/admin/dict_value.html b/rest_framework/templates/rest_framework/admin/dict_value.html index e69de29bb..3392c901b 100644 --- a/rest_framework/templates/rest_framework/admin/dict_value.html +++ b/rest_framework/templates/rest_framework/admin/dict_value.html @@ -0,0 +1,11 @@ +{% load rest_framework %} + + + {% for key, value in value.items %} + + + + + {% endfor %} + +
{{ key|format_value }}{{ value|format_value }}
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 4c1136087..5df23b767 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -150,10 +150,10 @@
-
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
-  {% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
-  {% endfor %}
-  {{ content|urlize_quoted_links }}
{% endautoescape %} +
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}{% for key, val in response_headers.items %}
+{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}{% endfor %}
+
+{{ content|urlize_quoted_links }}
{% endautoescape %}
@@ -263,6 +263,7 @@ {% block script %} diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html index f01071297..7c7e57326 100644 --- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html +++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %}