diff --git a/.eslintignore b/.eslintignore index 7db926630514..ede7dfff5cd7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ **/vendor/**/*.js django/contrib/gis/templates/**/*.js node_modules/**.js +tests/**/*.js diff --git a/.eslintrc b/.eslintrc index 190ba5f33a10..332755a844b0 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,24 +2,25 @@ "rules": { "camelcase": ["off", {"properties": "always"}], "comma-spacing": ["error", {"before": false, "after": true}], - "dot-notation": ["error", {"allowKeywords": true}], "curly": ["error", "all"], + "dot-notation": ["error", {"allowKeywords": true}], + "eqeqeq": ["error"], "indent": ["error", 4], "key-spacing": ["error", {"beforeColon": false, "afterColon": true}], + "linebreak-style": ["error", "unix"], "new-cap": ["off", {"newIsCap": true, "capIsNew": true}], "no-alert": ["off"], "no-eval": ["error"], "no-extend-native": ["error", {"exceptions": ["Date", "String"]}], "no-multi-spaces": ["error"], "no-octal-escape": ["error"], - "no-underscore-dangle": ["error"], - "no-unused-vars": ["error", {"vars": "local", "args": "none"}], "no-script-url": ["error"], "no-shadow": ["error", {"hoist": "functions"}], + "no-underscore-dangle": ["error"], + "no-unused-vars": ["error", {"vars": "local", "args": "none"}], "no-var": ["error"], - "quotes": ["off", "single"], - "linebreak-style": ["error", "unix"], "prefer-const": ["error"], + "quotes": ["off", "single"], "semi": ["error", "always"], "space-before-blocks": ["error", "always"], "space-before-function-paren": ["error", {"anonymous": "never", "named": "never"}], diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 8c900d573a91..000000000000 --- a/.hgignore +++ /dev/null @@ -1,15 +0,0 @@ -syntax:glob - -*.egg-info -*.pot -*.py[co] -__pycache__ -MANIFEST -dist/ -docs/_build/ -docs/locale/ -node_modules/ -tests/coverage_html/ -tests/.coverage -build/ -tests/report/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000000..17b55f150e3f --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,13 @@ +repos: + - repo: https://github.com/PyCQA/isort + rev: 5.6.4 + hooks: + - id: isort + - repo: https://gitlab.com/pycqa/flake8 + rev: 3.8.4 + hooks: + - id: flake8 + - repo: https://github.com/pre-commit/mirrors-eslint + rev: v7.16.0 + hooks: + - id: eslint diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 000000000000..bde8b64da0f0 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,18 @@ +# Configuration for the Read The Docs (RTD) builds of the documentation. +# Ref: https://docs.readthedocs.io/en/stable/config-file/v2.html +# The python.install.requirements pins the version of Sphinx used. +version: 2 + +build: + os: ubuntu-20.04 + tools: + python: "3.8" + +sphinx: + configuration: docs/conf.py + +python: + install: + - requirements: docs/requirements.txt + +formats: all diff --git a/AUTHORS b/AUTHORS index 9165388f58fb..6bb8782286a0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ answer newbie questions, and generally made Django that much better: Abhijeet Viswa Abhinav Patil Abhishek Gautam + Abhyudai Adam Allred Adam Bogdał Adam Donaghy @@ -41,7 +42,7 @@ answer newbie questions, and generally made Django that much better: Aleksi Häkli Alexander Dutton Alexander Myodov - Alexandr Tatarinov + Alexandr Tatarinov Alex Aktsipetrov Alex Becker Alex Couper @@ -52,6 +53,7 @@ answer newbie questions, and generally made Django that much better: Alex Robbins Alexey Boriskin Alexey Tsivunin + Ali Vakilzade Aljosa Mohorovic Amit Chakradeo Amit Ramon @@ -73,6 +75,7 @@ answer newbie questions, and generally made Django that much better: Andrew Pinkham Andrews Medina Andriy Sokolovskiy + Andy Chosak Andy Dustman Andy Gayton andy@jadedplanet.net @@ -92,6 +95,7 @@ answer newbie questions, and generally made Django that much better: Aron Podrigal Artem Gnilov Arthur + Arthur Jovart Arthur Koziel Arthur Rio Arvis Bickovskis @@ -108,6 +112,7 @@ answer newbie questions, and generally made Django that much better: Baptiste Mispelon Barry Pederson Bartolome Sanchez Salado + Barton Ip Bartosz Grabski Bashar Al-Abdulhadi Bastian Kleineidam @@ -144,6 +149,7 @@ answer newbie questions, and generally made Django that much better: Brian Beck Brian Fabian Crain Brian Harring + Brian Helba Brian Ray Brian Rosner Bruce Kroeze @@ -270,6 +276,7 @@ answer newbie questions, and generally made Django that much better: dusk@woofle.net Dustyn Gibson Ed Morley + Egidijus Macijauskas eibaan@gmail.com elky Emmanuelle Delescolle @@ -289,6 +296,7 @@ answer newbie questions, and generally made Django that much better: Erwin Junge Esdras Beleza Espen Grindhaug + Étienne Beaulé Eugene Lazutkin Evan Grim Fabrice Aneche @@ -303,6 +311,7 @@ answer newbie questions, and generally made Django that much better: Flávio Juvenal da Silva Junior flavio.curella@gmail.com Florian Apolloner + Florian Demmer Florian Moussous Fran Hrženjak Francisco Albarran Cristobal @@ -354,6 +363,7 @@ answer newbie questions, and generally made Django that much better: Hang Park Hannes Ljungberg Hannes Struß + Harm Geerts Hasan Ramezani Hawkeye Helen Sherwood-Taylor @@ -383,6 +393,7 @@ answer newbie questions, and generally made Django that much better: Ilya Semenov Ingo Klöcker I.S. van Oostveen + Iuri de Silvio ivan.chelubeev@gmail.com Ivan Sagalaev (Maniac) Jaap Roes @@ -390,6 +401,7 @@ answer newbie questions, and generally made Django that much better: Jacob Burch Jacob Green Jacob Kaplan-Moss + Jacob Walls Jakub Paczkowski Jakub Wilk Jakub Wiśniowski @@ -444,6 +456,7 @@ answer newbie questions, and generally made Django that much better: Joao Oliveira Joao Pedro Silva Joe Heck + Joe Jackson Joel Bohman Joel Heenan Joel Watts @@ -509,6 +522,7 @@ answer newbie questions, and generally made Django that much better: Kevin McConnell Kieran Holland kilian + Kim Joon Hwan 김준환 Klaas van Schelven knox konrad@gwu.edu @@ -554,6 +568,7 @@ answer newbie questions, and generally made Django that much better: Mads Jensen Makoto Tsuyuki Malcolm Tredinnick + Manav Agarwal Manuel Saelices Manuzhai Marc Aymerich Gubern @@ -613,12 +628,15 @@ answer newbie questions, and generally made Django that much better: mattycakes@gmail.com Max Burstein Max Derkachev + Max Smolens Maxime Lorant Maxime Turcotte Maximilian Merz Maximillian Dornseif mccutchen@gmail.com + Meghana Bhange Meir Kriheli + Michael S. Brown Michael Hall Michael Josephson Michael Manfre @@ -682,6 +700,7 @@ answer newbie questions, and generally made Django that much better: Nis Jørgensen Nowell Strite Nuno Mariz + Octavio Peri oggie rob oggy Oliver Beattie @@ -721,6 +740,7 @@ answer newbie questions, and generally made Django that much better: Peter Zsoldos Pete Shinners Petr Marhoun + Petter Strandmark pgross@thoughtworks.com phaedo phil.h.smith@gmail.com @@ -737,6 +757,7 @@ answer newbie questions, and generally made Django that much better: Priyansh Saxena Przemysław Buczkowski Przemysław Suliga + Qi Zhao Rachel Tobin Rachel Willmer Radek Švarz @@ -802,6 +823,7 @@ answer newbie questions, and generally made Django that much better: schwank@gmail.com Scot Hacker Scott Barr + Scott Cranfill Scott Fitsimones Scott Pashley scott@staplefish.com @@ -834,6 +856,7 @@ answer newbie questions, and generally made Django that much better: sloonz smurf@smurf.noris.de sopel + Sreehari K V Srinivas Reddy Thatiparthy Stanislas Guerra Stanislaus Madueke @@ -889,6 +912,7 @@ answer newbie questions, and generally made Django that much better: Tom Forbes Tom Insam Tom Tobin + Tom Wojcik Tomáš Ehrlich Tomáš Kopeček Tome Cvitan @@ -917,12 +941,14 @@ answer newbie questions, and generally made Django that much better: Victor Andrée viestards.lists@gmail.com Viktor Danyliuk + Viktor Grabov Ville Säävuori Vinay Karanam Vinay Sajip Vincent Foley Vinny Do Vitaly Babiy + Vitaliy Yelnik Vladimir Kuzma Vlado Vsevolod Solovyov @@ -954,6 +980,7 @@ answer newbie questions, and generally made Django that much better: Zach Liu Zach Thompson Zain Memon + Zain Patel Zak Johnson Žan Anderle Zbigniew Siciarz diff --git a/Gruntfile.js b/Gruntfile.js index 2bf8a10c81b9..2d99041cb87c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,6 @@ -var globalThreshold = 50; // Global code coverage threshold (as a percentage) +'use strict'; + +const globalThreshold = 50; // Global code coverage threshold (as a percentage) module.exports = function(grunt) { grunt.initConfig({ diff --git a/MANIFEST.in b/MANIFEST.in index 0e131eb1793e..fecbae358b81 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,6 @@ include MANIFEST.in include package.json include *.rst graft django -prune django/contrib/admin/bin graft docs graft extras graft js_tests diff --git a/README.rst b/README.rst index 4302f10ad505..640a66715ff3 100644 --- a/README.rst +++ b/README.rst @@ -29,8 +29,8 @@ ticket here: https://code.djangoproject.com/newticket To get more help: -* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang - out there. See https://freenode.net/kb/answer/chat if you're new to IRC. +* Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people + hang out there. See https://web.libera.chat if you're new to IRC. * Join the django-users mailing list, or read the archives, at https://groups.google.com/group/django-users. @@ -45,3 +45,10 @@ To run Django's test suite: * Follow the instructions in the "Unit tests" section of ``docs/internals/contributing/writing-code/unit-tests.txt``, published online at https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests + +Supporting the Development of Django +==================================== + +Django's development depends on your contributions. + +If you depend on Django, remember to support the Django Software Foundation: https://www.djangoproject.com/fundraising/ diff --git a/django/__init__.py b/django/__init__.py index 2da16633d84f..865381de75d0 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,6 +1,6 @@ from django.utils.version import get_version -VERSION = (3, 1, 0, 'alpha', 0) +VERSION = (3, 2, 24, 'final', 0) __version__ = get_version(VERSION) diff --git a/django/apps/config.py b/django/apps/config.py index 2728503d6283..bced53d506b7 100644 --- a/django/apps/config.py +++ b/django/apps/config.py @@ -1,9 +1,14 @@ +import inspect import os +import warnings from importlib import import_module from django.core.exceptions import ImproperlyConfigured -from django.utils.module_loading import module_has_submodule +from django.utils.deprecation import RemovedInDjango41Warning +from django.utils.functional import cached_property +from django.utils.module_loading import import_string, module_has_submodule +APPS_MODULE_NAME = 'apps' MODELS_MODULE_NAME = 'models' @@ -29,6 +34,10 @@ def __init__(self, app_name, app_module): # This value must be unique across a Django project. if not hasattr(self, 'label'): self.label = app_name.rpartition(".")[2] + if not self.label.isidentifier(): + raise ImproperlyConfigured( + "The app label '%s' is not a valid Python identifier." % self.label + ) # Human-readable name for the application e.g. "Admin". if not hasattr(self, 'verbose_name'): @@ -51,6 +60,15 @@ def __init__(self, app_name, app_module): def __repr__(self): return '<%s: %s>' % (self.__class__.__name__, self.label) + @cached_property + def default_auto_field(self): + from django.conf import settings + return settings.DEFAULT_AUTO_FIELD + + @property + def _is_default_auto_field_overridden(self): + return self.__class__.default_auto_field is not AppConfig.default_auto_field + def _path_from_module(self, module): """Attempt to determine app's filesystem path from its module.""" # See #21874 for extended discussion of the behavior of this method in @@ -83,73 +101,143 @@ def create(cls, entry): """ Factory that creates an app config from an entry in INSTALLED_APPS. """ - try: - # If import_module succeeds, entry is a path to an app module, - # which may specify an app config class with default_app_config. - # Otherwise, entry is a path to an app config class or an error. - module = import_module(entry) - - except ImportError: - # Track that importing as an app module failed. If importing as an - # app config class fails too, we'll trigger the ImportError again. - module = None - - mod_path, _, cls_name = entry.rpartition('.') - - # Raise the original exception when entry cannot be a path to an - # app config class. - if not mod_path: - raise + # create() eventually returns app_config_class(app_name, app_module). + app_config_class = None + app_config_name = None + app_name = None + app_module = None + # If import_module succeeds, entry points to the app module. + try: + app_module = import_module(entry) + except Exception: + pass else: + # If app_module has an apps submodule that defines a single + # AppConfig subclass, use it automatically. + # To prevent this, an AppConfig subclass can declare a class + # variable default = False. + # If the apps module defines more than one AppConfig subclass, + # the default one can declare default = True. + if module_has_submodule(app_module, APPS_MODULE_NAME): + mod_path = '%s.%s' % (entry, APPS_MODULE_NAME) + mod = import_module(mod_path) + # Check if there's exactly one AppConfig candidate, + # excluding those that explicitly define default = False. + app_configs = [ + (name, candidate) + for name, candidate in inspect.getmembers(mod, inspect.isclass) + if ( + issubclass(candidate, cls) and + candidate is not cls and + getattr(candidate, 'default', True) + ) + ] + if len(app_configs) == 1: + app_config_class = app_configs[0][1] + app_config_name = '%s.%s' % (mod_path, app_configs[0][0]) + else: + # Check if there's exactly one AppConfig subclass, + # among those that explicitly define default = True. + app_configs = [ + (name, candidate) + for name, candidate in app_configs + if getattr(candidate, 'default', False) + ] + if len(app_configs) > 1: + candidates = [repr(name) for name, _ in app_configs] + raise RuntimeError( + '%r declares more than one default AppConfig: ' + '%s.' % (mod_path, ', '.join(candidates)) + ) + elif len(app_configs) == 1: + app_config_class = app_configs[0][1] + app_config_name = '%s.%s' % (mod_path, app_configs[0][0]) + + # If app_module specifies a default_app_config, follow the link. + # default_app_config is deprecated, but still takes over the + # automatic detection for backwards compatibility during the + # deprecation period. try: - # If this works, the app module specifies an app config class. - entry = module.default_app_config + new_entry = app_module.default_app_config except AttributeError: - # Otherwise, it simply uses the default app config class. - return cls(entry, module) + # Use the default app config class if we didn't find anything. + if app_config_class is None: + app_config_class = cls + app_name = entry else: - mod_path, _, cls_name = entry.rpartition('.') - - # If we're reaching this point, we must attempt to load the app config - # class located at . - mod = import_module(mod_path) - try: - cls = getattr(mod, cls_name) - except AttributeError: - if module is None: - # If importing as an app module failed, check if the module - # contains any valid AppConfigs and show them as choices. - # Otherwise, that error probably contains the most informative - # traceback, so trigger it again. - candidates = sorted( - repr(name) for name, candidate in mod.__dict__.items() - if isinstance(candidate, type) and - issubclass(candidate, AppConfig) and - candidate is not AppConfig + message = ( + '%r defines default_app_config = %r. ' % (entry, new_entry) ) - if candidates: - raise ImproperlyConfigured( - "'%s' does not contain a class '%s'. Choices are: %s." - % (mod_path, cls_name, ', '.join(candidates)) + if new_entry == app_config_name: + message += ( + 'Django now detects this configuration automatically. ' + 'You can remove default_app_config.' ) - import_module(entry) + else: + message += ( + "However, Django's automatic detection %s. You should " + "move the default config class to the apps submodule " + "of your application and, if this module defines " + "several config classes, mark the default one with " + "default = True." % ( + "picked another configuration, %r" % app_config_name + if app_config_name + else "did not find this configuration" + ) + ) + warnings.warn(message, RemovedInDjango41Warning, stacklevel=2) + entry = new_entry + app_config_class = None + + # If import_string succeeds, entry is an app config class. + if app_config_class is None: + try: + app_config_class = import_string(entry) + except Exception: + pass + # If both import_module and import_string failed, it means that entry + # doesn't have a valid value. + if app_module is None and app_config_class is None: + # If the last component of entry starts with an uppercase letter, + # then it was likely intended to be an app config class; if not, + # an app module. Provide a nice error message in both cases. + mod_path, _, cls_name = entry.rpartition('.') + if mod_path and cls_name[0].isupper(): + # We could simply re-trigger the string import exception, but + # we're going the extra mile and providing a better error + # message for typos in INSTALLED_APPS. + # This may raise ImportError, which is the best exception + # possible if the module at mod_path cannot be imported. + mod = import_module(mod_path) + candidates = [ + repr(name) + for name, candidate in inspect.getmembers(mod, inspect.isclass) + if issubclass(candidate, cls) and candidate is not cls + ] + msg = "Module '%s' does not contain a '%s' class." % (mod_path, cls_name) + if candidates: + msg += ' Choices are: %s.' % ', '.join(candidates) + raise ImportError(msg) else: - raise + # Re-trigger the module import exception. + import_module(entry) # Check for obvious errors. (This check prevents duck typing, but # it could be removed if it became a problem in practice.) - if not issubclass(cls, AppConfig): + if not issubclass(app_config_class, AppConfig): raise ImproperlyConfigured( "'%s' isn't a subclass of AppConfig." % entry) # Obtain app name here rather than in AppClass.__init__ to keep # all error checking for entries in INSTALLED_APPS in one place. - try: - app_name = cls.name - except AttributeError: - raise ImproperlyConfigured( - "'%s' must supply a name attribute." % entry) + if app_name is None: + try: + app_name = app_config_class.name + except AttributeError: + raise ImproperlyConfigured( + "'%s' must supply a name attribute." % entry + ) # Ensure app_name points to a valid module. try: @@ -157,12 +245,14 @@ def create(cls, entry): except ImportError: raise ImproperlyConfigured( "Cannot import '%s'. Check that '%s.%s.name' is correct." % ( - app_name, mod_path, cls_name, + app_name, + app_config_class.__module__, + app_config_class.__qualname__, ) ) # Entry is a path to an app config class. - return cls(app_name, app_module) + return app_config_class(app_name, app_module) def get_model(self, model_name, require_ready=True): """ diff --git a/django/apps/registry.py b/django/apps/registry.py index 408964a146b1..62650ca4bc53 100644 --- a/django/apps/registry.py +++ b/django/apps/registry.py @@ -128,6 +128,7 @@ def check_apps_ready(self): """Raise an exception if all apps haven't been imported yet.""" if not self.apps_ready: from django.conf import settings + # If "not ready" is due to unconfigured settings, accessing # INSTALLED_APPS raises a more helpful ImproperlyConfigured # exception. diff --git a/django/conf/__init__.py b/django/conf/__init__.py index ec7efadf46b1..28302440c7c7 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -15,8 +15,7 @@ import django from django.conf import global_settings -from django.core.exceptions import ImproperlyConfigured, ValidationError -from django.core.validators import URLValidator +from django.core.exceptions import ImproperlyConfigured from django.utils.deprecation import RemovedInDjango40Warning from django.utils.functional import LazyObject, empty @@ -27,6 +26,12 @@ 'PASSWORD_RESET_TIMEOUT instead.' ) +DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG = ( + 'The DEFAULT_HASHING_ALGORITHM transitional setting is deprecated. ' + 'Support for it and tokens, cookies, sessions, and signatures that use ' + 'SHA-1 hashing algorithm will be removed in Django 4.0.' +) + class SettingsReference(str): """ @@ -76,6 +81,14 @@ def __getattr__(self, name): if self._wrapped is empty: self._setup(name) val = getattr(self._wrapped, name) + + # Special case some settings which require further modification. + # This is done here for performance reasons so the modified value is cached. + if name in {'MEDIA_URL', 'STATIC_URL'} and val is not None: + val = self._add_script_prefix(val) + elif name == 'SECRET_KEY' and not val: + raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.") + self.__dict__[name] = val return val @@ -118,14 +131,8 @@ def _add_script_prefix(value): Useful when the app is being served at a subpath and manually prefixing subpath to STATIC_URL and MEDIA_URL in settings is inconvenient. """ - # Don't apply prefix to valid URLs. - try: - URLValidator()(value) - return value - except (ValidationError, AttributeError): - pass - # Don't apply prefix to absolute paths. - if value.startswith('/'): + # Don't apply prefix to absolute paths and URLs. + if value.startswith(('http://', 'https://', '/')): return value from django.urls import get_script_prefix return '%s%s' % (get_script_prefix(), value) @@ -149,14 +156,6 @@ def PASSWORD_RESET_TIMEOUT_DAYS(self): ) return self.__getattr__('PASSWORD_RESET_TIMEOUT_DAYS') - @property - def STATIC_URL(self): - return self._add_script_prefix(self.__getattr__('STATIC_URL')) - - @property - def MEDIA_URL(self): - return self._add_script_prefix(self.__getattr__('MEDIA_URL')) - class Settings: def __init__(self, settings_module): @@ -186,9 +185,6 @@ def __init__(self, settings_module): setattr(self, setting, setting_value) self._explicit_settings.add(setting) - if not self.SECRET_KEY: - raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.") - if self.is_overridden('PASSWORD_RESET_TIMEOUT_DAYS'): if self.is_overridden('PASSWORD_RESET_TIMEOUT'): raise ImproperlyConfigured( @@ -198,6 +194,9 @@ def __init__(self, settings_module): setattr(self, 'PASSWORD_RESET_TIMEOUT', self.PASSWORD_RESET_TIMEOUT_DAYS * 60 * 60 * 24) warnings.warn(PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG, RemovedInDjango40Warning) + if self.is_overridden('DEFAULT_HASHING_ALGORITHM'): + warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning) + if hasattr(time, 'tzset') and self.TIME_ZONE: # When we can, attempt to validate the timezone. If we can't find # this file, no check happens and it's harmless. @@ -244,6 +243,8 @@ def __setattr__(self, name, value): if name == 'PASSWORD_RESET_TIMEOUT_DAYS': setattr(self, 'PASSWORD_RESET_TIMEOUT', value * 60 * 60 * 24) warnings.warn(PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG, RemovedInDjango40Warning) + if name == 'DEFAULT_HASHING_ALGORITHM': + warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning) super().__setattr__(name, value) def __delattr__(self, name): diff --git a/django/conf/app_template/apps.py-tpl b/django/conf/app_template/apps.py-tpl index 9b2ce5289c52..b70535218120 100644 --- a/django/conf/app_template/apps.py-tpl +++ b/django/conf/app_template/apps.py-tpl @@ -2,4 +2,5 @@ from django.apps import AppConfig class {{ camel_case_app_name }}Config(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' name = '{{ app_name }}' diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 214359c56bee..4a27887a8f04 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -93,6 +93,7 @@ def gettext_noop(s): ('hy', gettext_noop('Armenian')), ('ia', gettext_noop('Interlingua')), ('id', gettext_noop('Indonesian')), + ('ig', gettext_noop('Igbo')), ('io', gettext_noop('Ido')), ('is', gettext_noop('Icelandic')), ('it', gettext_noop('Italian')), @@ -103,6 +104,7 @@ def gettext_noop(s): ('km', gettext_noop('Khmer')), ('kn', gettext_noop('Kannada')), ('ko', gettext_noop('Korean')), + ('ky', gettext_noop('Kyrgyz')), ('lb', gettext_noop('Luxembourgish')), ('lt', gettext_noop('Lithuanian')), ('lv', gettext_noop('Latvian')), @@ -131,7 +133,9 @@ def gettext_noop(s): ('sw', gettext_noop('Swahili')), ('ta', gettext_noop('Tamil')), ('te', gettext_noop('Telugu')), + ('tg', gettext_noop('Tajik')), ('th', gettext_noop('Thai')), + ('tk', gettext_noop('Turkmen')), ('tr', gettext_noop('Turkish')), ('tt', gettext_noop('Tatar')), ('udm', gettext_noop('Udmurt')), @@ -299,6 +303,10 @@ def gettext_noop(s): # SuspiciousOperation (TooManyFieldsSent) is raised. DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000 +# Maximum number of files encoded in a multipart upload that will be read +# before a SuspiciousOperation (TooManyFilesSent) is raised. +DATA_UPLOAD_MAX_NUMBER_FILES = 100 + # Directory in which upload streamed files will be temporarily saved. A value of # `None` will make Django use the operating system's default temporary directory # (i.e. "/tmp" on *nix systems). @@ -410,6 +418,9 @@ def gettext_noop(s): DEFAULT_TABLESPACE = '' DEFAULT_INDEX_TABLESPACE = '' +# Default primary key field type. +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # Default X-Frame-Options header value X_FRAME_OPTIONS = 'DENY' @@ -432,6 +443,12 @@ def gettext_noop(s): # you may be opening yourself up to a security risk. SECURE_PROXY_SSL_HEADER = None +# Default hashing algorithm to use for encoding cookies, password reset tokens +# in the admin site, user sessions, and signatures. It's a transitional setting +# helpful in migrating multiple instance of the same project to Django 3.1+. +# Algorithm must be 'sha1' or 'sha256'. +DEFAULT_HASHING_ALGORITHM = 'sha256' + ############## # MIDDLEWARE # ############## @@ -460,7 +477,7 @@ def gettext_noop(s): # Whether to use the HttpOnly flag. SESSION_COOKIE_HTTPONLY = True # Whether to set the flag restricting cookie leaks on cross-site requests. -# This can be 'Lax', 'Strict', or None to disable the flag. +# This can be 'Lax', 'Strict', 'None', or False to disable the flag. SESSION_COOKIE_SAMESITE = 'Lax' # Whether to save the session data on every request. SESSION_SAVE_EVERY_REQUEST = False diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index 256ae0167170..6285f20aa0e4 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -278,6 +278,12 @@ 'name': 'Indonesian', 'name_local': 'Bahasa Indonesia', }, + 'ig': { + 'bidi': False, + 'code': 'ig', + 'name': 'Igbo', + 'name_local': 'Asụsụ Ìgbò', + }, 'is': { 'bidi': False, 'code': 'is', @@ -332,6 +338,12 @@ 'name': 'Korean', 'name_local': '한국어', }, + 'ky': { + 'bidi': False, + 'code': 'ky', + 'name': 'Kyrgyz', + 'name_local': 'Кыргызча', + }, 'lb': { 'bidi': False, 'code': 'lb', @@ -360,7 +372,7 @@ 'bidi': False, 'code': 'ml', 'name': 'Malayalam', - 'name_local': 'Malayalam', + 'name_local': 'മലയാളം', }, 'mn': { 'bidi': False, @@ -506,12 +518,24 @@ 'name': 'Telugu', 'name_local': 'తెలుగు', }, + 'tg': { + 'bidi': False, + 'code': 'tg', + 'name': 'Tajik', + 'name_local': 'тоҷикӣ', + }, 'th': { 'bidi': False, 'code': 'th', 'name': 'Thai', 'name_local': 'ภาษาไทย', }, + 'tk': { + 'bidi': False, + 'code': 'tk', + 'name': 'Turkmen', + 'name_local': 'Türkmençe', + }, 'tr': { 'bidi': False, 'code': 'tr', diff --git a/django/conf/locale/af/LC_MESSAGES/django.mo b/django/conf/locale/af/LC_MESSAGES/django.mo index 5d1db671e790..5da174838835 100644 Binary files a/django/conf/locale/af/LC_MESSAGES/django.mo and b/django/conf/locale/af/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/af/LC_MESSAGES/django.po b/django/conf/locale/af/LC_MESSAGES/django.po index 8a9c0ef54860..f7084ad4dc00 100644 --- a/django/conf/locale/af/LC_MESSAGES/django.po +++ b/django/conf/locale/af/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# F Wolff , 2019 +# F Wolff , 2019-2020 # Stephen Cox , 2011-2012 # unklphil , 2014,2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-20 19:37+0000\n" +"Last-Translator: F Wolff \n" "Language-Team: Afrikaans (http://www.transifex.com/django/django/language/" "af/)\n" "MIME-Version: 1.0\n" @@ -25,6 +25,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabies" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Asturies" @@ -148,6 +151,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesies" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -178,6 +184,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreaans" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luxemburgs" @@ -262,9 +271,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Teloegoe" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Thai" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turks" @@ -281,7 +296,7 @@ msgid "Urdu" msgstr "Oerdoe" msgid "Uzbek" -msgstr "" +msgstr "Oesbekies " msgid "Vietnamese" msgstr "Viëtnamees" @@ -505,7 +520,7 @@ msgstr "Datum (met die tyd)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "“%(value)s”-waarde moet ’n desimale getal wees." msgid "Decimal number" msgstr "Desimale getal" @@ -534,7 +549,7 @@ msgstr "Dryfpuntgetal" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "“%(value)s”-waarde moet ’n heelgetal wees." msgid "Integer" msgstr "Heelgetal" @@ -550,11 +565,14 @@ msgstr "IP-adres" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "“%(value)s”-waarde moet een wees uit None, True of False." msgid "Boolean (Either True, False or None)" msgstr "Boole (True, False, of None)" +msgid "Positive big integer" +msgstr "Positiewe groot heelgetal" + msgid "Positive integer" msgstr "Positiewe heelgetal" @@ -576,6 +594,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"“%(value)s”-waarde het ’n ongeldige formaat. Dit moet geformateer word as HH:" +"MM[:ss[.uuuuuu]]." #, python-format msgid "" @@ -594,7 +614,7 @@ msgstr "Rou binêre data" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "“%(value)s” is nie ’n geldige UUID nie." msgid "Universally unique identifier" msgstr "Universeel unieke identifiseerder" @@ -605,6 +625,12 @@ msgstr "Lêer" msgid "Image" msgstr "Prent" +msgid "A JSON object" +msgstr "’n JSON-objek" + +msgid "Value must be valid JSON." +msgstr "Waarde moet geldige JSON wees." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s-objek met %(field)s %(value)r bestaan nie." @@ -699,6 +725,9 @@ msgstr "Tik ’n volledige waarde in." msgid "Enter a valid UUID." msgstr "Tik ’n geldig UUID in." +msgid "Enter a valid JSON." +msgstr "Gee geldige JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -757,7 +786,7 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s” is nie ’n geldige waarde nie." #, python-format msgid "" @@ -783,15 +812,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ja,nee,miskien" @@ -1100,9 +1121,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minute" -msgid "0 minutes" -msgstr "0 minute" - msgid "Forbidden" msgstr "Verbode" @@ -1176,7 +1194,7 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "Ongeldige datumstring “%(datestr)s” gegewe die formaat “%(format)s”" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1198,7 +1216,7 @@ msgstr "Gidsindekse word nie hier toegelaat nie." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” bestaan nie." #, python-format msgid "Index of %(directory)s" diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo index 305512b25b09..d65a93a968b8 100644 Binary files a/django/conf/locale/ar/LC_MESSAGES/django.mo and b/django/conf/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po index a7c6bbada06a..ccda01832ca7 100644 --- a/django/conf/locale/ar/LC_MESSAGES/django.po +++ b/django/conf/locale/ar/LC_MESSAGES/django.po @@ -1,18 +1,22 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bashar Al-Abdulhadi, 2015-2016 +# Bashar Al-Abdulhadi, 2015-2016,2020 # Bashar Al-Abdulhadi, 2014 # Eyad Toma , 2013-2014 # Jannis Leidel , 2011 +# Muaaz Alsaied, 2020 +# Omar Al-Ithawi , 2020 # Ossama Khayat , 2011 +# Tony xD , 2020 +# صفا الفليج , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-15 00:40+0000\n" +"Last-Translator: Bashar Al-Abdulhadi\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,6 +31,9 @@ msgstr "الإفريقية" msgid "Arabic" msgstr "العربيّة" +msgid "Algerian Arabic" +msgstr "عربي جزائري" + msgid "Asturian" msgstr "الأسترية" @@ -142,7 +149,7 @@ msgid "Hungarian" msgstr "الهنغاريّة" msgid "Armenian" -msgstr "" +msgstr "الأرمنية" msgid "Interlingua" msgstr "اللغة الوسيطة" @@ -150,6 +157,9 @@ msgstr "اللغة الوسيطة" msgid "Indonesian" msgstr "الإندونيسيّة" +msgid "Igbo" +msgstr "الإيبو" + msgid "Ido" msgstr "ايدو" @@ -166,7 +176,7 @@ msgid "Georgian" msgstr "الجورجيّة" msgid "Kabyle" -msgstr "" +msgstr "القبائل" msgid "Kazakh" msgstr "الكازاخستانية" @@ -180,6 +190,9 @@ msgstr "الهنديّة (كنّادا)" msgid "Korean" msgstr "الكوريّة" +msgid "Kyrgyz" +msgstr "قيرغيز" + msgid "Luxembourgish" msgstr "اللوكسمبرجية" @@ -264,9 +277,15 @@ msgstr "التاميل" msgid "Telugu" msgstr "التيلوغو" +msgid "Tajik" +msgstr "طاجيك" + msgid "Thai" msgstr "التايلنديّة" +msgid "Turkmen" +msgstr "تركمان" + msgid "Turkish" msgstr "التركيّة" @@ -283,7 +302,7 @@ msgid "Urdu" msgstr "الأوردو" msgid "Uzbek" -msgstr "" +msgstr "الأوزبكي" msgid "Vietnamese" msgstr "الفيتناميّة" @@ -307,47 +326,49 @@ msgid "Syndication" msgstr "توظيف النشر" msgid "That page number is not an integer" -msgstr "" +msgstr "رقم الصفحة هذا ليس عدداً طبيعياً" msgid "That page number is less than 1" -msgstr "" +msgstr "رقم الصفحة أقل من 1" msgid "That page contains no results" -msgstr "" +msgstr "هذه الصفحة لا تحتوي على نتائج" msgid "Enter a valid value." -msgstr "أدخل قيمة صحيحة." +msgstr "أدخِل قيمة صحيحة." msgid "Enter a valid URL." -msgstr "أدخل رابطاً صحيحاً." +msgstr "أدخِل رابطًا صحيحًا." msgid "Enter a valid integer." -msgstr "أدخل رقم صالح." +msgstr "أدخِل عدداً طبيعياً." msgid "Enter a valid email address." -msgstr "أدخل عنوان بريد إلكتروني صحيح." +msgstr "أدخِل عنوان بريد إلكتروني صحيح." #. Translators: "letters" means latin letters: a-z and A-Z. msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." -msgstr "" +msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"أدخل اختصار 'slug' صحيح يتكون من أحرف Unicode أو أرقام أو شرطات سفلية أو " +"واصلات." msgid "Enter a valid IPv4 address." -msgstr "أدخل عنوان IPv4 صحيح." +msgstr "أدخِل عنوان IPv4 صحيح." msgid "Enter a valid IPv6 address." -msgstr "أدخل عنوان IPv6 صحيح." +msgstr "أدخِل عنوان IPv6 صحيح." msgid "Enter a valid IPv4 or IPv6 address." -msgstr "أدخل عنوان IPv4 أو عنوان IPv6 صحيح." +msgstr "أدخِل عنوان IPv4 أو عنوان IPv6 صحيح." msgid "Enter only digits separated by commas." -msgstr "أدخل أرقاما فقط مفصول بينها بفواصل." +msgstr "أدخِل فقط أرقامًا تفصلها الفواصل." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." @@ -453,9 +474,11 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"امتداد الملف “%(extension)s” غير مسموح به. الامتدادات المسموح بها هي:" +"%(allowed_extensions)s." msgid "Null characters are not allowed." -msgstr "" +msgstr "الأحرف الخالية غير مسموح بها." msgid "and" msgstr "و" @@ -492,11 +515,11 @@ msgstr "حقل نوع: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "قيمة '%(value)s' يجب أن تكون True أو False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "قيمة “%(value)s” يجب أن تكون True , False أو None." msgid "Boolean (Either True or False)" msgstr "ثنائي (إما True أو False)" @@ -513,12 +536,14 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"قيمة '%(value)s' ليست من بُنية تاريخ صحيحة. القيمة يجب ان تكون من البُنية YYYY-" +"MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" +msgstr "قيمة '%(value)s' من بُنية صحيحة (YYYY-MM-DD) لكنها تحوي تاريخ غير صحيح." msgid "Date (without time)" msgstr "التاريخ (دون الوقت)" @@ -528,19 +553,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"قيمة '%(value)s' ليست من بُنية صحيحة. القيمة يجب ان تكون من البُنية YYYY-MM-DD " +"HH:MM[:ss[.uuuuuu]][TZ] ." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"قيمة '%(value)s' من بُنية صحيحة (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) لكنها " +"تحوي وقت و تاريخ غير صحيحين." msgid "Date (with time)" msgstr "التاريخ (مع الوقت)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "قيمة '%(value)s' يجب ان تكون عدد عشري." msgid "Decimal number" msgstr "رقم عشري" @@ -550,6 +579,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"قيمة '%(value)s' ليست بنسق صحيح. القيمة يجب ان تكون من التنسيق ([DD] " +"[[HH:]MM:]ss[.uuuuuu])" msgid "Duration" msgstr "المدّة" @@ -562,14 +593,14 @@ msgstr "مسار الملف" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "قيمة '%(value)s' يجب ان تكون عدد تعويم." msgid "Floating point number" msgstr "رقم فاصلة عائمة" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "قيمة '%(value)s' يجب ان تكون عدد طبيعي." msgid "Integer" msgstr "عدد صحيح" @@ -585,11 +616,14 @@ msgstr "عنوان IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "قيمة '%(value)s' يجب ان تكون None أو True أو False." msgid "Boolean (Either True, False or None)" msgstr "ثنائي (إما True أو False أو None)" +msgid "Positive big integer" +msgstr "عدد صحيح موجب كبير" + msgid "Positive integer" msgstr "عدد صحيح موجب" @@ -611,12 +645,15 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"قيمة '%(value)s' ليست بنسق صحيح. القيمة يجب ان تكون من التنسيق\n" +"HH:MM[:ss[.uuuuuu]]" #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"قيمة '%(value)s' من بُنية صحيحة (HH:MM[:ss[.uuuuuu]]) لكنها تحوي وقت غير صحيح." msgid "Time" msgstr "وقت" @@ -629,10 +666,10 @@ msgstr "البيانات الثنائية الخام" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "القيمة \"%(value)s\" ليست UUID صالح." msgid "Universally unique identifier" -msgstr "" +msgstr "معرّف فريد عالمياً" msgid "File" msgstr "ملف" @@ -640,6 +677,12 @@ msgstr "ملف" msgid "Image" msgstr "صورة" +msgid "A JSON object" +msgstr "كائن JSON" + +msgid "Value must be valid JSON." +msgstr "يجب أن تكون قيمة JSON صالحة." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "النموذج %(model)s ذو الحقل و القيمة %(field)s %(value)r غير موجود." @@ -687,7 +730,7 @@ msgstr "أدخل مدّة صحيحة" #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." -msgstr "" +msgstr "يجب أن يكون عدد الأيام بين {min_days} و {max_days}." msgid "No file was submitted. Check the encoding type on the form." msgstr "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة." @@ -744,6 +787,9 @@ msgstr "إدخال قيمة كاملة." msgid "Enter a valid UUID." msgstr "أدخل قيمة UUID صحيحة." +msgid "Enter a valid JSON." +msgstr "أدخل مدخل JSON صالح." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -801,20 +847,22 @@ msgid "Please correct the duplicate values below." msgstr "رجاءً صحّح القيم المُكرّرة أدناه." msgid "The inline value did not match the parent instance." -msgstr "" +msgstr "لا تتطابق القيمة المضمنة مع المثيل الأصلي." msgid "Select a valid choice. That choice is not one of the available choices." msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة." #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" ليست قيمة صالحة." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد " +"تكون غامضة أو أنها غير موجودة." msgid "Clear" msgstr "تفريغ" @@ -834,15 +882,7 @@ msgstr "نعم" msgid "No" msgstr "لا" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "نعم,لا,ربما" @@ -1110,7 +1150,7 @@ msgstr "هذا ليس عنوان IPv6 صحيح." #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" -msgstr "" +msgstr "%(truncated_text)s..." msgid "or" msgstr "أو" @@ -1179,9 +1219,6 @@ msgstr[3] "%d دقائق" msgstr[4] "%d دقيقة" msgstr[5] "%d دقيقة" -msgid "0 minutes" -msgstr "0 دقيقة" - msgid "Forbidden" msgstr "ممنوع" @@ -1194,12 +1231,17 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"تظهر لك هذه الرسالة لأن موقع HTTPS يتطلب \"رأس مرجعي\" ليتم إرساله بواسطة " +"مستعرض الويب الخاص بك ، ولكن لم يتم إرسال أي منها. هذا العنوان مطلوب لأسباب " +"أمنية ، للتأكد من أن متصفحك لا يتم اختراقه من قبل أطراف ثالثة." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"إذا قمت بتكوين المستعرض لتعطيل رؤوس “Referer” ، فيرجى إعادة تمكينها ، على " +"الأقل لهذا الموقع ، أو لاتصالات HTTPS ، أو لطلبات “same-origin”." msgid "" "If you are using the tag or " @@ -1208,6 +1250,10 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"إذا كنت تستخدم العلامة أو " +"تضمين رأس “Referrer-Policy: no-referrer”، يرجى إزالتها. تتطلب حماية CSRF أن " +"يقوم رأس “Referer” بإجراء فحص صارم للمراجع. إذا كنت قلقًا بشأن الخصوصية ، " +"فاستخدم بدائل مثل للروابط إلى مواقع الجهات الخارجية." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1222,6 +1268,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"إذا قمت بضبط المتصفح لتعطيل الكوكيز الرجاء إعادة تغعيلها، على الأقل بالنسبة " +"لهذا الموقع، أو للطلبات من “same-origin”." msgid "More information is available with DEBUG=True." msgstr "يتوفر مزيد من المعلومات عند ضبط الخيار DEBUG=True." @@ -1230,7 +1278,7 @@ msgid "No year specified" msgstr "لم تحدد السنة" msgid "Date out of range" -msgstr "" +msgstr "التاريخ خارج النطاق" msgid "No month specified" msgstr "لم تحدد الشهر" @@ -1255,14 +1303,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "نسق تاريخ غير صحيح \"%(datestr)s\" محدد بالشكل ''%(format)s\"" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "الصفحة ليست \"الأخيرة\"، كما لا يمكن تحويل القيمة إلى رقم طبيعي." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1271,29 +1319,34 @@ msgstr "صفحة خاطئة (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." msgstr "" +"قائمة فارغة و\n" +"\"%(class_name)s.allow_empty\"\n" +"قيمته False." msgid "Directory indexes are not allowed here." msgstr "لا يسمح لفهارس الدليل هنا." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "”%(path)s“ غير موجود" #, python-format msgid "Index of %(directory)s" msgstr "فهرس لـ %(directory)s" msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" +msgstr "جانغو: إطار الويب للمهتمين بالكمال و لديهم مواعيد تسليم نهائية." #, python-format msgid "" "View release notes for Django %(version)s" msgstr "" +"استعراض ملاحظات الإصدار لجانغو %(version)s" msgid "The install worked successfully! Congratulations!" -msgstr "" +msgstr "تمت عملية التنصيب بنجاح! تهانينا!" #, python-format msgid "" @@ -1302,21 +1355,24 @@ msgid "" "\">DEBUG=True is in your settings file and you have not configured any " "URLs." msgstr "" +"تظهر لك هذه الصفحة لأن DEBUG=True في ملف settings خاصتك كما أنك لم تقم بإعداد الروابط URLs." msgid "Django Documentation" -msgstr "" +msgstr "وثائق تعليمات جانغو" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "المواضيع و المراجع و التعليمات" msgid "Tutorial: A Polling App" -msgstr "" +msgstr "برنامج تعليمي: تطبيق تصويت" msgid "Get started with Django" -msgstr "" +msgstr "إبدأ مع جانغو" msgid "Django Community" -msgstr "" +msgstr "مجتمع جانغو" msgid "Connect, get help, or contribute" -msgstr "" +msgstr "اتصل بنا أو احصل على مساعدة أو ساهم" diff --git a/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo b/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..1fce7bcdd629 Binary files /dev/null and b/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ar_DZ/LC_MESSAGES/django.po b/django/conf/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..373dea116a87 --- /dev/null +++ b/django/conf/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,1379 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019-2020 +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "Afrikaans" +msgstr "الإفريقية" + +msgid "Arabic" +msgstr "العربية" + +msgid "Algerian Arabic" +msgstr "العربية الجزائرية" + +msgid "Asturian" +msgstr "الأسترية" + +msgid "Azerbaijani" +msgstr "الأذربيجانية" + +msgid "Bulgarian" +msgstr "البلغارية" + +msgid "Belarusian" +msgstr "البيلاروسية" + +msgid "Bengali" +msgstr "البنغالية" + +msgid "Breton" +msgstr "البريتونية" + +msgid "Bosnian" +msgstr "البوسنية" + +msgid "Catalan" +msgstr "الكتلانية" + +msgid "Czech" +msgstr "التشيكية" + +msgid "Welsh" +msgstr "الويلز" + +msgid "Danish" +msgstr "الدنماركية" + +msgid "German" +msgstr "الألمانية" + +msgid "Lower Sorbian" +msgstr "الصربية السفلى" + +msgid "Greek" +msgstr "اليونانية" + +msgid "English" +msgstr "الإنجليزية" + +msgid "Australian English" +msgstr "الإنجليزية الإسترالية" + +msgid "British English" +msgstr "الإنجليزية البريطانية" + +msgid "Esperanto" +msgstr "الاسبرانتو" + +msgid "Spanish" +msgstr "الإسبانية" + +msgid "Argentinian Spanish" +msgstr "الأسبانية الأرجنتينية" + +msgid "Colombian Spanish" +msgstr "الكولومبية الإسبانية" + +msgid "Mexican Spanish" +msgstr "الأسبانية المكسيكية" + +msgid "Nicaraguan Spanish" +msgstr "الإسبانية النيكاراغوية" + +msgid "Venezuelan Spanish" +msgstr "الإسبانية الفنزويلية" + +msgid "Estonian" +msgstr "الإستونية" + +msgid "Basque" +msgstr "الباسك" + +msgid "Persian" +msgstr "الفارسية" + +msgid "Finnish" +msgstr "الفنلندية" + +msgid "French" +msgstr "الفرنسية" + +msgid "Frisian" +msgstr "الفريزية" + +msgid "Irish" +msgstr "الإيرلندية" + +msgid "Scottish Gaelic" +msgstr "الغيلية الأسكتلندية" + +msgid "Galician" +msgstr "الجليقية" + +msgid "Hebrew" +msgstr "العبرية" + +msgid "Hindi" +msgstr "الهندية" + +msgid "Croatian" +msgstr "الكرواتية" + +msgid "Upper Sorbian" +msgstr "الصربية العليا" + +msgid "Hungarian" +msgstr "الهنغارية" + +msgid "Armenian" +msgstr "الأرمنية" + +msgid "Interlingua" +msgstr "اللغة الوسيطة" + +msgid "Indonesian" +msgstr "الإندونيسية" + +msgid "Igbo" +msgstr "" + +msgid "Ido" +msgstr "ايدو" + +msgid "Icelandic" +msgstr "الآيسلندية" + +msgid "Italian" +msgstr "الإيطالية" + +msgid "Japanese" +msgstr "اليابانية" + +msgid "Georgian" +msgstr "الجورجية" + +msgid "Kabyle" +msgstr "القبائلية" + +msgid "Kazakh" +msgstr "الكازاخستانية" + +msgid "Khmer" +msgstr "الخمر" + +msgid "Kannada" +msgstr "الهندية (كنّادا)" + +msgid "Korean" +msgstr "الكورية" + +msgid "Kyrgyz" +msgstr "القيرغيزية" + +msgid "Luxembourgish" +msgstr "اللوكسمبرجية" + +msgid "Lithuanian" +msgstr "اللتوانية" + +msgid "Latvian" +msgstr "اللاتفية" + +msgid "Macedonian" +msgstr "المقدونية" + +msgid "Malayalam" +msgstr "المايالام" + +msgid "Mongolian" +msgstr "المنغولية" + +msgid "Marathi" +msgstr "المهاراتية" + +msgid "Burmese" +msgstr "البورمية" + +msgid "Norwegian Bokmål" +msgstr "النرويجية" + +msgid "Nepali" +msgstr "النيبالية" + +msgid "Dutch" +msgstr "الهولندية" + +msgid "Norwegian Nynorsk" +msgstr "النينورسك نرويجية" + +msgid "Ossetic" +msgstr "الأوسيتيكية" + +msgid "Punjabi" +msgstr "البنجابية" + +msgid "Polish" +msgstr "البولندية" + +msgid "Portuguese" +msgstr "البرتغالية" + +msgid "Brazilian Portuguese" +msgstr "البرتغالية البرازيلية" + +msgid "Romanian" +msgstr "الرومانية" + +msgid "Russian" +msgstr "الروسية" + +msgid "Slovak" +msgstr "السلوفاكية" + +msgid "Slovenian" +msgstr "السلوفانية" + +msgid "Albanian" +msgstr "الألبانية" + +msgid "Serbian" +msgstr "الصربية" + +msgid "Serbian Latin" +msgstr "اللاتينية الصربية" + +msgid "Swedish" +msgstr "السويدية" + +msgid "Swahili" +msgstr "السواحلية" + +msgid "Tamil" +msgstr "التاميل" + +msgid "Telugu" +msgstr "التيلوغو" + +msgid "Tajik" +msgstr "الطاجيكية" + +msgid "Thai" +msgstr "التايلندية" + +msgid "Turkmen" +msgstr "" + +msgid "Turkish" +msgstr "التركية" + +msgid "Tatar" +msgstr "التتاريية" + +msgid "Udmurt" +msgstr "الأدمرتية" + +msgid "Ukrainian" +msgstr "الأكرانية" + +msgid "Urdu" +msgstr "الأوردو" + +msgid "Uzbek" +msgstr "الأوزبكية" + +msgid "Vietnamese" +msgstr "الفيتنامية" + +msgid "Simplified Chinese" +msgstr "الصينية المبسطة" + +msgid "Traditional Chinese" +msgstr "الصينية التقليدية" + +msgid "Messages" +msgstr "الرسائل" + +msgid "Site Maps" +msgstr "خرائط الموقع" + +msgid "Static Files" +msgstr "الملفات الثابتة" + +msgid "Syndication" +msgstr "توظيف النشر" + +msgid "That page number is not an integer" +msgstr "رقم الصفحة ليس عددًا صحيحًا" + +msgid "That page number is less than 1" +msgstr "رقم الصفحة أقل من 1" + +msgid "That page contains no results" +msgstr "هذه الصفحة لا تحتوي على نتائج" + +msgid "Enter a valid value." +msgstr "أدخل قيمة صحيحة." + +msgid "Enter a valid URL." +msgstr "أدخل رابطاً صحيحاً." + +msgid "Enter a valid integer." +msgstr "أدخل رقم صالح." + +msgid "Enter a valid email address." +msgstr "أدخل عنوان بريد إلكتروني صحيح." + +#. Translators: "letters" means latin letters: a-z and A-Z. +msgid "" +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." +msgstr "" +"أدخل “slug” صالحة تتكون من أحرف أو أرقام أو الشرطة السفلية أو الواصلات." + +msgid "" +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " +"hyphens." +msgstr "" +"أدخل “slug” صالحة تتكون من أحرف Unicode أو الأرقام أو الشرطة السفلية أو " +"الواصلات." + +msgid "Enter a valid IPv4 address." +msgstr "أدخل عنوان IPv4 صحيح." + +msgid "Enter a valid IPv6 address." +msgstr "أدخل عنوان IPv6 صحيح." + +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "أدخل عنوان IPv4 أو عنوان IPv6 صحيح." + +msgid "Enter only digits separated by commas." +msgstr "أدخل أرقاما فقط مفصول بينها بفواصل." + +#, python-format +msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." +msgstr "تحقق من أن هذه القيمة هي %(limit_value)s (إنها %(show_value)s)." + +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها." + +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها." + +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[1] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[2] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[3] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[4] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[5] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأقل (هي تحتوي " +"حالياً على %(show_value)d)." + +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[1] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[2] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[3] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[4] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." +msgstr[5] "" +"تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي " +"حالياً على %(show_value)d)." + +msgid "Enter a number." +msgstr "أدخل رقماً." + +#, python-format +msgid "Ensure that there are no more than %(max)s digit in total." +msgid_plural "Ensure that there are no more than %(max)s digits in total." +msgstr[0] "تحقق من أن تدخل %(max)s أرقام لا أكثر." +msgstr[1] "تحقق من أن تدخل رقم %(max)s لا أكثر." +msgstr[2] "تحقق من أن تدخل %(max)s رقمين لا أكثر." +msgstr[3] "تحقق من أن تدخل %(max)s أرقام لا أكثر." +msgstr[4] "تحقق من أن تدخل %(max)s أرقام لا أكثر." +msgstr[5] "تحقق من أن تدخل %(max)s أرقام لا أكثر." + +#, python-format +msgid "Ensure that there are no more than %(max)s decimal place." +msgid_plural "Ensure that there are no more than %(max)s decimal places." +msgstr[0] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." +msgstr[1] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." +msgstr[2] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." +msgstr[3] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." +msgstr[4] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." +msgstr[5] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر." + +#, python-format +msgid "" +"Ensure that there are no more than %(max)s digit before the decimal point." +msgid_plural "" +"Ensure that there are no more than %(max)s digits before the decimal point." +msgstr[0] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." +msgstr[1] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." +msgstr[2] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." +msgstr[3] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." +msgstr[4] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." +msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر." + +#, python-format +msgid "" +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." +msgstr "" +"امتداد الملف “%(extension)s” غير مسموح به. الامتدادات المسموح بها هي:" +"%(allowed_extensions)s." + +msgid "Null characters are not allowed." +msgstr "لا يُسمح بالأحرف الخالية." + +msgid "and" +msgstr "و" + +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s بهذا %(field_labels)s موجود سلفاً." + +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "القيمة %(value)r ليست خيارا صحيحاً." + +msgid "This field cannot be null." +msgstr "لا يمكن ترك هذا الحقل خالي." + +msgid "This field cannot be blank." +msgstr "لا يمكن ترك هذا الحقل فارغاً." + +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً." + +#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. +#. Eg: "Title must be unique for pub_date year" +#, python-format +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." +msgstr "" +"%(field_label)s يجب أن يكون فريد لـ %(date_field_label)s %(lookup_type)s." + +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "حقل نوع: %(field_type)s" + +#, python-format +msgid "“%(value)s” value must be either True or False." +msgstr "يجب أن تكون القيمة “%(value)s” إما True أو False." + +#, python-format +msgid "“%(value)s” value must be either True, False, or None." +msgstr "يجب أن تكون القيمة “%(value)s” إما True أو False أو None." + +msgid "Boolean (Either True or False)" +msgstr "ثنائي (إما True أو False)" + +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "سلسلة نص (%(max_length)s كحد أقصى)" + +msgid "Comma-separated integers" +msgstr "أرقام صحيحة مفصولة بفواصل" + +#, python-format +msgid "" +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " +"format." +msgstr "" +"تحتوي القيمة “%(value)s” على تنسيق تاريخ غير صالح. يجب أن يكون بتنسيق YYYY-" +"MM-DD." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "" +"تحتوي القيمة “%(value)s” على التنسيق الصحيح (YYYY-MM-DD) ولكنه تاريخ غير " +"صالح." + +msgid "Date (without time)" +msgstr "التاريخ (دون الوقت)" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"تحتوي القيمة “%(value)s” على تنسيق غير صالح. يجب أن يكون بتنسيق YYYY-MM-DD " +"HH: MM [: ss [.uuuuuu]] [TZ]." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." +msgstr "" +"تحتوي القيمة “%(value)s” على التنسيق الصحيح (YYYY-MM-DD HH: MM [: ss [." +"uuuuuu]] [TZ]) ولكنها تعد تاريخًا / وقتًا غير صالحين." + +msgid "Date (with time)" +msgstr "التاريخ (مع الوقت)" + +#, python-format +msgid "“%(value)s” value must be a decimal number." +msgstr "يجب أن تكون القيمة “%(value)s” رقمًا عشريًا." + +msgid "Decimal number" +msgstr "رقم عشري" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." +"uuuuuu] format." +msgstr "" +"تحتوي القيمة “%(value)s” على تنسيق غير صالح. يجب أن يكون بتنسيق [DD] [[HH:] " +"MM:] ss [.uuuuuu]." + +msgid "Duration" +msgstr "المدّة" + +msgid "Email address" +msgstr "عنوان بريد إلكتروني" + +msgid "File path" +msgstr "مسار الملف" + +#, python-format +msgid "“%(value)s” value must be a float." +msgstr "يجب أن تكون القيمة “%(value)s” قيمة عائمة." + +msgid "Floating point number" +msgstr "رقم فاصلة عائمة" + +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "يجب أن تكون القيمة “%(value)s” عددًا صحيحًا." + +msgid "Integer" +msgstr "عدد صحيح" + +msgid "Big (8 byte) integer" +msgstr "عدد صحيح كبير (8 بايت)" + +msgid "IPv4 address" +msgstr "عنوان IPv4" + +msgid "IP address" +msgstr "عنوان IP" + +#, python-format +msgid "“%(value)s” value must be either None, True or False." +msgstr "يجب أن تكون القيمة “%(value)s” إما None أو True أو False." + +msgid "Boolean (Either True, False or None)" +msgstr "ثنائي (إما True أو False أو None)" + +msgid "Positive big integer" +msgstr "عدد صحيح كبير موجب" + +msgid "Positive integer" +msgstr "عدد صحيح موجب" + +msgid "Positive small integer" +msgstr "عدد صحيح صغير موجب" + +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "Slug (حتى %(max_length)s)" + +msgid "Small integer" +msgstr "عدد صحيح صغير" + +msgid "Text" +msgstr "نص" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." +msgstr "" +"تحتوي القيمة “%(value)s” على تنسيق غير صالح. يجب أن يكون بتنسيق HH: MM [: ss " +"[.uuuuuu]]." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." +msgstr "" +"تحتوي القيمة “%(value)s” على التنسيق الصحيح (HH: MM [: ss [.uuuuuu]]) ولكنه " +"وقت غير صالح." + +msgid "Time" +msgstr "وقت" + +msgid "URL" +msgstr "رابط" + +msgid "Raw binary data" +msgstr "البيانات الثنائية الخام" + +#, python-format +msgid "“%(value)s” is not a valid UUID." +msgstr "“%(value)s” ليس UUID صالحًا." + +msgid "Universally unique identifier" +msgstr "المعرف الفريد العالمي (UUID)" + +msgid "File" +msgstr "ملف" + +msgid "Image" +msgstr "صورة" + +msgid "A JSON object" +msgstr "كائن JSON" + +msgid "Value must be valid JSON." +msgstr "يجب أن تكون قيمة JSON صالحة." + +#, python-format +msgid "%(model)s instance with %(field)s %(value)r does not exist." +msgstr "النموذج %(model)s ذو الحقل و القيمة %(field)s %(value)r غير موجود." + +msgid "Foreign Key (type determined by related field)" +msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)" + +msgid "One-to-one relationship" +msgstr "علاقة واحد إلى واحد" + +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "%(from)s-%(to)s علاقة" + +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "%(from)s-%(to)s علاقات" + +msgid "Many-to-many relationship" +msgstr "علاقة متعدد إلى متعدد" + +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the +#. label +msgid ":?.!" +msgstr ":?.!" + +msgid "This field is required." +msgstr "هذا الحقل مطلوب." + +msgid "Enter a whole number." +msgstr "أدخل رقما صحيحا." + +msgid "Enter a valid date." +msgstr "أدخل تاريخاً صحيحاً." + +msgid "Enter a valid time." +msgstr "أدخل وقتاً صحيحاً." + +msgid "Enter a valid date/time." +msgstr "أدخل تاريخاً/وقتاً صحيحاً." + +msgid "Enter a valid duration." +msgstr "أدخل مدّة صحيحة" + +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "يجب أن يتراوح عدد الأيام بين {min_days} و {max_days}." + +msgid "No file was submitted. Check the encoding type on the form." +msgstr "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة." + +msgid "No file was submitted." +msgstr "لم يتم إرسال اي ملف." + +msgid "The submitted file is empty." +msgstr "الملف الذي قمت بإرساله فارغ." + +#, python-format +msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid_plural "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr[0] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." +msgstr[1] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." +msgstr[2] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." +msgstr[3] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." +msgstr[4] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." +msgstr[5] "" +"تأكد أن إسم هذا الملف يحتوي على %(max)d حرف على الأكثر (هو يحتوي الآن على " +"%(length)d حرف)." + +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "" +"رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \\\"فارغ\\\"، وليس كلاهما." + +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"قم برفع صورة صحيحة، الملف الذي قمت برفعه إما أنه ليس ملفا لصورة أو أنه ملف " +"معطوب." + +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة." + +msgid "Enter a list of values." +msgstr "أدخل قائمة من القيم." + +msgid "Enter a complete value." +msgstr "إدخال قيمة كاملة." + +msgid "Enter a valid UUID." +msgstr "أدخل قيمة UUID صحيحة." + +msgid "Enter a valid JSON." +msgstr "ادخل كائن JSON صالح." + +#. Translators: This is the default suffix added to form field labels +msgid ":" +msgstr ":" + +#, python-format +msgid "(Hidden field %(name)s) %(error)s" +msgstr "(الحقل الخفي %(name)s) %(error)s" + +msgid "ManagementForm data is missing or has been tampered with" +msgstr "بيانات ManagementForm مفقودة أو تم العبث بها" + +#, python-format +msgid "Please submit %d or fewer forms." +msgid_plural "Please submit %d or fewer forms." +msgstr[0] "الرجاء إرسال %d إستمارة أو أقل" +msgstr[1] "الرجاء إرسال %d إستمارة أو أقل" +msgstr[2] "الرجاء إرسال %d إستمارة أو أقل" +msgstr[3] "الرجاء إرسال %d إستمارة أو أقل" +msgstr[4] "الرجاء إرسال %d إستمارة أو أقل" +msgstr[5] "الرجاء إرسال %d إستمارة أو أقل" + +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "الرجاء إرسال %d إستمارة أو أكثر." +msgstr[1] "الرجاء إرسال %d إستمارة أو أكثر." +msgstr[2] "الرجاء إرسال %d إستمارة أو أكثر." +msgstr[3] "الرجاء إرسال %d إستمارة أو أكثر." +msgstr[4] "الرجاء إرسال %d إستمارة أو أكثر." +msgstr[5] "الرجاء إرسال %d إستمارة أو أكثر." + +msgid "Order" +msgstr "الترتيب" + +msgid "Delete" +msgstr "احذف" + +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "رجاء صحّح بيانات %(field)s المتكررة." + +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة." + +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s " +"في %(date_field)s." + +msgid "Please correct the duplicate values below." +msgstr "رجاءً صحّح القيم المُكرّرة أدناه." + +msgid "The inline value did not match the parent instance." +msgstr "القيمة المضمنة لا تتطابق مع المثيل الأصلي." + +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة." + +#, python-format +msgid "“%(pk)s” is not a valid value." +msgstr "“%(pk)s” ليست قيمة صالحة." + +#, python-format +msgid "" +"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " +"may be ambiguous or it may not exist." +msgstr "" +"لا يمكن تفسير٪ %(datetime)s في المنطقة الزمنية٪ %(current_timezone)s؛ قد " +"تكون غامضة أو غير موجودة." + +msgid "Clear" +msgstr "تفريغ" + +msgid "Currently" +msgstr "حالياً" + +msgid "Change" +msgstr "عدّل" + +msgid "Unknown" +msgstr "مجهول" + +msgid "Yes" +msgstr "نعم" + +msgid "No" +msgstr "لا" + +#. Translators: Please do not add spaces around commas. +msgid "yes,no,maybe" +msgstr "نعم,لا,ربما" + +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d بايت" +msgstr[1] "%(size)d بايت واحد " +msgstr[2] "%(size)d بايتان" +msgstr[3] "%(size)d بايت" +msgstr[4] "%(size)d بايت" +msgstr[5] "%(size)d بايت" + +#, python-format +msgid "%s KB" +msgstr "%s ك.ب" + +#, python-format +msgid "%s MB" +msgstr "%s م.ب" + +#, python-format +msgid "%s GB" +msgstr "%s ج.ب" + +#, python-format +msgid "%s TB" +msgstr "%s ت.ب" + +#, python-format +msgid "%s PB" +msgstr "%s ب.ب" + +msgid "p.m." +msgstr "م" + +msgid "a.m." +msgstr "ص" + +msgid "PM" +msgstr "م" + +msgid "AM" +msgstr "ص" + +msgid "midnight" +msgstr "منتصف الليل" + +msgid "noon" +msgstr "ظهراً" + +msgid "Monday" +msgstr "الاثنين" + +msgid "Tuesday" +msgstr "الثلاثاء" + +msgid "Wednesday" +msgstr "الأربعاء" + +msgid "Thursday" +msgstr "الخميس" + +msgid "Friday" +msgstr "الجمعة" + +msgid "Saturday" +msgstr "السبت" + +msgid "Sunday" +msgstr "الأحد" + +msgid "Mon" +msgstr "إثنين" + +msgid "Tue" +msgstr "ثلاثاء" + +msgid "Wed" +msgstr "أربعاء" + +msgid "Thu" +msgstr "خميس" + +msgid "Fri" +msgstr "جمعة" + +msgid "Sat" +msgstr "سبت" + +msgid "Sun" +msgstr "أحد" + +msgid "January" +msgstr "جانفي" + +msgid "February" +msgstr "فيفري" + +msgid "March" +msgstr "مارس" + +msgid "April" +msgstr "أفريل" + +msgid "May" +msgstr "ماي" + +msgid "June" +msgstr "جوان" + +msgid "July" +msgstr "جويليه" + +msgid "August" +msgstr "أوت" + +msgid "September" +msgstr "سبتمبر" + +msgid "October" +msgstr "أكتوبر" + +msgid "November" +msgstr "نوفمبر" + +msgid "December" +msgstr "ديسمبر" + +msgid "jan" +msgstr "جانفي" + +msgid "feb" +msgstr "فيفري" + +msgid "mar" +msgstr "مارس" + +msgid "apr" +msgstr "أفريل" + +msgid "may" +msgstr "ماي" + +msgid "jun" +msgstr "جوان" + +msgid "jul" +msgstr "جويليه" + +msgid "aug" +msgstr "أوت" + +msgid "sep" +msgstr "سبتمبر" + +msgid "oct" +msgstr "أكتوبر" + +msgid "nov" +msgstr "نوفمبر" + +msgid "dec" +msgstr "ديسمبر" + +msgctxt "abbrev. month" +msgid "Jan." +msgstr "جانفي" + +msgctxt "abbrev. month" +msgid "Feb." +msgstr "فيفري" + +msgctxt "abbrev. month" +msgid "March" +msgstr "مارس" + +msgctxt "abbrev. month" +msgid "April" +msgstr "أفريل" + +msgctxt "abbrev. month" +msgid "May" +msgstr "ماي" + +msgctxt "abbrev. month" +msgid "June" +msgstr "جوان" + +msgctxt "abbrev. month" +msgid "July" +msgstr "جويليه" + +msgctxt "abbrev. month" +msgid "Aug." +msgstr "أوت" + +msgctxt "abbrev. month" +msgid "Sept." +msgstr "سبتمبر" + +msgctxt "abbrev. month" +msgid "Oct." +msgstr "أكتوبر" + +msgctxt "abbrev. month" +msgid "Nov." +msgstr "نوفمبر" + +msgctxt "abbrev. month" +msgid "Dec." +msgstr "ديسمبر" + +msgctxt "alt. month" +msgid "January" +msgstr "جانفي" + +msgctxt "alt. month" +msgid "February" +msgstr "فيفري" + +msgctxt "alt. month" +msgid "March" +msgstr "مارس" + +msgctxt "alt. month" +msgid "April" +msgstr "أفريل" + +msgctxt "alt. month" +msgid "May" +msgstr "ماي" + +msgctxt "alt. month" +msgid "June" +msgstr "جوان" + +msgctxt "alt. month" +msgid "July" +msgstr "جويليه" + +msgctxt "alt. month" +msgid "August" +msgstr "أوت" + +msgctxt "alt. month" +msgid "September" +msgstr "سبتمبر" + +msgctxt "alt. month" +msgid "October" +msgstr "أكتوبر" + +msgctxt "alt. month" +msgid "November" +msgstr "نوفمبر" + +msgctxt "alt. month" +msgid "December" +msgstr "ديسمبر" + +msgid "This is not a valid IPv6 address." +msgstr "هذا ليس عنوان IPv6 صحيح." + +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s…" +msgstr "%(truncated_text)s…" + +msgid "or" +msgstr "أو" + +#. Translators: This string is used as a separator between list elements +msgid ", " +msgstr "، " + +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%d سنة" +msgstr[1] "%d سنة" +msgstr[2] "%d سنتان" +msgstr[3] "%d سنوات" +msgstr[4] "%d سنة" +msgstr[5] "%d سنة" + +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%d شهر" +msgstr[1] "%d شهر" +msgstr[2] "%d شهرين\"" +msgstr[3] "%d أشهر" +msgstr[4] "%d شهر" +msgstr[5] "%d شهر" + +#, python-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d أسبوع" +msgstr[1] "%d اسبوع" +msgstr[2] "%d أسبوعين" +msgstr[3] "%d أسابيع" +msgstr[4] "%d أسبوع" +msgstr[5] "%d أسبوع" + +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d يوم" +msgstr[1] "%d يوم" +msgstr[2] "%d يومان" +msgstr[3] "%d أيام" +msgstr[4] "%d يوم" +msgstr[5] "%d يوم" + +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d ساعة" +msgstr[1] "%d ساعة" +msgstr[2] "%d ساعتين" +msgstr[3] "%d ساعات" +msgstr[4] "%d ساعة" +msgstr[5] "%d ساعة" + +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d دقيقة" +msgstr[1] "%d دقيقة" +msgstr[2] "%d دقيقتين" +msgstr[3] "%d دقائق" +msgstr[4] "%d دقيقة" +msgstr[5] "%d دقيقة" + +msgid "Forbidden" +msgstr "ممنوع" + +msgid "CSRF verification failed. Request aborted." +msgstr "تم الفشل للتحقق من CSRF. تم إنهاء الطلب." + +msgid "" +"You are seeing this message because this HTTPS site requires a “Referer " +"header” to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." +msgstr "" +"أنت ترى هذه الرسالة لأن موقع HTTPS هذا يتطلب إرسال “Referer header” بواسطة " +"متصفح الويب الخاص بك ، ولكن لم يتم إرسال أي منها. هذا العنوان مطلوب لأسباب " +"أمنية ، لضمان عدم اختطاف متصفحك من قبل أطراف ثالثة." + +msgid "" +"If you have configured your browser to disable “Referer” headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for “same-" +"origin” requests." +msgstr "" +"إذا قمت بتكوين المستعرض الخاص بك لتعطيل رؤوس “Referer” ، فالرجاء إعادة " +"تمكينها ، على الأقل لهذا الموقع ، أو لاتصالات HTTPS ، أو لطلبات “same-" +"origin”." + +msgid "" +"If you are using the tag or " +"including the “Referrer-Policy: no-referrer” header, please remove them. The " +"CSRF protection requires the “Referer” header to do strict referer checking. " +"If you’re concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" +"إذا كنت تستخدم العلامة أو تتضمن رأس “Referrer-Policy: no-referrer” ، فيرجى إزالتها. تتطلب حماية " +"CSRF رأس “Referer” القيام بالتحقق من “strict referer”. إذا كنت مهتمًا " +"بالخصوصية ، فاستخدم بدائل مثل للروابط إلى مواقع " +"الجهات الخارجية." + +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" +"تشاهد هذه الرسالة لأن هذا الموقع يتطلب ملف تعريف ارتباط CSRF Cookie عند " +"إرسال النماذج. ملف تعريف ارتباط Cookie هذا مطلوب لأسباب أمنية ، لضمان عدم " +"اختطاف متصفحك من قبل أطراف ثالثة." + +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for “same-origin” requests." +msgstr "" +"إذا قمت بتكوين المستعرض الخاص بك لتعطيل ملفات تعريف الارتباط Cookies ، يرجى " +"إعادة تمكينها ، على الأقل لهذا الموقع ، أو لطلبات “same-origin”." + +msgid "More information is available with DEBUG=True." +msgstr "يتوفر مزيد من المعلومات عند ضبط الخيار DEBUG=True." + +msgid "No year specified" +msgstr "لم تحدد السنة" + +msgid "Date out of range" +msgstr "تاريخ خارج النطاق" + +msgid "No month specified" +msgstr "لم تحدد الشهر" + +msgid "No day specified" +msgstr "لم تحدد اليوم" + +msgid "No week specified" +msgstr "لم تحدد الأسبوع" + +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "لا يوجد %(verbose_name_plural)s" + +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"التاريخ بالمستقبل %(verbose_name_plural)s غير متوفر لأن قيمة %(class_name)s." +"allow_future هي False." + +#, python-format +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" +msgstr "سلسلة تاريخ غير صالحة “%(datestr)s” شكل معين “%(format)s”" + +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام" + +msgid "Page is not “last”, nor can it be converted to an int." +msgstr "الصفحة ليست \"الأخيرة\" ، ولا يمكن تحويلها إلى عدد صحيح." + +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "صفحة خاطئة (%(page_number)s): %(message)s" + +#, python-format +msgid "Empty list and “%(class_name)s.allow_empty” is False." +msgstr "القائمة فارغة و “%(class_name)s.allow_empty” هي False." + +msgid "Directory indexes are not allowed here." +msgstr "لا يسمح لفهارس الدليل هنا." + +#, python-format +msgid "“%(path)s” does not exist" +msgstr "“%(path)s” غير موجود" + +#, python-format +msgid "Index of %(directory)s" +msgstr "فهرس لـ %(directory)s" + +msgid "Django: the Web framework for perfectionists with deadlines." +msgstr "" +"جانغو: المنصة البرمجية لتطبيقات الويب للمتَّسمين بالكمال مع المواعيد المحدّدة." + +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" +"عرض ملاحظات الإصدار ل جانغو " +"%(version)s" + +msgid "The install worked successfully! Congratulations!" +msgstr "تمَّت عملية التثبيت بنجاح! تهانينا!" + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " +"URLs." +msgstr "" +"تشاهد هذه الصفحة لأن DEBUG = True موجود في ملف الإعدادات الخاص بك ولم تقم بتكوين أي " +"عناوين URL." + +msgid "Django Documentation" +msgstr "توثيق جانغو" + +msgid "Topics, references, & how-to’s" +msgstr "الموضوعات ، المراجع، & الكيفية" + +msgid "Tutorial: A Polling App" +msgstr "البرنامج التعليمي: تطبيق الاقتراع" + +msgid "Get started with Django" +msgstr "الخطوات الأولى مع جانغو" + +msgid "Django Community" +msgstr "مجتمع جانغو" + +msgid "Connect, get help, or contribute" +msgstr "الاتصال، الحصول على المساعدة أو المساهمة" diff --git a/django/conf/locale/be/LC_MESSAGES/django.mo b/django/conf/locale/be/LC_MESSAGES/django.mo index 72defdcb6c1a..44c3dfbcc015 100644 Binary files a/django/conf/locale/be/LC_MESSAGES/django.mo and b/django/conf/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/be/LC_MESSAGES/django.po b/django/conf/locale/be/LC_MESSAGES/django.po index ae690985b2f2..ddb7c344a047 100644 --- a/django/conf/locale/be/LC_MESSAGES/django.po +++ b/django/conf/locale/be/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Viktar Palstsiuk , 2014-2015 -# znotdead , 2016-2017,2019 +# znotdead , 2016-2017,2019-2021 # Дмитрий Шатера , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 20:33+0000\n" +"Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" "MIME-Version: 1.0\n" @@ -27,6 +27,9 @@ msgstr "Афрыкаанс" msgid "Arabic" msgstr "Арабская" +msgid "Algerian Arabic" +msgstr "Алжырская арабская" + msgid "Asturian" msgstr "Астурыйская" @@ -150,6 +153,9 @@ msgstr "Інтэрлінгва" msgid "Indonesian" msgstr "Інданэзійская" +msgid "Igbo" +msgstr "Ігба" + msgid "Ido" msgstr "Іда" @@ -180,6 +186,9 @@ msgstr "Каннада" msgid "Korean" msgstr "Карэйская" +msgid "Kyrgyz" +msgstr "Кіргізская" + msgid "Luxembourgish" msgstr "Люксэмбургская" @@ -264,9 +273,15 @@ msgstr "Тамільская" msgid "Telugu" msgstr "Тэлуґу" +msgid "Tajik" +msgstr "Таджыкскі" + msgid "Thai" msgstr "Тайская" +msgid "Turkmen" +msgstr "Туркменская" + msgid "Turkish" msgstr "Турэцкая" @@ -283,7 +298,7 @@ msgid "Urdu" msgstr "Урду" msgid "Uzbek" -msgstr "" +msgstr "Узбецкі" msgid "Vietnamese" msgstr "Віетнамская" @@ -306,6 +321,11 @@ msgstr "Cтатычныя файлы" msgid "Syndication" msgstr "Сындыкацыя" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Лік гэтай старонкі не з'яўляецца цэлым лікам" @@ -578,6 +598,9 @@ msgstr "Цэлы лік" msgid "Big (8 byte) integer" msgstr "Вялікі (8 байтаў) цэлы" +msgid "Small integer" +msgstr "Малы цэлы лік" + msgid "IPv4 address" msgstr "Адрас IPv4" @@ -591,6 +614,9 @@ msgstr "Значэньне “%(value)s” павінна быць None, True а msgid "Boolean (Either True, False or None)" msgstr "Ляґічнае («сапраўдна», «не сапраўдна» ці «нічога»)" +msgid "Positive big integer" +msgstr "Дадатны вялікі цэлы лік" + msgid "Positive integer" msgstr "Дадатны цэлы лік" @@ -601,9 +627,6 @@ msgstr "Дадатны малы цэлы лік" msgid "Slug (up to %(max_length)s)" msgstr "Бірка (ня болей за %(max_length)s)" -msgid "Small integer" -msgstr "Малы цэлы лік" - msgid "Text" msgstr "Тэкст" @@ -645,6 +668,12 @@ msgstr "Файл" msgid "Image" msgstr "Выява" +msgid "A JSON object" +msgstr "Аб'ект JSON" + +msgid "Value must be valid JSON." +msgstr "Значэньне павінна быць сапраўдным JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Экземпляр %(model)s з %(field)s %(value)r не iснуе." @@ -744,6 +773,9 @@ msgstr "Калі ласка, увядзіце поўнае значэньне." msgid "Enter a valid UUID." msgstr "Увядзіце сапраўдны UUID." +msgid "Enter a valid JSON." +msgstr "Пазначце сапраўдны JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -752,24 +784,30 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Схаванае поле %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Данныя ManagementForm адсутнічаюць ці былі пашкоджаны" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Дадзеныя формы ManagementForm адсутнічаюць ці былі падменены. Адсутнічаюць " +"палі: %(field_names)s. Магчыма, вам спатрэбіцца падаць справаздачу пра " +"памылку, калі праблема захоўваецца." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Калі ласка, адпраўце %d або менш формаў." -msgstr[1] "Калі ласка, адпраўце %d або менш формаў." -msgstr[2] "Калі ласка, адпраўце %d або менш формаў." -msgstr[3] "Калі ласка, адпраўце %d або менш формаў." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Калі ласка, адпраўце не болей чым %d форму." +msgstr[1] "Калі ласка, адпраўце не болей чым %d формаў." +msgstr[2] "Калі ласка, адпраўце не болей чым %d формаў." +msgstr[3] "Калі ласка, адпраўце не болей чым %d формаў." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Калі ласка, адпраўце %d або больш формаў." -msgstr[1] "Калі ласка, адпраўце %d або больш формаў." -msgstr[2] "Калі ласка, адпраўце %d або больш формаў." -msgstr[3] "Калі ласка, адпраўце %d або больш формаў." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Калі ласка, адпраўце не менш чым %d форму." +msgstr[1] "Калі ласка, адпраўце не менш чым %d формаў." +msgstr[2] "Калі ласка, адпраўце не менш чым %d формаў." +msgstr[3] "Калі ласка, адпраўце не менш чым %d формаў." msgid "Order" msgstr "Парадак" @@ -832,15 +870,7 @@ msgstr "Так" msgid "No" msgstr "Не" -msgid "Year" -msgstr "Год" - -msgid "Month" -msgstr "Месяц" - -msgid "Day" -msgstr "Дзень" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "так,не,магчыма" @@ -1163,9 +1193,6 @@ msgstr[1] "%d хвіліны" msgstr[2] "%d хвілінаў" msgstr[3] "%d хвілінаў" -msgid "0 minutes" -msgstr "0 хвілін" - msgid "Forbidden" msgstr "Забаронена" @@ -1284,8 +1311,8 @@ msgstr "“%(path)s” не існуе" msgid "Index of %(directory)s" msgstr "Файлы каталёґа «%(directory)s»" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Джанга: Web рамкі для перфекцыяністаў з крайнімі тэрмінамі." +msgid "The install worked successfully! Congratulations!" +msgstr "Усталяванне прайшло паспяхова! Віншаванні!" #, python-format msgid "" @@ -1296,9 +1323,6 @@ msgstr "" "\" target=\"_blank\" rel=\"noopener\">заўвагі да выпуску для Джангі " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Усталяванне прайшло паспяхова! Віншаванні!" - #, python-format msgid "" "You are seeing this page because , 2012 +# Claude Paroz , 2020 # Jannis Leidel , 2011 # Lyuboslav Petrov , 2014 # Todor Lubenov , 2013-2015 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -29,6 +30,9 @@ msgstr "Африкански" msgid "Arabic" msgstr "арабски език" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Астурийски" @@ -152,6 +156,9 @@ msgstr "Международен" msgid "Indonesian" msgstr "индонезийски език" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Идо" @@ -182,6 +189,9 @@ msgstr "каннада" msgid "Korean" msgstr "Корейски" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Люксембургски" @@ -266,9 +276,15 @@ msgstr "тамил" msgid "Telugu" msgstr "телугу" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "тайландски език" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "турски език" @@ -562,6 +578,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Boolean (Възможните стойности са True, False или None)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Положително цяло число" @@ -612,6 +631,12 @@ msgstr "Файл" msgid "Image" msgstr "Изображение" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Инстанция на %(model)s с %(field)s %(value)r не съществува." @@ -703,6 +728,9 @@ msgstr "Въведете пълна стойност." msgid "Enter a valid UUID." msgstr "Въведете валиден UUID." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -787,17 +815,9 @@ msgstr "Да" msgid "No" msgstr "Не" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "да, не, може би" +msgstr "да,не,може би" #, python-format msgid "%(size)d byte" @@ -1104,9 +1124,6 @@ msgid_plural "%d minutes" msgstr[0] "%d минута" msgstr[1] "%d минути" -msgid "0 minutes" -msgstr "0 минути" - msgid "Forbidden" msgstr "Забранен" diff --git a/django/conf/locale/br/LC_MESSAGES/django.mo b/django/conf/locale/br/LC_MESSAGES/django.mo index 2831728827b8..a9419c09471a 100644 Binary files a/django/conf/locale/br/LC_MESSAGES/django.mo and b/django/conf/locale/br/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/br/LC_MESSAGES/django.po b/django/conf/locale/br/LC_MESSAGES/django.po index ef101e573b84..9ab9cf0118ef 100644 --- a/django/conf/locale/br/LC_MESSAGES/django.po +++ b/django/conf/locale/br/LC_MESSAGES/django.po @@ -1,14 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2020 +# Ewen , 2021 # Fulup , 2012,2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-28 17:37+0000\n" +"Last-Translator: Ewen \n" "Language-Team: Breton (http://www.transifex.com/django/django/language/br/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,6 +28,9 @@ msgstr "Afrikaneg" msgid "Arabic" msgstr "Arabeg" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Astureg" @@ -149,6 +154,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonezeg" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -179,6 +187,9 @@ msgstr "Kannata" msgid "Korean" msgstr "Koreaneg" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luksembourgeg" @@ -263,9 +274,15 @@ msgstr "Tamileg" msgid "Telugu" msgstr "Telougou" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Thai" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turkeg" @@ -294,7 +311,7 @@ msgid "Traditional Chinese" msgstr "Sinaeg hengounel" msgid "Messages" -msgstr "" +msgstr "Kemennadenn" msgid "Site Maps" msgstr "Tresoù al lec'hienn" @@ -305,11 +322,16 @@ msgstr "Restroù statek" msgid "Syndication" msgstr "Sindikadur" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "" msgid "That page number is less than 1" -msgstr "" +msgstr "An niver a bajenn mañ a zo bihanoc'h eget 1." msgid "That page contains no results" msgstr "" @@ -548,6 +570,9 @@ msgstr "Anterin" msgid "Big (8 byte) integer" msgstr "Anterin bras (8 okted)" +msgid "Small integer" +msgstr "Niver anterin bihan" + msgid "IPv4 address" msgstr "Chomlec'h IPv4" @@ -561,6 +586,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Boulean (gwir pe gaou pe netra)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Niver anterin pozitivel" @@ -571,9 +599,6 @@ msgstr "Niver anterin bihan pozitivel" msgid "Slug (up to %(max_length)s)" msgstr "Slug (betek %(max_length)s arouez.)" -msgid "Small integer" -msgstr "Niver anterin bihan" - msgid "Text" msgstr "Testenn" @@ -611,6 +636,12 @@ msgstr "Restr" msgid "Image" msgstr "Skeudenn" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -702,6 +733,9 @@ msgstr "Merkañ un talvoud klok" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr "" @@ -710,12 +744,15 @@ msgstr "" msgid "(Hidden field %(name)s) %(error)s" msgstr "" -msgid "ManagementForm data is missing or has been tampered with" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -723,8 +760,8 @@ msgstr[3] "" msgstr[4] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -792,17 +829,9 @@ msgstr "Ya" msgid "No" msgstr "Ket" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "ya, ket, marteze" +msgstr "ya,ket,marteze" #, python-format msgid "%(size)d byte" @@ -1130,9 +1159,6 @@ msgstr[2] "%d munud" msgstr[3] "%d munud" msgstr[4] "%d munud" -msgid "0 minutes" -msgstr "0 munud" - msgid "Forbidden" msgstr "Difennet" @@ -1232,7 +1258,7 @@ msgstr "" msgid "Index of %(directory)s" msgstr "Meneger %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." +msgid "The install worked successfully! Congratulations!" msgstr "" #, python-format @@ -1241,9 +1267,6 @@ msgid "" "target=\"_blank\" rel=\"noopener\">release notes for Django %(version)s" msgstr "" -msgid "The install worked successfully! Congratulations!" -msgstr "" - #, python-format msgid "" "You are seeing this page because , 2012,2015-2017 -# Carles Barrobés , 2011-2012,2014 +# Carles Barrobés , 2011-2012,2014,2020 # duub qnnp, 2015 # Gil Obradors Via , 2019 # Gil Obradors Via , 2019 # Jannis Leidel , 2011 +# Manel Clos , 2020 # Manuel Miranda , 2015 # Roger Pons , 2015 +# Santiago Lamora , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 12:25+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -30,6 +32,9 @@ msgstr "Afrikans" msgid "Arabic" msgstr "àrab" +msgid "Algerian Arabic" +msgstr "àrab argelià" + msgid "Asturian" msgstr "Asturià" @@ -85,28 +90,28 @@ msgid "Esperanto" msgstr "Esperanto" msgid "Spanish" -msgstr "espanyol" +msgstr "castellà" msgid "Argentinian Spanish" msgstr "castellà d'Argentina" msgid "Colombian Spanish" -msgstr "Español de Colombia" +msgstr "castellà de Colombia" msgid "Mexican Spanish" -msgstr "espanyol de Mèxic" +msgstr "castellà de Mèxic" msgid "Nicaraguan Spanish" msgstr "castellà de Nicaragua" msgid "Venezuelan Spanish" -msgstr "Espanyol de Veneçuela" +msgstr "castellà de Veneçuela" msgid "Estonian" msgstr "estonià" msgid "Basque" -msgstr "euskera" +msgstr "èuscar" msgid "Persian" msgstr "persa" @@ -124,7 +129,7 @@ msgid "Irish" msgstr "irlandès" msgid "Scottish Gaelic" -msgstr "Escocés Gaélico" +msgstr "Gaèlic escocès" msgid "Galician" msgstr "gallec" @@ -153,6 +158,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "indonesi" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -183,6 +191,9 @@ msgstr "kannarès" msgid "Korean" msgstr "coreà" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luxemburguès" @@ -208,10 +219,10 @@ msgid "Burmese" msgstr "Burmès" msgid "Norwegian Bokmål" -msgstr "Norwegian Bokmål" +msgstr "Bokmål noruec" msgid "Nepali" -msgstr "Nepalí" +msgstr "Nepalès" msgid "Dutch" msgstr "holandès" @@ -267,9 +278,15 @@ msgstr "tàmil" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "tailandès" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "turc" @@ -286,7 +303,7 @@ msgid "Urdu" msgstr "urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbek" msgid "Vietnamese" msgstr "vietnamita" @@ -309,8 +326,13 @@ msgstr "Arxius estàtics" msgid "Syndication" msgstr "Sindicació" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" -msgstr "Aquesta plana no és un sencer" +msgstr "Aquest número de plana no és un enter" msgid "That page number is less than 1" msgstr "El nombre de plana és inferior a 1" @@ -358,7 +380,8 @@ msgstr "Introduïu només dígits separats per comes." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "Assegureu-vos que el valor sigui %(limit_value)s (és %(show_value)s)." +msgstr "" +"Assegureu-vos que aquest valor sigui %(limit_value)s (és %(show_value)s)." #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." @@ -381,7 +404,7 @@ msgstr[0] "" "Assegureu-vos que aquest valor té almenys %(limit_value)d caràcter (en té " "%(show_value)d)." msgstr[1] "" -"Assegureu-vos que aquest valor té almenys %(limit_value)d caràcters (en té " +"Assegureu-vos que el valor tingui almenys %(limit_value)d caràcters (en té " "%(show_value)d)." #, python-format @@ -395,8 +418,8 @@ msgstr[0] "" "Assegureu-vos que aquest valor té com a molt %(limit_value)d caràcter (en té " "%(show_value)d)." msgstr[1] "" -"Assegureu-vos que aquest valor té com a molt %(limit_value)d caràcters (en " -"té %(show_value)d)." +"Assegureu-vos que aquest valor tingui com a molt %(limit_value)d caràcters " +"(en té %(show_value)d)." msgid "Enter a number." msgstr "Introduïu un número." @@ -405,13 +428,13 @@ msgstr "Introduïu un número." msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." msgstr[0] "Assegureu-vos que no hi ha més de %(max)s dígit en total." -msgstr[1] "Assegureu-vos que no hi ha més de %(max)s dígits en total." +msgstr[1] "Assegureu-vos que no hi hagi més de %(max)s dígits en total." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." msgstr[0] "Assegureu-vos que no hi ha més de %(max)s decimal." -msgstr[1] "Assegureu-vos que no hi ha més de %(max)s decimals." +msgstr[1] "Assegureu-vos que no hi hagi més de %(max)s decimals." #, python-format msgid "" @@ -421,18 +444,18 @@ msgid_plural "" msgstr[0] "" "Assegureu-vos que no hi ha més de %(max)s dígit abans de la coma decimal." msgstr[1] "" -"Assegureu-vos que no hi ha més de %(max)s dígits abans de la coma decimal." +"Assegureu-vos que no hi hagi més de %(max)s dígits abans de la coma decimal." #, python-format msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" -"L'extensió d'arxiu '%(extension)s' no està permesa. Les extensions permeses " -"són: '%(allowed_extensions)s'." +"L'extensió d'arxiu “%(extension)s” no està permesa. Les extensions permeses " +"són: %(allowed_extensions)s." msgid "Null characters are not allowed." -msgstr "Caràcters nul no estan permesos." +msgstr "No es permeten caràcters nuls." msgid "and" msgstr "i" @@ -564,6 +587,9 @@ msgstr "Enter" msgid "Big (8 byte) integer" msgstr "Enter gran (8 bytes)" +msgid "Small integer" +msgstr "Enter petit" + msgid "IPv4 address" msgstr "Adreça IPv4" @@ -577,6 +603,9 @@ msgstr "El valor '%(value)s' ha de ser None, True o False." msgid "Boolean (Either True, False or None)" msgstr "Booleà (Cert, Fals o Cap ('None'))" +msgid "Positive big integer" +msgstr "Enter gran positiu" + msgid "Positive integer" msgstr "Enter positiu" @@ -587,9 +616,6 @@ msgstr "Enter petit positiu" msgid "Slug (up to %(max_length)s)" msgstr "Slug (fins a %(max_length)s)" -msgid "Small integer" -msgstr "Enter petit" - msgid "Text" msgstr "Text" @@ -631,6 +657,12 @@ msgstr "Arxiu" msgid "Image" msgstr "Imatge" +msgid "A JSON object" +msgstr "Un objecte JSON" + +msgid "Value must be valid JSON." +msgstr "El valor ha de ser JSON vàlid." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "La instància de %(model)s amb %(field)s %(value)r no existeix." @@ -639,7 +671,7 @@ msgid "Foreign Key (type determined by related field)" msgstr "Clau forana (tipus determinat pel camp relacionat)" msgid "One-to-one relationship" -msgstr "Inter-relació un-a-un" +msgstr "Relació un-a-un" #, python-format msgid "%(from)s-%(to)s relationship" @@ -650,7 +682,7 @@ msgid "%(from)s-%(to)s relationships" msgstr "relacions %(from)s-%(to)s " msgid "Many-to-many relationship" -msgstr "Inter-relació molts-a-molts" +msgstr "Relació molts-a-molts" #. Translators: If found as last label character, these punctuation #. characters will prevent the default label_suffix to be appended to the @@ -662,7 +694,7 @@ msgid "This field is required." msgstr "Aquest camp és obligatori." msgid "Enter a whole number." -msgstr "Introduïu un número sencer." +msgstr "Introduïu un número enter." msgid "Enter a valid date." msgstr "Introduïu una data vàlida." @@ -674,7 +706,7 @@ msgid "Enter a valid date/time." msgstr "Introduïu una data/hora vàlides." msgid "Enter a valid duration." -msgstr "Introdueixi una durada vàlida." +msgstr "Introduïu una durada vàlida." #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." @@ -724,7 +756,10 @@ msgid "Enter a complete value." msgstr "Introduïu un valor complet." msgid "Enter a valid UUID." -msgstr "Intrudueixi un UUID vàlid." +msgstr "Intruduïu un UUID vàlid." + +msgid "Enter a valid JSON." +msgstr "Introduïu un JSON vàlid." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -734,20 +769,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Camp ocult %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Falten dades de ManagementForm o s'ha manipulat" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Sisplau envieu com a molt %d formulari." -msgstr[1] "Sisplau envieu com a molt %d formularis." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Sisplau envieu com a mínim %d formulari." -msgstr[1] "Sisplau envieu com a mínim %d formularis." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Ordre" @@ -777,11 +815,12 @@ msgid "Please correct the duplicate values below." msgstr "Si us plau, corregiu els valors duplicats a sota." msgid "The inline value did not match the parent instance." -msgstr "El valor en línia no coincideix la instancia mare ." +msgstr "El valor en línia no coincideix amb la instància mare ." msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -"Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles." +"Esculliu una opció vàlida. La opció triada no és una de les opcions " +"disponibles." #, python-format msgid "“%(pk)s” is not a valid value." @@ -813,15 +852,7 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "Any" - -msgid "Month" -msgstr "Mes" - -msgid "Day" -msgstr "Dia" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "sí,no,potser" @@ -985,51 +1016,51 @@ msgstr "des." msgctxt "abbrev. month" msgid "Jan." -msgstr "gen." +msgstr "Gen." msgctxt "abbrev. month" msgid "Feb." -msgstr "feb." +msgstr "Feb." msgctxt "abbrev. month" msgid "March" -msgstr "mar." +msgstr "Març" msgctxt "abbrev. month" msgid "April" -msgstr "abr." +msgstr "Abr." msgctxt "abbrev. month" msgid "May" -msgstr "mai." +msgstr "Maig" msgctxt "abbrev. month" msgid "June" -msgstr "jun." +msgstr "Juny" msgctxt "abbrev. month" msgid "July" -msgstr "jul." +msgstr "Jul." msgctxt "abbrev. month" msgid "Aug." -msgstr "ago." +msgstr "Ago." msgctxt "abbrev. month" msgid "Sept." -msgstr "set." +msgstr "Set." msgctxt "abbrev. month" msgid "Oct." -msgstr "oct." +msgstr "Oct." msgctxt "abbrev. month" msgid "Nov." -msgstr "nov." +msgstr "Nov." msgctxt "abbrev. month" msgid "Dec." -msgstr "des." +msgstr "Des." msgctxt "alt. month" msgid "January" @@ -1130,9 +1161,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuts" -msgid "0 minutes" -msgstr "0 minuts" - msgid "Forbidden" msgstr "Prohibit" @@ -1145,18 +1173,18 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" -"Estàs veient aquest missatge perquè aquest lloc HTTPS requereix que el teu " -"navegador enviï una capçalera 'Referer', i no n'ha arribada cap. Aquesta " -"capçalera es requereix per motius de seguretat, per garantir que el teu " -"navegador no està sent infiltrat per tercers." +"Esteu veient aquest missatge perquè aquest lloc HTTPS requereix que el " +"vostre navegador enviï una capçalera “Referer\", i no n'ha arribada cap. " +"Aquesta capçalera es requereix per motius de seguretat, per garantir que el " +"vostre navegador no està sent infiltrat per tercers." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" -"Si has configurat el teu navegador per deshabilitar capçaleres 'Referer', " -"sisplau torna-les a habilitar, com a mínim per a aquest lloc, o per a " +"Si heu configurat el vostre navegador per deshabilitar capçaleres “Referer" +"\", sisplau torneu-les a habilitar, com a mínim per a aquest lloc, o per a " "connexions HTTPs, o per a peticions amb el mateix orígen." msgid "" @@ -1166,11 +1194,11 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" -"Si utilitza l'etiqueta o " -"inclou la capçalera 'Referrer-Policy: no-referrer' , si et plau elimina-la. " -"La protecció CSRF requereix la capçalera 'Referer' per a fer una " -"comprovació estricte. Si està preocupat en quan a la privacitat, utilitzi " -"alternatives com per enllaçar a aplicacions de " +"Si utilitzeu l'etiqueta o " +"incloeu la capçalera “Referer-Policy: no-referrer\" , si us plau elimineu-" +"la. La protecció CSRF requereix la capçalera “Referer\" per a fer una " +"comprovació estricta. Si esteu preocupats quant a la privacitat, utilitzeu " +"alternatives com per enllaços a aplicacions de " "tercers." msgid "" @@ -1227,7 +1255,7 @@ msgstr "Cadena invàlida de data '%(datestr)s' donat el format '%(format)s'" #, python-format msgid "No %(verbose_name)s found matching the query" -msgstr "No s'ha trobat sap %(verbose_name)s que coincideixi amb la petició" +msgstr "No s'ha trobat cap %(verbose_name)s que coincideixi amb la petició" msgid "Page is not “last”, nor can it be converted to an int." msgstr "La pàgina no és 'last', ni es pot convertir en un enter" @@ -1241,7 +1269,7 @@ msgid "Empty list and “%(class_name)s.allow_empty” is False." msgstr "Llista buida i '%(class_name)s.allow_empty' és Fals." msgid "Directory indexes are not allowed here." -msgstr "Aquí no es permeten índexs de directori." +msgstr "Aquí no es permeten índex de directori." #, python-format msgid "“%(path)s” does not exist" @@ -1251,8 +1279,8 @@ msgstr "\"%(path)s\" no existeix" msgid "Index of %(directory)s" msgstr "Índex de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: l'entorn de treball per a perfeccionistes de temps rècord." +msgid "The install worked successfully! Congratulations!" +msgstr "La instal·lació ha estat un èxit! Enhorabona!" #, python-format msgid "" @@ -1263,9 +1291,6 @@ msgstr "" "\" target=\"_blank\" rel=\"noopener\">notes de llançament per Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "La instal·lació ha estat un èxit! Felicitats!" - #, python-format msgid "" "You are seeing this page because DEBUG=True is in your settings file and you have not configured any " "URLs." msgstr "" -"Està veient aquesta pàgina degut a que el paràmetre DEBUG=Trueconsta al fitxer de configuració i no teniu " -"direccions URLs configurades." +"\"noopener\">DEBUG=Trueconsta al fitxer de configuració i no teniu cap " +"URL configurada." msgid "Django Documentation" msgstr "Documentació de Django" @@ -1285,7 +1310,7 @@ msgid "Topics, references, & how-to’s" msgstr "Temes, referències, & Com es fa" msgid "Tutorial: A Polling App" -msgstr "Programa d'aprenentatge: Una aplicació enquesta" +msgstr "Tutorial: Una aplicació enquesta" msgid "Get started with Django" msgstr "Primers passos amb Django" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 956f774307da..121d7d4a2b4e 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index e7538fbcf439..33c32e194b38 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -1,18 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2020 # Jannis Leidel , 2011 # Jan Papež , 2012 # Jirka Vejrazka , 2011 +# trendspotter, 2020 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2012-2014 -# Vláďa Macek , 2015-2019 +# Vláďa Macek , 2015-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-18 11:37+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 23:20+0000\n" "Last-Translator: Vláďa Macek \n" "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" @@ -28,11 +30,14 @@ msgstr "afrikánsky" msgid "Arabic" msgstr "arabsky" +msgid "Algerian Arabic" +msgstr "alžírskou arabštinou" + msgid "Asturian" msgstr "asturštinou" msgid "Azerbaijani" -msgstr "ázerbájdžánštinou" +msgstr "ázerbájdžánsky" msgid "Bulgarian" msgstr "bulharsky" @@ -151,8 +156,11 @@ msgstr "interlingua" msgid "Indonesian" msgstr "indonésky" +msgid "Igbo" +msgstr "igboštinou" + msgid "Ido" -msgstr "Ido" +msgstr "idem" msgid "Icelandic" msgstr "islandsky" @@ -181,6 +189,9 @@ msgstr "kannadsky" msgid "Korean" msgstr "korejsky" +msgid "Kyrgyz" +msgstr "kyrgyzštinou" + msgid "Luxembourgish" msgstr "lucembursky" @@ -265,9 +276,15 @@ msgstr "tamilsky" msgid "Telugu" msgstr "telužsky" +msgid "Tajik" +msgstr "Tádžik" + msgid "Thai" msgstr "thajsky" +msgid "Turkmen" +msgstr "turkmenštinou" + msgid "Turkish" msgstr "turecky" @@ -307,6 +324,11 @@ msgstr "Statické soubory" msgid "Syndication" msgstr "Syndikace" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Číslo stránky není celé číslo." @@ -378,7 +400,7 @@ msgstr[0] "" msgstr[1] "" "Tato hodnota má mít nejméně %(limit_value)d znaky (nyní má %(show_value)d)." msgstr[2] "" -"Tato hodnota má mít nejméně %(limit_value)d znaků (nyní má %(show_value)d)." +"Tato hodnota má mít nejméně %(limit_value)d znaku (nyní má %(show_value)d)." msgstr[3] "" "Tato hodnota má mít nejméně %(limit_value)d znaků (nyní má %(show_value)d)." @@ -578,6 +600,9 @@ msgstr "Celé číslo" msgid "Big (8 byte) integer" msgstr "Velké číslo (8 bajtů)" +msgid "Small integer" +msgstr "Malé celé číslo" + msgid "IPv4 address" msgstr "Adresa IPv4" @@ -591,6 +616,9 @@ msgstr "Hodnota \"%(value)s\" musí být buď None, True nebo False." msgid "Boolean (Either True, False or None)" msgstr "Pravdivost (buď Ano (True), Ne (False) nebo Nic (None))" +msgid "Positive big integer" +msgstr "Velké kladné celé číslo" + msgid "Positive integer" msgstr "Kladné celé číslo" @@ -601,9 +629,6 @@ msgstr "Kladné malé celé číslo" msgid "Slug (up to %(max_length)s)" msgstr "Identifikátor (nejvýše %(max_length)s znaků)" -msgid "Small integer" -msgstr "Malé celé číslo" - msgid "Text" msgstr "Text" @@ -644,6 +669,12 @@ msgstr "Soubor" msgid "Image" msgstr "Obrázek" +msgid "A JSON object" +msgstr "Objekt typu JSON" + +msgid "Value must be valid JSON." +msgstr "Hodnota musí být platná struktura typu JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -713,7 +744,7 @@ msgstr[0] "" msgstr[1] "" "Tento název souboru má mít nejvýše %(max)d znaky (nyní má %(length)d)." msgstr[2] "" -"Tento název souboru má mít nejvýše %(max)d znaků (nyní má %(length)d)." +"Tento název souboru má mít nejvýše %(max)d znaku (nyní má %(length)d)." msgstr[3] "" "Tento název souboru má mít nejvýše %(max)d znaků (nyní má %(length)d)." @@ -739,6 +770,9 @@ msgstr "Zadejte úplnou hodnotu." msgid "Enter a valid UUID." msgstr "Zadejte platné UUID." +msgid "Enter a valid JSON." +msgstr "Zadejte platnou strukturu typu JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -747,24 +781,30 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Skryté pole %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Data objektu ManagementForm chybí nebo byla pozměněna." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Data objektu ManagementForm chybí nebo s nimi bylo nedovoleně manipulováno. " +"Chybějící pole: %(field_names)s. Pokud problém přetrvává, budete možná muset " +"problém ohlásit." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Odešlete %d nebo méně formulářů." -msgstr[1] "Odešlete %d nebo méně formulářů." -msgstr[2] "Odešlete %d nebo méně formulářů." -msgstr[3] "Odešlete %d nebo méně formulářů." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Odešlete nejvýše %d formulář." +msgstr[1] "Odešlete nejvýše %d formuláře." +msgstr[2] "Odešlete nejvýše %d formuláře." +msgstr[3] "Odešlete nejvýše %d formulářů." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Odešlete %d nebo více formulářů." -msgstr[1] "Odešlete %d nebo více formulářů." -msgstr[2] "Odešlete %d nebo více formulářů." -msgstr[3] "Odešlete %d nebo více formulářů." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Odešlete nejméně %d formulář." +msgstr[1] "Odešlete nejméně %d formuláře." +msgstr[2] "Odešlete nejméně %d formuláře." +msgstr[3] "Odešlete nejméně %d formulářů." msgid "Order" msgstr "Pořadí" @@ -827,17 +867,9 @@ msgstr "Ano" msgid "No" msgstr "Ne" -msgid "Year" -msgstr "Rok" - -msgid "Month" -msgstr "Měsíc" - -msgid "Day" -msgstr "Den" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "ano, ne, možná" +msgstr "ano,ne,možná" #, python-format msgid "%(size)d byte" @@ -1115,7 +1147,7 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "%d rok" msgstr[1] "%d roky" -msgstr[2] "%d let" +msgstr[2] "%d roku" msgstr[3] "%d let" #, python-format @@ -1131,7 +1163,7 @@ msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d týden" msgstr[1] "%d týdny" -msgstr[2] "%d týdnů" +msgstr[2] "%d týdne" msgstr[3] "%d týdnů" #, python-format @@ -1147,7 +1179,7 @@ msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hodina" msgstr[1] "%d hodiny" -msgstr[2] "%d hodin" +msgstr[2] "%d hodiny" msgstr[3] "%d hodin" #, python-format @@ -1158,9 +1190,6 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" msgstr[3] "%d minut" -msgid "0 minutes" -msgstr "0 minut" - msgid "Forbidden" msgstr "Nepřístupné (Forbidden)" @@ -1277,8 +1306,8 @@ msgstr "Cesta \"%(path)s\" neexistuje" msgid "Index of %(directory)s" msgstr "Index adresáře %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Webový framework pro perfekcionisty, kteří mají termín" +msgid "The install worked successfully! Congratulations!" +msgstr "Instalace proběhla úspěšně, gratulujeme!" #, python-format msgid "" @@ -1289,9 +1318,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">poznámky k vydání frameworku Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalace proběhla úspěšně, gratulujeme!" - #, python-format msgid "" "You are seeing this page because , 2012 # Danni Randeris , 2014 -# Erik Wognsen , 2013-2019 +# Erik Ramsgaard Wognsen , 2020-2021 +# Erik Ramsgaard Wognsen , 2013-2019 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 # jonaskoelker , 2012 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 05:53+0000\n" -"Last-Translator: Erik Wognsen \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 18:48+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,6 +30,9 @@ msgstr "afrikaans" msgid "Arabic" msgstr "arabisk" +msgid "Algerian Arabic" +msgstr "algerisk arabisk" + msgid "Asturian" msgstr "Asturisk" @@ -152,6 +156,9 @@ msgstr "interlingua" msgid "Indonesian" msgstr "indonesisk" +msgid "Igbo" +msgstr "igbo" + msgid "Ido" msgstr "Ido" @@ -182,6 +189,9 @@ msgstr "kannada" msgid "Korean" msgstr "koreansk" +msgid "Kyrgyz" +msgstr "kirgisisk" + msgid "Luxembourgish" msgstr "luxembourgisk" @@ -266,9 +276,15 @@ msgstr "tamil" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tadsjikisk" + msgid "Thai" msgstr "thai" +msgid "Turkmen" +msgstr "turkmensk" + msgid "Turkish" msgstr "tyrkisk" @@ -308,6 +324,11 @@ msgstr "Static Files" msgid "Syndication" msgstr "Syndication" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Det sidetal er ikke et heltal" @@ -555,6 +576,9 @@ msgstr "Heltal" msgid "Big (8 byte) integer" msgstr "Stort heltal (8 byte)" +msgid "Small integer" +msgstr "Lille heltal" + msgid "IPv4 address" msgstr "IPv4-adresse" @@ -568,6 +592,9 @@ msgstr "“%(value)s”-værdien skal være enten None, True eller False." msgid "Boolean (Either True, False or None)" msgstr "Boolsk (True, False eller None)" +msgid "Positive big integer" +msgstr "Positivt stort heltal" + msgid "Positive integer" msgstr "Positivt heltal" @@ -578,9 +605,6 @@ msgstr "Positivt lille heltal" msgid "Slug (up to %(max_length)s)" msgstr "\"Slug\" (op til %(max_length)s)" -msgid "Small integer" -msgstr "Lille heltal" - msgid "Text" msgstr "Tekst" @@ -622,6 +646,12 @@ msgstr "Fil" msgid "Image" msgstr "Billede" +msgid "A JSON object" +msgstr "Et JSON-objekt" + +msgid "Value must be valid JSON." +msgstr "Værdien skal være gyldig JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s instans med %(field)s %(value)r findes ikke." @@ -714,6 +744,9 @@ msgstr "Indtast en komplet værdi." msgid "Enter a valid UUID." msgstr "Indtast et gyldigt UUID." +msgid "Enter a valid JSON." +msgstr "Indtast gyldig JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -722,20 +755,26 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Skjult felt %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm-data mangler eller er blevet manipuleret" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm-data mangler eller er blevet pillet ved. Manglende felter: " +"%(field_names)s. Du kan få behov for at oprette en fejlrapport hvis " +"problemet varer ved." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Send venligst %d eller færre formularer." -msgstr[1] "Send venligst %d eller færre formularer." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Send venligst højst %d formular." +msgstr[1] "Send venligst højst %d formularer." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Send venligst %d eller flere formularer." -msgstr[1] "Send venligst %d eller flere formularer." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Send venligst mindst %d formular." +msgstr[1] "Send venligst mindst %d formularer." msgid "Order" msgstr "Rækkefølge" @@ -800,15 +839,7 @@ msgstr "Ja" msgid "No" msgstr "Nej" -msgid "Year" -msgstr "År" - -msgid "Month" -msgstr "Måned" - -msgid "Day" -msgstr "Dag" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ja,nej,måske" @@ -1117,9 +1148,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutter" -msgid "0 minutes" -msgstr "0 minutter" - msgid "Forbidden" msgstr "Forbudt" @@ -1235,8 +1263,8 @@ msgstr "“%(path)s” eksisterer ikke" msgid "Index of %(directory)s" msgstr "Indeks for %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Webframework'et for perfektionister med deadlines." +msgid "The install worked successfully! Congratulations!" +msgstr "Installationen virkede! Tillykke!" #, python-format msgid "" @@ -1246,9 +1274,6 @@ msgstr "" "Vis udgivelsesnoter for Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Installationen virkede! Tillykke!" - #, python-format msgid "" "You are seeing this page because , 2011 # Daniel Roschka , 2016 -# Florian Apolloner , 2018 +# Florian Apolloner , 2018,2020 # Jannis Vajen, 2011,2013 # Jannis Leidel , 2013-2018,2020 # Jannis Vajen, 2016 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-17 22:58+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-17 07:52+0000\n" +"Last-Translator: Florian Apolloner \n" "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,6 +29,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabisch" +msgid "Algerian Arabic" +msgstr "Algerisches Arabisch" + msgid "Asturian" msgstr "Asturisch" @@ -152,6 +155,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesisch" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -182,6 +188,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreanisch" +msgid "Kyrgyz" +msgstr "Kirgisisch" + msgid "Luxembourgish" msgstr "Luxemburgisch" @@ -266,9 +275,15 @@ msgstr "Tamilisch" msgid "Telugu" msgstr "Telugisch" +msgid "Tajik" +msgstr "Tadschikisch" + msgid "Thai" msgstr "Thailändisch" +msgid "Turkmen" +msgstr "Turkmenisch" + msgid "Turkish" msgstr "Türkisch" @@ -582,6 +597,9 @@ msgstr "Wert „%(value)s“ muss entweder None, True oder False sein." msgid "Boolean (Either True, False or None)" msgstr "Boolescher Wert (True, False oder None)" +msgid "Positive big integer" +msgstr "Positive große Ganzzahl" + msgid "Positive integer" msgstr "Positive Ganzzahl" @@ -636,6 +654,12 @@ msgstr "Datei" msgid "Image" msgstr "Bild" +msgid "A JSON object" +msgstr "Ein JSON-Objekt" + +msgid "Value must be valid JSON." +msgstr "Wert muss gültiges JSON sein." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Objekt vom Typ %(model)s mit %(field)s %(value)r existiert nicht." @@ -708,7 +732,7 @@ msgstr[1] "" msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -"Bitte wählen Sie entweder eine Datei aus oder wählen Sie \"Löschen\", nicht " +"Bitte wählen Sie entweder eine Datei aus oder wählen Sie „Löschen“, nicht " "beides." msgid "" @@ -732,6 +756,9 @@ msgstr "Bitte einen vollständigen Wert eingeben." msgid "Enter a valid UUID." msgstr "Bitte eine gültige UUID eingeben." +msgid "Enter a valid JSON." +msgstr "Bitte ein gültiges JSON-Objekt eingeben." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -817,15 +844,7 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "Year" -msgstr "Jahr" - -msgid "Month" -msgstr "Monat" - -msgid "Day" -msgstr "Tag" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "Ja,Nein,Vielleicht" @@ -1134,9 +1153,6 @@ msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -msgid "0 minutes" -msgstr "0 Minuten" - msgid "Forbidden" msgstr "Verboten" diff --git a/django/conf/locale/de_CH/formats.py b/django/conf/locale/de_CH/formats.py index 999feda2efa7..59a9fcb0df9f 100644 --- a/django/conf/locale/de_CH/formats.py +++ b/django/conf/locale/de_CH/formats.py @@ -26,8 +26,8 @@ # these are the separators for non-monetary numbers. For monetary numbers, # the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a # ' (single quote). -# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de -# (in German) and the documentation +# For details, please refer to the documentation and the following link: +# https://www.bk.admin.ch/bk/de/home/dokumentation/sprachen/hilfsmittel-textredaktion/schreibweisungen.html DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '\xa0' # non-breaking space NUMBER_GROUPING = 3 diff --git a/django/conf/locale/dsb/LC_MESSAGES/django.mo b/django/conf/locale/dsb/LC_MESSAGES/django.mo index dd18b76d87be..10059e5ac2ca 100644 Binary files a/django/conf/locale/dsb/LC_MESSAGES/django.mo and b/django/conf/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/dsb/LC_MESSAGES/django.po b/django/conf/locale/dsb/LC_MESSAGES/django.po index d193eba8b932..e539a6fd8192 100644 --- a/django/conf/locale/dsb/LC_MESSAGES/django.po +++ b/django/conf/locale/dsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2019 +# Michael Wolf , 2016-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 22:04+0000\n" +"Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" @@ -24,6 +24,9 @@ msgstr "Afrikaanšćina" msgid "Arabic" msgstr "Arabšćina" +msgid "Algerian Arabic" +msgstr "Algeriska arabšćina" + msgid "Asturian" msgstr "Asturišćina" @@ -147,6 +150,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonešćina" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -177,6 +183,9 @@ msgstr "Kannadišćina" msgid "Korean" msgstr "Korejańšćina" +msgid "Kyrgyz" +msgstr "Kirgišćina" + msgid "Luxembourgish" msgstr "Luxemburgšćina" @@ -261,9 +270,15 @@ msgstr "Tamilšćina" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tadźikišćina" + msgid "Thai" msgstr "Thaišćina" +msgid "Turkmen" +msgstr "Turkmeńšćina" + msgid "Turkish" msgstr "Turkojšćina" @@ -280,7 +295,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbekšćina" msgid "Vietnamese" msgstr "Vietnamšćina" @@ -303,6 +318,11 @@ msgstr "Statiske dataje" msgid "Syndication" msgstr "Syndikacija" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Toś ten numer boka njejo ceła licba" @@ -328,11 +348,15 @@ msgstr "Zapódajśo płaśiwu e-mailowu adresu." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Zapódajśo płaśiwe „adresowe mě“, kótarež jano wopśimujo pismiki, licby, " +"pódsmužki abo wězawki." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Zapódajśo płaśiwe „adresowe mě“, kótarež jano wopśimujo unicodowe pismiki, " +"licby, pódmužki abo wězawki." msgid "Enter a valid IPv4 address." msgstr "Zapódajśo płaśiwu IPv4-adresu." @@ -434,6 +458,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Datajowy sufiks „%(extension)s“ njejo dowólony. Dowólone sufikse su: " +"%(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "Znamuška nul njejsu dowólone." @@ -473,11 +499,11 @@ msgstr "Typ póla: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Gódnota „%(value)s“ musy pak True pak False byś." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Gódnota „%(value)s“ musy pak True, False pak None byś." msgid "Boolean (Either True or False)" msgstr "Boolean (pak True pak False)" @@ -494,12 +520,15 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"Gódnota „%(value)s“ ma njepłaśiwy datumowy format. Musy we formaśe DD.MM." +"YYYY byś." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"Gódnota „%(value)s“ ma korektny format (DD.MM.YYYY), ale jo njepłaśiwy datum." msgid "Date (without time)" msgstr "Datum (bźez casa)" @@ -509,19 +538,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Gódnota „%(value)s“ ma njepłaśiwy format. Musy w formaśe DD.MM.YYYY HH:MM[:" +"ss[.uuuuuu]][TZ] byś." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"Gódnota „%(value)s“ ma korektny format (DD.MM.YYYY HH:MM[:ss[.uuuuuu]][TZ]), " +"ale jo njepłaśiwy datum/cas." msgid "Date (with time)" msgstr "Datum (z casom)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "Gódnota „%(value)s“ musy decimalna licba byś." msgid "Decimal number" msgstr "Decimalna licba" @@ -531,6 +564,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"Gódnota „%(value)s“ ma njepłaśiwy format. Musy we formaśe [DD] " +"[[HH:]MM:]ss[.uuuuuu] byś." msgid "Duration" msgstr "Traśe" @@ -543,14 +578,14 @@ msgstr "Datajowa sćažka" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Gódnota „%(value)s“ musy typ float měś." msgid "Floating point number" msgstr "Licba běžeceje komy" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Gódnota „%(value)s“ musy ceła licba byś." msgid "Integer" msgstr "Integer" @@ -558,6 +593,9 @@ msgstr "Integer" msgid "Big (8 byte) integer" msgstr "Big (8 bajtow) integer" +msgid "Small integer" +msgstr "Mała ceła licba" + msgid "IPv4 address" msgstr "IPv4-adresa" @@ -566,11 +604,14 @@ msgstr "IP-adresa" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Gódnota „%(value)s“ musy pak None, True pak False byś." msgid "Boolean (Either True, False or None)" msgstr "Boolean (pak True, False pak None)" +msgid "Positive big integer" +msgstr "Pozitiwna wjelika ceła licba" + msgid "Positive integer" msgstr "Pozitiwna ceła licba" @@ -581,9 +622,6 @@ msgstr "Pozitiwna mała ceła licba" msgid "Slug (up to %(max_length)s)" msgstr "Adresowe mě (až %(max_length)s)" -msgid "Small integer" -msgstr "Mała ceła licba" - msgid "Text" msgstr "Tekst" @@ -592,12 +630,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Gódnota „%(value)s“ ma njepłaśiwy format. Musy w formaśe HH:MM[:ss[." +"uuuuuu]] byś." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Gódnota „%(value)s“ ma korektny format (HH:MM[:ss[.uuuuuu]]), ale jo " +"njepłaśiwy cas." msgid "Time" msgstr "Cas" @@ -610,7 +652,7 @@ msgstr "Gropne binarne daty" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "„%(value)s“ njejo płaśiwy UUID." msgid "Universally unique identifier" msgstr "Uniwerselnje jadnorazowy identifikator" @@ -621,6 +663,12 @@ msgstr "Dataja" msgid "Image" msgstr "Woraz" +msgid "A JSON object" +msgstr "JSON-objekt" + +msgid "Value must be valid JSON." +msgstr "Gódnota musy płaśiwy JSON byś." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Instanca %(model)s z %(field)s %(value)r njeeksistěrujo." @@ -724,6 +772,9 @@ msgstr "Zapódajśo dopołnu gódnotu." msgid "Enter a valid UUID." msgstr "Zapódajśo płaśiwy UUID." +msgid "Enter a valid JSON." +msgstr "Zapódajśo płaśiwy JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -732,24 +783,30 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Schowane pólo %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Daty ManagementForm feluju abo su sfalšowane" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Daty ManagementForm feluju abo su wobškóźone. Felujuce póla: " +"%(field_names)s. Móžośo zmólkowu rozpšawu pisaś, jolic problem dalej " +"eksistěrujo." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Pšosym wótposćelśo %d formular." -msgstr[1] "Pšosym wótposćelśo %d formulara abo mjenjej." -msgstr[2] "Pšosym wótposćelśo %d formulary abo mjenjej." -msgstr[3] "Pšosym wótposćelśo %d formularow abo mjenjej." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Pšosym wótposćelśo maksimalnje %d formular." +msgstr[1] "Pšosym wótposćelśo maksimalnje %d formulara." +msgstr[2] "Pšosym wótposćelśo maksimalnje %d formulary." +msgstr[3] "Pšosym wótposćelśo maksimalnje %d formularow." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Pšosym wótposćelśo %d formular abo wěcej." -msgstr[1] "Pšosym wótposćelśo %d formulara abo wěcej." -msgstr[2] "Pšosym wótposćelśo %d formulary abo wěcej." -msgstr[3] "Pšosym wótposćelśo %d formularow abo wěcej." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Pšosym wótposćelśo minimalnje %d formular." +msgstr[1] "Pšosym wótposćelśo minimalnje %d formulara." +msgstr[2] "Pšosym wótposćelśo minimalnje %d formulary." +msgstr[3] "Pšosym wótposćelśo minimalnje %d formularow." msgid "Order" msgstr "Rěd" @@ -787,13 +844,15 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "„%(pk)s“ njejo płaśiwa gódnota." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s njedajo se w casowej conje %(current_timezone)s " +"interpretěrowaś; jo dwójozmysłowy abo snaź njeeksistěrujo." msgid "Clear" msgstr "Lašowaś" @@ -813,15 +872,7 @@ msgstr "Jo" msgid "No" msgstr "Ně" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "jo,ně,snaź" @@ -1144,9 +1195,6 @@ msgstr[1] "%d minuśe" msgstr[2] "%d minuty" msgstr[3] "%d minutow" -msgid "0 minutes" -msgstr "0 minutow" - msgid "Forbidden" msgstr "Zakazany" @@ -1159,12 +1207,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Wiźiśo toś tu powěźeńku, dokulaž toś to HTTPS-sedło trjeba głowu 'Referer', " +"aby se pśez waš webwobglědowak słało, ale žedna njejo se pósłała. Toś ta " +"głowa jo trěbna z pśicynow wěstoty, aby so zawěsćiło, až waš wobglědowak " +"njekaprujo se wót tśeśich." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Jolic sćo swój wobglědowak tak konfigurěrował, aby se głowy 'Referer' " +"znjemóžnili, zmóžniśo je pšosym zasej, nanejmjenjej za toś to sedło, za " +"HTTPS-zwiski abo za napšašowanja 'same-origin'." msgid "" "If you are using the tag or " @@ -1173,6 +1228,11 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Jolic woznamjenje wužywaśo " +"abo głowu „Referrer-Policy: no-referrer“ zapśimujośo, wótwónoźćo je. CSRF-" +"šćit pomina se głowu „Referer“, aby striktnu kontrolu referera pśewjasć. " +"Jolic se wó swóju priwatnosć staraśo, wužywajśo alternatiwy ako za wótkazy k sedłam tśeśich." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1187,6 +1247,9 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Jolic sćo swój wobglědowak tak konfigurěrował, aby cookieje znjemóžnili, " +"zmóžniśo je pšosym zasej, nanejmjenjej za toś to sedło abo za napšašowanja " +"„same-origin“." msgid "More information is available with DEBUG=True." msgstr "Dalšne informacije su k dispoziciji z DEBUG=True." @@ -1221,13 +1284,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" +"Njepłaśiwy „%(format)s“ za datumowy znamuškowy rjeśazk „%(datestr)s“ pódany" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "Žedno %(verbose_name)s namakane, kótarež wótpowědujo napšašowanjeju." msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "Bok njejo „last“, ani njedajo se do „int“ konwertěrowaś." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1235,21 +1299,21 @@ msgstr "Njepłaśiwy bok (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Prozna lisćina a „%(class_name)s.allow_empty“ jo False." msgid "Directory indexes are not allowed here." msgstr "Zapisowe indekse njejsu how dowólone." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "„%(path)s“ njeeksistěrujo" #, python-format msgid "Index of %(directory)s" msgstr "Indeks %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django? Web-framework za perfekcionisty z terminami." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalacija jo była wuspěšna! Gratulacija!" #, python-format msgid "" @@ -1260,9 +1324,6 @@ msgstr "" "\"_blank\" rel=\"noopener\">Wersijowe informacije za Django %(version)s " "pokazaś" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalacija jo była wuspěšna! Gratulacija!" - #, python-format msgid "" "You are seeing this page because , 2011,2013,2017 # Giannis Meletakis , 2015 # Jannis Leidel , 2011 -# Nick Mavrakis , 2017-2019 +# Nick Mavrakis , 2017-2020 # Nikolas Demiridis , 2014 # Nick Mavrakis , 2016 # Pãnoș , 2014 @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 12:25+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,6 +33,9 @@ msgstr "Αφρικάνς" msgid "Arabic" msgstr "Αραβικά" +msgid "Algerian Arabic" +msgstr "Αραβικά Αλγερίας" + msgid "Asturian" msgstr "Αστούριας" @@ -156,6 +159,9 @@ msgstr "Ιντερλίνγκουα" msgid "Indonesian" msgstr "Ινδονησιακά" +msgid "Igbo" +msgstr "Ίγκμπο" + msgid "Ido" msgstr "Ίντο" @@ -186,6 +192,9 @@ msgstr "Κανάντα" msgid "Korean" msgstr "Κορεάτικα" +msgid "Kyrgyz" +msgstr "Κιργιζικά" + msgid "Luxembourgish" msgstr "Λουξεμβουργιανά" @@ -270,9 +279,15 @@ msgstr "Διάλεκτος Ταμίλ" msgid "Telugu" msgstr "Τελούγκου" +msgid "Tajik" +msgstr "Τατζικικά" + msgid "Thai" msgstr "Ταϊλάνδης" +msgid "Turkmen" +msgstr "Τουρκμενικά" + msgid "Turkish" msgstr "Τουρκικά" @@ -289,7 +304,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Ουζμπεκικά" msgid "Vietnamese" msgstr "Βιετναμέζικα" @@ -312,6 +327,11 @@ msgstr "Στατικά Αρχεία" msgid "Syndication" msgstr "Syndication" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Ο αριθμός αυτής της σελίδας δεν είναι ακέραιος" @@ -337,11 +357,15 @@ msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδ msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Εισάγετε ένα 'slug' που να αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω " +"παύλες." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Εισάγετε ένα 'slug' που να αποτελείται από Unicode γράμματα, παύλες ή κάτω " +"παύλες." msgid "Enter a valid IPv4 address." msgstr "Εισάγετε μια έγκυρη IPv4 διεύθυνση." @@ -429,6 +453,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Η επέκταση '%(extension)s' του αρχείου δεν επιτρέπεται. Οι επιτρεπόμενες " +"επεκτάσεις είναι: '%(allowed_extensions)s'." msgid "Null characters are not allowed." msgstr "Δεν επιτρέπονται null (μηδενικοί) χαρακτήρες" @@ -469,11 +495,11 @@ msgstr "Πεδίο τύπου: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Η τιμή '%(value)s' πρέπει να είναι True ή False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Η τιμή '%(value)s' πρέπει να είναι True, False, ή None." msgid "Boolean (Either True or False)" msgstr "Boolean (Είτε Αληθές ή Ψευδές)" @@ -490,12 +516,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"Η τιμή του '%(value)s' έχει μια λανθασμένη μορφή ημερομηνίας. Η ημερομηνία " +"θα πρέπει να είναι στην μορφή YYYY-MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"Η τιμή '%(value)s' είναι στην σωστή μορφή (YYYY-MM-DD) αλλά είναι μια " +"λανθασμένη ημερομηνία." msgid "Date (without time)" msgstr "Ημερομηνία (χωρίς την ώρα)" @@ -505,19 +535,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Η τιμή του '%(value)s' έχει μια λανθασμένη μορφή. Η ημερομηνία/ώρα θα πρέπει " +"να είναι στην μορφή YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"Η τιμή '%(value)s' έχει τη σωστή μορφή (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) " +"αλλά δεν αντιστοιχεί σε σωστή ημερομηνία και ώρα." msgid "Date (with time)" msgstr "Ημερομηνία (με ώρα)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "Η τιμή '%(value)s' πρέπει να είναι δεκαδικός αριθμός." msgid "Decimal number" msgstr "Δεκαδικός αριθμός" @@ -527,6 +561,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"Η τιμή '%(value)s' έχει εσφαλμένη μορφή. Πρέπει να είναι της μορφής [DD] " +"[[HH:]MM:]ss[.uuuuuu]." msgid "Duration" msgstr "Διάρκεια" @@ -539,14 +575,14 @@ msgstr "Τοποθεσία αρχείου" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Η '%(value)s' τιμή πρέπει να είναι δεκαδικός." msgid "Floating point number" msgstr "Αριθμός κινητής υποδιαστολής" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Η τιμή '%(value)s' πρέπει να είναι ακέραιος." msgid "Integer" msgstr "Ακέραιος" @@ -554,6 +590,9 @@ msgstr "Ακέραιος" msgid "Big (8 byte) integer" msgstr "Μεγάλος ακέραιος - big integer (8 bytes)" +msgid "Small integer" +msgstr "Μικρός ακέραιος" + msgid "IPv4 address" msgstr "Διεύθυνση IPv4" @@ -562,11 +601,14 @@ msgstr "IP διεύθυνση" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Η τιμή '%(value)s' πρέπει να είναι None, True ή False." msgid "Boolean (Either True, False or None)" msgstr "Boolean (Αληθές, Ψευδές, ή τίποτα)" +msgid "Positive big integer" +msgstr "Μεγάλος θετικός ακέραιος" + msgid "Positive integer" msgstr "Θετικός ακέραιος" @@ -577,9 +619,6 @@ msgstr "Θετικός μικρός ακέραιος" msgid "Slug (up to %(max_length)s)" msgstr "Slug (μέχρι %(max_length)s)" -msgid "Small integer" -msgstr "Μικρός ακέραιος" - msgid "Text" msgstr "Κείμενο" @@ -588,12 +627,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Η τιμή '%(value)s' έχει εσφαλμένη μορφή. Πρέπει να είναι της μορφής HH:MM[:" +"ss[.uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Η τιμή '%(value)s' έχει τη σωστή μορφή (HH:MM[:ss[.uuuuuu]]) αλλά δεν " +"αντιστοιχή σε σωστή ώρα." msgid "Time" msgstr "Ώρα" @@ -606,7 +649,7 @@ msgstr "Δυαδικά δεδομένα" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "'%(value)s' δεν είναι ένα έγκυρο UUID." msgid "Universally unique identifier" msgstr "Καθολικά μοναδικό αναγνωριστικό" @@ -617,6 +660,12 @@ msgstr "Αρχείο" msgid "Image" msgstr "Εικόνα" +msgid "A JSON object" +msgstr "Ένα αντικείμενο JSON" + +msgid "Value must be valid JSON." +msgstr "Η τιμή πρέπει να είναι έγκυρο JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -716,6 +765,9 @@ msgstr "Εισάγετε μια πλήρης τιμή" msgid "Enter a valid UUID." msgstr "Εισάγετε μια έγκυρη UUID." +msgid "Enter a valid JSON." +msgstr "Εισάγετε ένα έγκυρο JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -724,20 +776,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Κρυφό πεδίο %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Τα δεδομένα του ManagementForm λείπουν ή έχουν αλλοιωθεί" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Παρακαλώ υποβάλλετε %d ή λιγότερες φόρμες." -msgstr[1] "Παρακαλώ υποβάλλετε %d ή λιγότερες φόρμες." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Παρακαλώ υποβάλλετε %d ή περισσότερες φόρμες." -msgstr[1] "Παρακαλώ υποβάλλετε %d ή περισσότερες φόρμες." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Ταξινόμηση" @@ -776,13 +831,15 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" δεν είναι έγκυρη τιμή." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"Η ημερομηνία %(datetime)s δεν μπόρεσε να μετατραπεί στην ζώνη ώρας " +"%(current_timezone)s. Ίσως να είναι ασαφής ή να μην υπάρχει." msgid "Clear" msgstr "Εκκαθάριση" @@ -802,15 +859,7 @@ msgstr "Ναι" msgid "No" msgstr "Όχι" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ναι,όχι,ίσως" @@ -1119,9 +1168,6 @@ msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -msgid "0 minutes" -msgstr "0 λεπτά" - msgid "Forbidden" msgstr "Απαγορευμένο" @@ -1134,12 +1180,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Βλέπετε αυτό το μήνυμα επειδή αυτή η HTTPS σελίδα απαιτεί από τον Web " +"browser σας να σταλεί ένας 'Referer header', όμως τίποτα δεν στάλθηκε. Αυτός " +"ο header είναι απαραίτητος για λόγους ασφαλείας, για να εξασφαλιστεί ότι ο " +"browser δεν έχει γίνει hijacked από τρίτους." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Αν οι 'Referer' headers είναι απενεργοποιημένοι στον browser σας από εσάς, " +"παρακαλούμε να τους ξανά-ενεργοποιήσετε, τουλάχιστον για αυτό το site ή για " +"τις συνδέσεις HTTPS ή για τα 'same-origin' requests." msgid "" "If you are using the tag or " @@ -1148,6 +1201,12 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Αν χρησιμοποιείτε την ετικέτα ή συμπεριλαμβάνετε την κεφαλίδα (header) 'Referrer-Policy: no-referrer', " +"παρακαλούμε αφαιρέστε τα. Η προστασία CSRF απαιτεί την κεφαλίδα 'Referer' να " +"κάνει αυστηρό έλεγχο στον referer. Αν κύριο μέλημα σας είναι η ιδιωτικότητα, " +"σκεφτείτε να χρησιμοποιήσετε εναλλακτικές μεθόδους όπως για συνδέσμους από άλλες ιστοσελίδες." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1162,6 +1221,9 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Αν τα cookies είναι απενεργοποιημένα στον browser σας από εσάς, παρακαλούμε " +"να τα ξανά-ενεργοποιήσετε, τουλάχιστον για αυτό το site ή για τα 'same-" +"origin' requests." msgid "More information is available with DEBUG=True." msgstr "Περισσότερες πληροφορίες είναι διαθέσιμες με DEBUG=True." @@ -1196,6 +1258,8 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" +"Λανθασμένη μορφή ημερομηνίας '%(datestr)s' για την επιλεγμένη μορφή " +"'%(format)s'" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1203,6 +1267,8 @@ msgstr "Δεν βρέθηκαν %(verbose_name)s που να ικανοποιο msgid "Page is not “last”, nor can it be converted to an int." msgstr "" +"Η σελίδα δεν έχει την τιμή 'last' υποδηλώνοντας την τελευταία σελίδα, ούτε " +"μπορεί να μετατραπεί σε ακέραιο." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1210,21 +1276,21 @@ msgstr "Άκυρη σελίδα (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Άδεια λίστα και το \"%(class_name)s.allow_empty\" είναι False." msgid "Directory indexes are not allowed here." msgstr "Τα ευρετήρια καταλόγων δεν επιτρέπονται εδώ." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "Το \"%(path)s\" δεν υπάρχει" #, python-format msgid "Index of %(directory)s" msgstr "Ευρετήριο του %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: το Web framework για τελειομανείς με προθεσμίες." +msgid "The install worked successfully! Congratulations!" +msgstr "Η εγκατάσταση δούλεψε με επιτυχία! Συγχαρητήρια!" #, python-format msgid "" @@ -1235,9 +1301,6 @@ msgstr "" "\" target=\"_blank\" rel=\"noopener\">σημειώσεις κυκλοφορίας για το " "Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Η εγκατάσταση δούλεψε με επιτυχία! Συγχαρητήρια!" - #, python-format msgid "" "You are seeing this page because \n" @@ -191,194 +191,210 @@ msgid "Indonesian" msgstr "" #: conf/global_settings.py:96 -msgid "Ido" +msgid "Igbo" msgstr "" #: conf/global_settings.py:97 -msgid "Icelandic" +msgid "Ido" msgstr "" #: conf/global_settings.py:98 -msgid "Italian" +msgid "Icelandic" msgstr "" #: conf/global_settings.py:99 -msgid "Japanese" +msgid "Italian" msgstr "" #: conf/global_settings.py:100 -msgid "Georgian" +msgid "Japanese" msgstr "" #: conf/global_settings.py:101 -msgid "Kabyle" +msgid "Georgian" msgstr "" #: conf/global_settings.py:102 -msgid "Kazakh" +msgid "Kabyle" msgstr "" #: conf/global_settings.py:103 -msgid "Khmer" +msgid "Kazakh" msgstr "" #: conf/global_settings.py:104 -msgid "Kannada" +msgid "Khmer" msgstr "" #: conf/global_settings.py:105 -msgid "Korean" +msgid "Kannada" msgstr "" #: conf/global_settings.py:106 -msgid "Luxembourgish" +msgid "Korean" msgstr "" #: conf/global_settings.py:107 -msgid "Lithuanian" +msgid "Kyrgyz" msgstr "" #: conf/global_settings.py:108 -msgid "Latvian" +msgid "Luxembourgish" msgstr "" #: conf/global_settings.py:109 -msgid "Macedonian" +msgid "Lithuanian" msgstr "" #: conf/global_settings.py:110 -msgid "Malayalam" +msgid "Latvian" msgstr "" #: conf/global_settings.py:111 -msgid "Mongolian" +msgid "Macedonian" msgstr "" #: conf/global_settings.py:112 -msgid "Marathi" +msgid "Malayalam" msgstr "" #: conf/global_settings.py:113 -msgid "Burmese" +msgid "Mongolian" msgstr "" #: conf/global_settings.py:114 -msgid "Norwegian Bokmål" +msgid "Marathi" msgstr "" #: conf/global_settings.py:115 -msgid "Nepali" +msgid "Burmese" msgstr "" #: conf/global_settings.py:116 -msgid "Dutch" +msgid "Norwegian Bokmål" msgstr "" #: conf/global_settings.py:117 -msgid "Norwegian Nynorsk" +msgid "Nepali" msgstr "" #: conf/global_settings.py:118 -msgid "Ossetic" +msgid "Dutch" msgstr "" #: conf/global_settings.py:119 -msgid "Punjabi" +msgid "Norwegian Nynorsk" msgstr "" #: conf/global_settings.py:120 -msgid "Polish" +msgid "Ossetic" msgstr "" #: conf/global_settings.py:121 -msgid "Portuguese" +msgid "Punjabi" msgstr "" #: conf/global_settings.py:122 -msgid "Brazilian Portuguese" +msgid "Polish" msgstr "" #: conf/global_settings.py:123 -msgid "Romanian" +msgid "Portuguese" msgstr "" #: conf/global_settings.py:124 -msgid "Russian" +msgid "Brazilian Portuguese" msgstr "" #: conf/global_settings.py:125 -msgid "Slovak" +msgid "Romanian" msgstr "" #: conf/global_settings.py:126 -msgid "Slovenian" +msgid "Russian" msgstr "" #: conf/global_settings.py:127 -msgid "Albanian" +msgid "Slovak" msgstr "" #: conf/global_settings.py:128 -msgid "Serbian" +msgid "Slovenian" msgstr "" #: conf/global_settings.py:129 -msgid "Serbian Latin" +msgid "Albanian" msgstr "" #: conf/global_settings.py:130 -msgid "Swedish" +msgid "Serbian" msgstr "" #: conf/global_settings.py:131 -msgid "Swahili" +msgid "Serbian Latin" msgstr "" #: conf/global_settings.py:132 -msgid "Tamil" +msgid "Swedish" msgstr "" #: conf/global_settings.py:133 -msgid "Telugu" +msgid "Swahili" msgstr "" #: conf/global_settings.py:134 -msgid "Thai" +msgid "Tamil" msgstr "" #: conf/global_settings.py:135 -msgid "Turkish" +msgid "Telugu" msgstr "" #: conf/global_settings.py:136 -msgid "Tatar" +msgid "Tajik" msgstr "" #: conf/global_settings.py:137 -msgid "Udmurt" +msgid "Thai" msgstr "" #: conf/global_settings.py:138 -msgid "Ukrainian" +msgid "Turkmen" msgstr "" #: conf/global_settings.py:139 -msgid "Urdu" +msgid "Turkish" msgstr "" #: conf/global_settings.py:140 -msgid "Uzbek" +msgid "Tatar" msgstr "" #: conf/global_settings.py:141 -msgid "Vietnamese" +msgid "Udmurt" msgstr "" #: conf/global_settings.py:142 -msgid "Simplified Chinese" +msgid "Ukrainian" msgstr "" #: conf/global_settings.py:143 +msgid "Urdu" +msgstr "" + +#: conf/global_settings.py:144 +msgid "Uzbek" +msgstr "" + +#: conf/global_settings.py:145 +msgid "Vietnamese" +msgstr "" + +#: conf/global_settings.py:146 +msgid "Simplified Chinese" +msgstr "" + +#: conf/global_settings.py:147 msgid "Traditional Chinese" msgstr "" @@ -386,7 +402,7 @@ msgstr "" msgid "Messages" msgstr "" -#: contrib/sitemaps/apps.py:7 +#: contrib/sitemaps/apps.py:8 msgid "Site Maps" msgstr "" @@ -398,78 +414,84 @@ msgstr "" msgid "Syndication" msgstr "" -#: core/paginator.py:48 +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +#: core/paginator.py:30 +msgid "…" +msgstr "" + +#: core/paginator.py:51 msgid "That page number is not an integer" msgstr "" -#: core/paginator.py:50 +#: core/paginator.py:53 msgid "That page number is less than 1" msgstr "" -#: core/paginator.py:55 +#: core/paginator.py:58 msgid "That page contains no results" msgstr "" -#: core/validators.py:20 +#: core/validators.py:22 msgid "Enter a valid value." msgstr "" -#: core/validators.py:91 forms/fields.py:671 +#: core/validators.py:93 forms/fields.py:664 msgid "Enter a valid URL." msgstr "" -#: core/validators.py:145 +#: core/validators.py:147 msgid "Enter a valid integer." msgstr "" -#: core/validators.py:156 +#: core/validators.py:158 msgid "Enter a valid email address." msgstr "" #. Translators: "letters" means latin letters: a-z and A-Z. -#: core/validators.py:230 +#: core/validators.py:259 msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:237 +#: core/validators.py:266 msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -#: core/validators.py:246 core/validators.py:266 +#: core/validators.py:275 core/validators.py:295 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:251 core/validators.py:267 +#: core/validators.py:280 core/validators.py:296 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:261 core/validators.py:265 +#: core/validators.py:290 core/validators.py:294 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:295 +#: core/validators.py:324 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:301 +#: core/validators.py:330 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:334 +#: core/validators.py:363 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:343 +#: core/validators.py:372 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:353 +#: core/validators.py:382 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -480,7 +502,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:368 +#: core/validators.py:397 #, python-format msgid "" "Ensure this value has at most %(limit_value)d character (it has " @@ -491,25 +513,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:387 forms/fields.py:292 forms/fields.py:327 +#: core/validators.py:416 forms/fields.py:292 forms/fields.py:327 msgid "Enter a number." msgstr "" -#: core/validators.py:389 +#: core/validators.py:418 #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." msgstr[0] "" msgstr[1] "" -#: core/validators.py:394 +#: core/validators.py:423 #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." msgstr[0] "" msgstr[1] "" -#: core/validators.py:399 +#: core/validators.py:428 #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." @@ -518,22 +540,22 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:461 +#: core/validators.py:490 #, python-format msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" -#: core/validators.py:513 +#: core/validators.py:543 msgid "Null characters are not allowed." msgstr "" -#: db/models/base.py:1187 forms/models.py:760 +#: db/models/base.py:1197 forms/models.py:768 msgid "and" msgstr "" -#: db/models/base.py:1189 +#: db/models/base.py:1199 #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." msgstr "" @@ -569,197 +591,197 @@ msgstr "" msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:939 +#: db/models/fields/__init__.py:958 #, python-format msgid "“%(value)s” value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:940 +#: db/models/fields/__init__.py:959 #, python-format msgid "“%(value)s” value must be either True, False, or None." msgstr "" -#: db/models/fields/__init__.py:942 +#: db/models/fields/__init__.py:961 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1002 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:1047 +#: db/models/fields/__init__.py:1096 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:1096 +#: db/models/fields/__init__.py:1145 #, python-format msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -#: db/models/fields/__init__.py:1098 db/models/fields/__init__.py:1241 +#: db/models/fields/__init__.py:1147 db/models/fields/__init__.py:1290 #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" -#: db/models/fields/__init__.py:1101 +#: db/models/fields/__init__.py:1150 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:1239 +#: db/models/fields/__init__.py:1288 #, python-format msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -#: db/models/fields/__init__.py:1243 +#: db/models/fields/__init__.py:1292 #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" -#: db/models/fields/__init__.py:1247 +#: db/models/fields/__init__.py:1296 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:1395 +#: db/models/fields/__init__.py:1444 #, python-format msgid "“%(value)s” value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:1397 +#: db/models/fields/__init__.py:1446 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:1536 +#: db/models/fields/__init__.py:1585 #, python-format msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" -#: db/models/fields/__init__.py:1539 +#: db/models/fields/__init__.py:1588 msgid "Duration" msgstr "" -#: db/models/fields/__init__.py:1589 +#: db/models/fields/__init__.py:1638 msgid "Email address" msgstr "" -#: db/models/fields/__init__.py:1612 +#: db/models/fields/__init__.py:1661 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:1678 +#: db/models/fields/__init__.py:1727 #, python-format msgid "“%(value)s” value must be a float." msgstr "" -#: db/models/fields/__init__.py:1680 +#: db/models/fields/__init__.py:1729 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:1718 +#: db/models/fields/__init__.py:1767 #, python-format msgid "“%(value)s” value must be an integer." msgstr "" -#: db/models/fields/__init__.py:1720 +#: db/models/fields/__init__.py:1769 msgid "Integer" msgstr "" -#: db/models/fields/__init__.py:1803 +#: db/models/fields/__init__.py:1852 msgid "Big (8 byte) integer" msgstr "" -#: db/models/fields/__init__.py:1819 +#: db/models/fields/__init__.py:1867 +msgid "Small integer" +msgstr "" + +#: db/models/fields/__init__.py:1875 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1850 +#: db/models/fields/__init__.py:1906 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:1930 db/models/fields/__init__.py:1931 +#: db/models/fields/__init__.py:1986 db/models/fields/__init__.py:1987 #, python-format msgid "“%(value)s” value must be either None, True or False." msgstr "" -#: db/models/fields/__init__.py:1933 +#: db/models/fields/__init__.py:1989 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:1976 +#: db/models/fields/__init__.py:2043 msgid "Positive big integer" msgstr "" -#: db/models/fields/__init__.py:1989 +#: db/models/fields/__init__.py:2056 msgid "Positive integer" msgstr "" -#: db/models/fields/__init__.py:2002 +#: db/models/fields/__init__.py:2069 msgid "Positive small integer" msgstr "" -#: db/models/fields/__init__.py:2016 +#: db/models/fields/__init__.py:2083 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:2048 -msgid "Small integer" -msgstr "" - -#: db/models/fields/__init__.py:2055 +#: db/models/fields/__init__.py:2115 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:2083 +#: db/models/fields/__init__.py:2181 #, python-format msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -#: db/models/fields/__init__.py:2085 +#: db/models/fields/__init__.py:2183 #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" -#: db/models/fields/__init__.py:2088 +#: db/models/fields/__init__.py:2186 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:2214 +#: db/models/fields/__init__.py:2312 msgid "URL" msgstr "" -#: db/models/fields/__init__.py:2236 +#: db/models/fields/__init__.py:2334 msgid "Raw binary data" msgstr "" -#: db/models/fields/__init__.py:2301 +#: db/models/fields/__init__.py:2399 #, python-format msgid "“%(value)s” is not a valid UUID." msgstr "" -#: db/models/fields/__init__.py:2303 +#: db/models/fields/__init__.py:2401 msgid "Universally unique identifier" msgstr "" -#: db/models/fields/files.py:231 +#: db/models/fields/files.py:225 msgid "File" msgstr "" -#: db/models/fields/files.py:377 +#: db/models/fields/files.py:373 msgid "Image" msgstr "" @@ -771,30 +793,30 @@ msgstr "" msgid "Value must be valid JSON." msgstr "" -#: db/models/fields/related.py:786 +#: db/models/fields/related.py:790 #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" -#: db/models/fields/related.py:788 +#: db/models/fields/related.py:792 msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:1041 +#: db/models/fields/related.py:1045 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1095 +#: db/models/fields/related.py:1099 #, python-format msgid "%(from)s-%(to)s relationship" msgstr "" -#: db/models/fields/related.py:1096 +#: db/models/fields/related.py:1100 #, python-format msgid "%(from)s-%(to)s relationships" msgstr "" -#: db/models/fields/related.py:1138 +#: db/models/fields/related.py:1142 msgid "Many-to-many relationship" msgstr "" @@ -812,40 +834,40 @@ msgstr "" msgid "Enter a whole number." msgstr "" -#: forms/fields.py:398 forms/fields.py:1139 +#: forms/fields.py:391 forms/fields.py:1132 msgid "Enter a valid date." msgstr "" -#: forms/fields.py:422 forms/fields.py:1140 +#: forms/fields.py:415 forms/fields.py:1133 msgid "Enter a valid time." msgstr "" -#: forms/fields.py:450 +#: forms/fields.py:443 msgid "Enter a valid date/time." msgstr "" -#: forms/fields.py:484 +#: forms/fields.py:477 msgid "Enter a valid duration." msgstr "" -#: forms/fields.py:485 +#: forms/fields.py:478 #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." msgstr "" -#: forms/fields.py:545 +#: forms/fields.py:538 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -#: forms/fields.py:546 +#: forms/fields.py:539 msgid "No file was submitted." msgstr "" -#: forms/fields.py:547 +#: forms/fields.py:540 msgid "The submitted file is empty." msgstr "" -#: forms/fields.py:549 +#: forms/fields.py:542 #, python-format msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." msgid_plural "" @@ -853,103 +875,106 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms/fields.py:552 +#: forms/fields.py:545 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -#: forms/fields.py:613 +#: forms/fields.py:606 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: forms/fields.py:775 forms/fields.py:865 forms/models.py:1296 +#: forms/fields.py:768 forms/fields.py:858 forms/models.py:1309 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:866 forms/fields.py:981 forms/models.py:1295 +#: forms/fields.py:859 forms/fields.py:974 forms/models.py:1308 msgid "Enter a list of values." msgstr "" -#: forms/fields.py:982 +#: forms/fields.py:975 msgid "Enter a complete value." msgstr "" -#: forms/fields.py:1198 +#: forms/fields.py:1191 msgid "Enter a valid UUID." msgstr "" -#: forms/fields.py:1228 +#: forms/fields.py:1221 msgid "Enter a valid JSON." msgstr "" #. Translators: This is the default suffix added to form field labels -#: forms/forms.py:78 +#: forms/forms.py:76 msgid ":" msgstr "" -#: forms/forms.py:205 +#: forms/forms.py:203 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" -#: forms/formsets.py:93 -msgid "ManagementForm data is missing or has been tampered with" +#: forms/formsets.py:61 +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" -#: forms/formsets.py:345 +#: forms/formsets.py:370 #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:352 +#: forms/formsets.py:377 #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:379 forms/formsets.py:386 +#: forms/formsets.py:405 forms/formsets.py:412 msgid "Order" msgstr "" -#: forms/formsets.py:391 +#: forms/formsets.py:417 msgid "Delete" msgstr "" -#: forms/models.py:755 +#: forms/models.py:763 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:759 +#: forms/models.py:767 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:765 +#: forms/models.py:773 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" -#: forms/models.py:774 +#: forms/models.py:782 msgid "Please correct the duplicate values below." msgstr "" -#: forms/models.py:1096 +#: forms/models.py:1109 msgid "The inline value did not match the parent instance." msgstr "" -#: forms/models.py:1180 +#: forms/models.py:1193 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -#: forms/models.py:1298 +#: forms/models.py:1311 #, python-format msgid "“%(pk)s” is not a valid value." msgstr "" @@ -961,63 +986,63 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" -#: forms/widgets.py:398 +#: forms/widgets.py:403 msgid "Clear" msgstr "" -#: forms/widgets.py:399 +#: forms/widgets.py:404 msgid "Currently" msgstr "" -#: forms/widgets.py:400 +#: forms/widgets.py:405 msgid "Change" msgstr "" -#: forms/widgets.py:709 +#: forms/widgets.py:714 msgid "Unknown" msgstr "" -#: forms/widgets.py:710 +#: forms/widgets.py:715 msgid "Yes" msgstr "" -#: forms/widgets.py:711 +#: forms/widgets.py:716 msgid "No" msgstr "" #. Translators: Please do not add spaces around commas. -#: template/defaultfilters.py:790 +#: template/defaultfilters.py:805 msgid "yes,no,maybe" msgstr "" -#: template/defaultfilters.py:819 template/defaultfilters.py:836 +#: template/defaultfilters.py:834 template/defaultfilters.py:851 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:838 +#: template/defaultfilters.py:853 #, python-format msgid "%s KB" msgstr "" -#: template/defaultfilters.py:840 +#: template/defaultfilters.py:855 #, python-format msgid "%s MB" msgstr "" -#: template/defaultfilters.py:842 +#: template/defaultfilters.py:857 #, python-format msgid "%s GB" msgstr "" -#: template/defaultfilters.py:844 +#: template/defaultfilters.py:859 #, python-format msgid "%s TB" msgstr "" -#: template/defaultfilters.py:846 +#: template/defaultfilters.py:861 #, python-format msgid "%s PB" msgstr "" @@ -1038,11 +1063,11 @@ msgstr "" msgid "AM" msgstr "" -#: utils/dateformat.py:149 +#: utils/dateformat.py:145 msgid "midnight" msgstr "" -#: utils/dateformat.py:151 +#: utils/dateformat.py:147 msgid "noon" msgstr "" @@ -1333,7 +1358,7 @@ msgid "or" msgstr "" #. Translators: This string is used as a separator between list elements -#: utils/text.py:255 utils/timesince.py:83 +#: utils/text.py:255 utils/timesince.py:94 msgid ", " msgstr "" @@ -1454,14 +1479,14 @@ msgstr "" msgid "No %(verbose_name_plural)s available" msgstr "" -#: views/generic/dates.py:589 +#: views/generic/dates.py:594 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -#: views/generic/dates.py:623 +#: views/generic/dates.py:628 #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" @@ -1500,21 +1525,18 @@ msgid "Index of %(directory)s" msgstr "" #: views/templates/default_urlconf.html:7 -msgid "Django: the Web framework for perfectionists with deadlines." +#: views/templates/default_urlconf.html:221 +msgid "The install worked successfully! Congratulations!" msgstr "" -#: views/templates/default_urlconf.html:346 +#: views/templates/default_urlconf.html:207 #, python-format msgid "" "View release notes for Django %(version)s" msgstr "" -#: views/templates/default_urlconf.html:368 -msgid "The install worked successfully! Congratulations!" -msgstr "" - -#: views/templates/default_urlconf.html:369 +#: views/templates/default_urlconf.html:222 #, python-format msgid "" "You are seeing this page because , 2012-2013 -# Baptiste Darthenay , 2013-2019 +# Batist D 🐍 , 2012-2013 +# Batist D 🐍 , 2013-2019 # batisteo , 2011 # Dinu Gherman , 2011 # kristjan , 2011 +# Matthieu Desplantes , 2021 # Nikolay Korotkiy , 2017-2018 # Robin van der Vliet , 2019 # Adamo Mesha , 2012 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-13 08:22+0000\n" +"Last-Translator: Matthieu Desplantes \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -30,6 +31,9 @@ msgstr "Afrikansa" msgid "Arabic" msgstr "Araba" +msgid "Algerian Arabic" +msgstr "Alĝeria araba" + msgid "Asturian" msgstr "Asturia" @@ -153,6 +157,9 @@ msgstr "Interlingvaa" msgid "Indonesian" msgstr "Indoneza" +msgid "Igbo" +msgstr "Igba" + msgid "Ido" msgstr "Ido" @@ -183,6 +190,9 @@ msgstr "Kanara" msgid "Korean" msgstr "Korea" +msgid "Kyrgyz" +msgstr "Kirgiza" + msgid "Luxembourgish" msgstr "Lukszemburga" @@ -267,9 +277,15 @@ msgstr "Tamila" msgid "Telugu" msgstr "Telugua" +msgid "Tajik" +msgstr "Taĝika" + msgid "Thai" msgstr "Taja" +msgid "Turkmen" +msgstr "Turkmena" + msgid "Turkish" msgstr "Turka" @@ -286,7 +302,7 @@ msgid "Urdu" msgstr "Urdua" msgid "Uzbek" -msgstr "" +msgstr "Uzbeka" msgid "Vietnamese" msgstr "Vjetnama" @@ -309,6 +325,11 @@ msgstr "Statikaj dosieroj" msgid "Syndication" msgstr "Abonrilato" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Tuo paĝnumero ne estas entjero" @@ -481,6 +502,8 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"La valoro “%(value)s” havas malĝustan datformaton. Ĝi devas esti en la " +"formato JJJJ-MM-TT." #, python-format msgid "" @@ -537,7 +560,7 @@ msgstr "Glitkoma nombro" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "La valoro “%(value)s” devas esti entjero." msgid "Integer" msgstr "Entjero" @@ -545,6 +568,9 @@ msgstr "Entjero" msgid "Big (8 byte) integer" msgstr "Granda (8 bitoka) entjero" +msgid "Small integer" +msgstr "Malgranda entjero" + msgid "IPv4 address" msgstr "IPv4-adreso" @@ -558,6 +584,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Buleo (Vera, Malvera aŭ Neniu)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Pozitiva entjero" @@ -568,9 +597,6 @@ msgstr "Pozitiva malgranda entjero" msgid "Slug (up to %(max_length)s)" msgstr "Ĵetonvorto (ĝis %(max_length)s)" -msgid "Small integer" -msgstr "Malgranda entjero" - msgid "Text" msgstr "Teksto" @@ -608,6 +634,12 @@ msgstr "Dosiero" msgid "Image" msgstr "Bildo" +msgid "A JSON object" +msgstr "JSON-objekto" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s kazo kun %(field)s %(value)r ne ekzistas." @@ -703,6 +735,9 @@ msgstr "Enigu kompletan valoron." msgid "Enter a valid UUID." msgstr "Enigu validan UUID-n." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -711,20 +746,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Kaŝita kampo %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm datumoj mankas, aŭ estas tuŝaĉitaj kun" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Bonvolu sendi %d aŭ malpli formularojn." -msgstr[1] "Bonvolu sendi %d aŭ malpli formularojn." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Bonvolu sendi %d aŭ pli formularojn." -msgstr[1] "Bonvolu sendi %d aŭ pli formularojn." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Ordo" @@ -786,15 +824,7 @@ msgstr "Jes" msgid "No" msgstr "Ne" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "jes,ne,eble" @@ -1103,9 +1133,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutoj" -msgid "0 minutes" -msgstr "0 minutoj" - msgid "Forbidden" msgstr "Malpermesa" @@ -1201,14 +1228,14 @@ msgstr "Dosierujaj indeksoj ne estas permesitaj tie." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” ne ekzistas" #, python-format msgid "Index of %(directory)s" msgstr "Indekso de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Dĵango: la retframo por perfektemuloj kun limdatoj" +msgid "The install worked successfully! Congratulations!" +msgstr "La instalado sukcesis! Gratulojn!" #, python-format msgid "" @@ -1218,9 +1245,6 @@ msgstr "" "Vidu eldonajn notojn por Dĵango %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "La instalado sukcesis! Gratulojn!" - #, python-format msgid "" "You are seeing this page because , 2014 # Amanda Copete, 2017 # Antoni Aloy , 2011-2014,2017,2019 +# Claude Paroz , 2020 # Diego Andres Sanabria Martin , 2012 # Diego Schulz , 2012 -# Ernesto Avilés, 2015-2016 -# Ernesto Avilés, 2014 -# Ernesto Avilés, 2020 +# e4db27214f7e7544f2022c647b585925_bb0e321, 2015-2016 +# e4db27214f7e7544f2022c647b585925_bb0e321, 2014 +# e4db27214f7e7544f2022c647b585925_bb0e321, 2020 # Ernesto Rico Schmidt , 2017 -# franchukelly , 2011 +# 8cb2d5a716c3c9a99b6d20472609a4d5_6d03802 , 2011 # Ignacio José Lizarán Rus , 2019 # Igor Támara , 2015 # Jannis Leidel , 2011 @@ -25,14 +26,15 @@ # ntrrgc , 2013 # Pablo, 2015 # Sebastián Magrí, 2013 +# Uriel Medina , 2020-2021 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-08 08:24+0000\n" -"Last-Translator: Ernesto Avilés\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-11 06:03+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -47,6 +49,9 @@ msgstr "Africano" msgid "Arabic" msgstr "Árabe" +msgid "Algerian Arabic" +msgstr "Árabe argelino" + msgid "Asturian" msgstr "Asturiano" @@ -170,6 +175,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesio" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -200,6 +208,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Coreano" +msgid "Kyrgyz" +msgstr "Kirguís" + msgid "Luxembourgish" msgstr "Luxenburgués" @@ -284,9 +295,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tayiko" + msgid "Thai" msgstr "Tailandés" +msgid "Turkmen" +msgstr "Turcomanos" + msgid "Turkish" msgstr "Turco" @@ -303,7 +320,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbeko" msgid "Vietnamese" msgstr "Vietnamita" @@ -326,6 +343,11 @@ msgstr "Archivos estáticos" msgid "Syndication" msgstr "Sindicación" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Este número de página no es un entero" @@ -358,6 +380,8 @@ msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o " +"medios de Unicode." msgid "Enter a valid IPv4 address." msgstr "Introduzca una dirección IPv4 válida." @@ -396,8 +420,8 @@ msgstr[0] "" "Asegúrese de que este valor tenga al menos %(limit_value)d caracter (tiene " "%(show_value)d)." msgstr[1] "" -"Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene " -"%(show_value)d)." +"Asegúrese de que este valor tenga al menos %(limit_value)d carácter(es) " +"(tiene%(show_value)d)." #, python-format msgid "" @@ -443,6 +467,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"La extensión de archivo “%(extension)s” no esta permitida. Las extensiones " +"permitidas son: %(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "Los caracteres nulos no están permitidos." @@ -482,11 +508,11 @@ msgstr "Campo de tipo: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "“%(value)s”: el valor debe ser Verdadero o Falso." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "“%(value)s”: el valor debe ser Verdadero, Falso o Nulo." msgid "Boolean (Either True or False)" msgstr "Booleano (Verdadero o Falso)" @@ -503,12 +529,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"“%(value)s” : el valor tiene un formato de fecha inválido. Debería estar en " +"el formato YYYY-MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"“%(value)s” : el valor tiene el formato correcto (YYYY-MM-DD) pero es una " +"fecha inválida." msgid "Date (without time)" msgstr "Fecha (sin hora)" @@ -518,19 +548,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"“%(value)s”: el valor tiene un formato inválido. Debería estar en el formato " +"YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"“%(value)s”: el valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ]) pero es una fecha inválida." msgid "Date (with time)" msgstr "Fecha (con hora)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "“%(value)s”: el valor debe ser un número decimal." msgid "Decimal number" msgstr "Número decimal" @@ -540,6 +574,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"“%(value)s”: el valor tiene un formato inválido. Debería estar en el formato " +"[DD] [[HH:]MM:]ss[.uuuuuu]" msgid "Duration" msgstr "Duración" @@ -552,14 +588,14 @@ msgstr "Ruta de fichero" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "“%(value)s”: el valor debería ser un número de coma flotante." msgid "Floating point number" msgstr "Número en coma flotante" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "“%(value)s”: el valor debería ser un numero entero" msgid "Integer" msgstr "Entero" @@ -567,6 +603,9 @@ msgstr "Entero" msgid "Big (8 byte) integer" msgstr "Entero grande (8 bytes)" +msgid "Small integer" +msgstr "Entero corto" + msgid "IPv4 address" msgstr "Dirección IPv4" @@ -575,11 +614,14 @@ msgstr "Dirección IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "“%(value)s”: el valor debería ser None, Verdadero o Falso." msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" +msgid "Positive big integer" +msgstr "Entero grande positivo" + msgid "Positive integer" msgstr "Entero positivo" @@ -590,9 +632,6 @@ msgstr "Entero positivo corto" msgid "Slug (up to %(max_length)s)" msgstr "Slug (hasta %(max_length)s)" -msgid "Small integer" -msgstr "Entero corto" - msgid "Text" msgstr "Texto" @@ -601,12 +640,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"“%(value)s”: el valor tiene un formato inválido. Debería estar en el formato " +"HH:MM[:ss[.uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"“%(value)s” : el valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero " +"es un tiempo inválido." msgid "Time" msgstr "Hora" @@ -619,7 +662,7 @@ msgstr "Datos binarios en bruto" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "“%(value)s” no es un UUID válido." msgid "Universally unique identifier" msgstr "Identificador universal único" @@ -630,6 +673,12 @@ msgstr "Archivo" msgid "Image" msgstr "Imagen" +msgid "A JSON object" +msgstr "Un objeto JSON" + +msgid "Value must be valid JSON." +msgstr "El valor debe ser un objeto JSON válido." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "La instancia de %(model)s con %(field)s %(value)r no existe." @@ -698,8 +747,8 @@ msgstr[0] "" "Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracter " "(tiene %(length)d)." msgstr[1] "" -"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres " -"(tiene %(length)d)." +"Asegúrese de que este nombre de archivo tenga como máximo %(max)d " +"carácter(es) (tiene %(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" @@ -726,6 +775,9 @@ msgstr "Introduzca un valor completo." msgid "Enter a valid UUID." msgstr "Introduzca un UUID válido." +msgid "Enter a valid JSON." +msgstr "Ingresa un JSON válido." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -734,20 +786,26 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Campo oculto %(name)s) *%(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Los datos de ManagementForm faltan o han sido manipulados" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Los datos de ManagementForm faltan o han sido alterados. Campos que faltan: " +"%(field_names)s. Es posible que deba presentar un informe de error si el " +"problema persiste." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Por favor, envíe %d formulario o menos." -msgstr[1] "Por favor, envíe %d formularios o menos" +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Por favor, envíe %d formulario como máximo." +msgstr[1] "Por favor, envíe %d formularios como máximo." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Por favor, envíe %d formulario o más." -msgstr[1] "Por favor, envíe %d formularios o más." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Por favor, envíe %d formulario como máximo." +msgstr[1] "Por favor, envíe %d formularios como máximo." msgid "Order" msgstr "Orden" @@ -783,13 +841,15 @@ msgstr "Escoja una opción válida. Esa opción no está entre las disponibles." #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s” no es un valor válido." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s no pudo ser interpretado en la zona horaria " +"%(current_timezone)s; podría ser ambiguo o no existir." msgid "Clear" msgstr "Limpiar" @@ -809,17 +869,9 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "sí, no, quizás" +msgstr "sí,no,quizás" #, python-format msgid "%(size)d byte" @@ -1126,9 +1178,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Prohibido" @@ -1141,12 +1190,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Está viendo este mensaje porque este sitio HTTPS requiere que su navegador " +"web envíe un \"encabezado de referencia\", pero no se envió ninguno. Este " +"encabezado es necesario por razones de seguridad, para garantizar que su " +"navegador no sea secuestrado por terceros." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Si ha configurado su navegador para deshabilitar los encabezados \"Referer" +"\", vuelva a habilitarlos, al menos para este sitio, o para conexiones " +"HTTPS, o para solicitudes del \"mismo origen\"." msgid "" "If you are using the tag or " @@ -1155,6 +1211,12 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Si esta utilizando la etiqueta o incluyendo el encabezado \"Referrer-Policy: no-referrer\", elimínelos. " +"La protección CSRF requiere que el encabezado \"Referer\" realice una " +"comprobación estricta del referente. Si le preocupa la privacidad, utilice " +"alternativas como para los enlaces a sitios de " +"terceros." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1169,9 +1231,12 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Si ha configurado su navegador para deshabilitar las cookies, vuelva a " +"habilitarlas, al menos para este sitio o para solicitudes del \"mismo origen" +"\"." msgid "More information is available with DEBUG=True." -msgstr "Se puede ver más información si se establece DEBUG=True." +msgstr "Más información disponible si se establece DEBUG=True." msgid "No year specified" msgstr "No se ha indicado el año" @@ -1202,14 +1267,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "Cadena de fecha no valida “%(datestr)s” dado el formato “%(format)s”" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "No se encontró ningún %(verbose_name)s coincidente con la consulta" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "La página no es la \"última\", ni se puede convertir a un entero." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1217,21 +1282,21 @@ msgstr "Página inválida (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Lista vacía y “%(class_name)s.allow_empty” es Falso" msgid "Directory indexes are not allowed here." msgstr "Los índices de directorio no están permitidos." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” no existe" #, python-format msgid "Index of %(directory)s" msgstr "Índice de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: el marco web para perfeccionistas con plazos." +msgid "The install worked successfully! Congratulations!" +msgstr "¡La instalación funcionó con éxito! ¡Felicitaciones!" #, python-format msgid "" @@ -1242,9 +1307,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">la notas de la versión de Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "¡La instalación funcionó con éxito! ¡Felicitaciones!" - #, python-format msgid "" "You are seeing this page because DEBUG=True está en tu archivo de configuración y no has configurado " -"ningún URL." +"\">DEBUG=True está en su archivo de configuración y no ha configurado " +"ninguna URL." msgid "Django Documentation" msgstr "Documentación de Django" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "Temas, referencias, & como hacer" msgid "Tutorial: A Polling App" msgstr "Tutorial: Una aplicación de encuesta" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index f9805adf194e..9d8e897b40e2 100644 Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po index 8991484d7ef9..f4519de771b2 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/django.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po @@ -4,13 +4,13 @@ # Jannis Leidel , 2011 # lardissone , 2014 # poli , 2014 -# Ramiro Morales, 2013-2019 +# Ramiro Morales, 2013-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-24 15:19+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-21 12:52+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -26,6 +26,9 @@ msgstr "afrikáans" msgid "Arabic" msgstr "árabe" +msgid "Algerian Arabic" +msgstr "Árabe de Argelia" + msgid "Asturian" msgstr "asturiano" @@ -149,6 +152,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "indonesio" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "ido" @@ -179,6 +185,9 @@ msgstr "canarés" msgid "Korean" msgstr "coreano" +msgid "Kyrgyz" +msgstr "kirguís" + msgid "Luxembourgish" msgstr "luxemburgués" @@ -263,9 +272,15 @@ msgstr "tamil" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tayiko" + msgid "Thai" msgstr "tailandés" +msgid "Turkmen" +msgstr "turcomano" + msgid "Turkish" msgstr "turco" @@ -305,6 +320,11 @@ msgstr "Archivos estáticos" msgid "Syndication" msgstr "Sindicación" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "El número de página no es un entero" @@ -559,6 +579,9 @@ msgstr "Entero" msgid "Big (8 byte) integer" msgstr "Entero grande (8 bytes)" +msgid "Small integer" +msgstr "Entero pequeño" + msgid "IPv4 address" msgstr "Dirección IPv4" @@ -572,6 +595,9 @@ msgstr "El valor de “%(value)s” debe ser None, Verdadero o Falso." msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" +msgid "Positive big integer" +msgstr "Entero grande positivo" + msgid "Positive integer" msgstr "Entero positivo" @@ -582,9 +608,6 @@ msgstr "Entero pequeño positivo" msgid "Slug (up to %(max_length)s)" msgstr "Slug (de hasta %(max_length)s caracteres)" -msgid "Small integer" -msgstr "Entero pequeño" - msgid "Text" msgstr "Texto" @@ -626,6 +649,12 @@ msgstr "Archivo" msgid "Image" msgstr "Imagen" +msgid "A JSON object" +msgstr "Un objeto JSON" + +msgid "Value must be valid JSON." +msgstr "El valor debe ser JSON válido." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "No existe una instancia de %(model)s con %(field)s %(value)r." @@ -721,6 +750,9 @@ msgstr "Introduzca un valor completo." msgid "Enter a valid UUID." msgstr "Introduzca un UUID válido." +msgid "Enter a valid JSON." +msgstr "Introduzca JSON válido." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -729,20 +761,24 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Campo oculto %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" -"Los datos correspondientes al ManagementForm no existen o han sido " -"modificados" +"Los datos de ManagementForm faltan o han sido alterados. Campos faltantes: " +"%(field_names)s. Si el problema persiste es posible que deba reportarlo como " +"un error." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Por favor envíe cero o %d formularios." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Por favor envíe un máximo de %d formulario." msgstr[1] "Por favor envíe un máximo de %d formularios." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "Por favor envíe %d o mas formularios." msgstr[1] "Por favor envíe %d o mas formularios." @@ -810,15 +846,7 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "Año" - -msgid "Month" -msgstr "Mes" - -msgid "Day" -msgstr "Día" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "si,no,talvez" @@ -1127,9 +1155,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Prohibido" @@ -1251,8 +1276,8 @@ msgstr "“%(path)s” no existe" msgid "Index of %(directory)s" msgstr "Listado de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: El framework Web para perfeccionistas con deadlines." +msgid "The install worked successfully! Congratulations!" +msgstr "La instalación ha sido exitosa. ¡Felicitaciones!" #, python-format msgid "" @@ -1262,9 +1287,6 @@ msgstr "" "Ver las release notes de Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "La instalación ha sido exitosa. ¡Felicitaciones!" - #, python-format msgid "" "You are seeing this page because , 2015 +# Claude Paroz , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/django/django/" "language/es_CO/)\n" "MIME-Version: 1.0\n" @@ -23,6 +24,9 @@ msgstr "Afrikáans" msgid "Arabic" msgstr "Árabe" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Asturiano" @@ -146,6 +150,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesio" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -176,6 +183,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreano" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luxenburgués" @@ -260,9 +270,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Tailandés" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turco" @@ -552,6 +568,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Entero positivo" @@ -602,6 +621,12 @@ msgstr "Archivo" msgid "Image" msgstr "Imagen" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "La instancia del %(model)s con %(field)s %(value)r no existe." @@ -698,6 +723,9 @@ msgstr "Ingrese un valor completo." msgid "Enter a valid UUID." msgstr "Ingrese un UUID válido." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -781,17 +809,9 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "sí, no, quizás" +msgstr "sí,no,quizás" #, python-format msgid "%(size)d byte" @@ -1098,9 +1118,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Prohibido" diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.mo b/django/conf/locale/es_MX/LC_MESSAGES/django.mo index 497ca815c9c4..2dc6ed6803a0 100644 Binary files a/django/conf/locale/es_MX/LC_MESSAGES/django.mo and b/django/conf/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.po b/django/conf/locale/es_MX/LC_MESSAGES/django.po index 671b67abf432..3b4705dd0112 100644 --- a/django/conf/locale/es_MX/LC_MESSAGES/django.po +++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po @@ -2,15 +2,17 @@ # # Translators: # Abe Estrada, 2011-2013 +# Claude Paroz , 2020 # Jesús Bautista , 2019-2020 +# Sergio Benitez , 2021 # zodman , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-13 02:18+0000\n" -"Last-Translator: Jesús Bautista \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-17 03:02+0000\n" +"Last-Translator: Sergio Benitez \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/" "language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -25,8 +27,11 @@ msgstr "afrikáans" msgid "Arabic" msgstr "Árabe" +msgid "Algerian Arabic" +msgstr "Árabe argelino" + msgid "Asturian" -msgstr "" +msgstr "Asturiano" msgid "Azerbaijani" msgstr "Azerbaijani" @@ -62,7 +67,7 @@ msgid "German" msgstr "Alemán" msgid "Lower Sorbian" -msgstr "" +msgstr "Bajo sorbio" msgid "Greek" msgstr "Griego" @@ -71,7 +76,7 @@ msgid "English" msgstr "Inglés" msgid "Australian English" -msgstr "" +msgstr "Inglés australiano" msgid "British English" msgstr "Inglés británico" @@ -119,7 +124,7 @@ msgid "Irish" msgstr "Irlandés" msgid "Scottish Gaelic" -msgstr "" +msgstr "Gaélico escocés" msgid "Galician" msgstr "Gallego" @@ -134,13 +139,13 @@ msgid "Croatian" msgstr "Croata" msgid "Upper Sorbian" -msgstr "" +msgstr "Alto sorbio" msgid "Hungarian" msgstr "Húngaro" msgid "Armenian" -msgstr "" +msgstr "Armenio" msgid "Interlingua" msgstr "Interlingua" @@ -148,8 +153,11 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesio" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" -msgstr "" +msgstr "Ido" msgid "Icelandic" msgstr "Islandés" @@ -164,7 +172,7 @@ msgid "Georgian" msgstr "Georgiano" msgid "Kabyle" -msgstr "" +msgstr "Cabilio" msgid "Kazakh" msgstr "Kazajstán" @@ -178,6 +186,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Coreano" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "luxemburgués" @@ -262,9 +273,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Tailandés" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turco" @@ -296,22 +313,27 @@ msgid "Messages" msgstr "Mensajes" msgid "Site Maps" -msgstr "" +msgstr "Mapas del sitio" msgid "Static Files" msgstr "Archivos Estáticos" msgid "Syndication" +msgstr "Sindicación" + +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" msgstr "" msgid "That page number is not an integer" -msgstr "" +msgstr "Ese número de página no es un número entero" msgid "That page number is less than 1" -msgstr "" +msgstr "Ese número de página es menor que 1" msgid "That page contains no results" -msgstr "" +msgstr "Esa página no contiene resultados" msgid "Enter a valid value." msgstr "Introduzca un valor válido." @@ -329,11 +351,15 @@ msgstr "Introduzca una dirección de correo electrónico válida." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Introduzca un \"slug\" válido que conste de letras, números, guiones bajos o " +"guiones." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Introduzca un \"slug\" válido que conste de letras Unicode, números, guiones " +"bajos o guiones." msgid "Enter a valid IPv4 address." msgstr "Introduzca una dirección IPv4 válida." @@ -381,7 +407,11 @@ msgid_plural "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres " +"(tiene %(show_value)d)." msgstr[1] "" +"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres " +"(tiene %(show_value)d)." msgid "Enter a number." msgstr "Introduzca un número." @@ -389,8 +419,8 @@ msgstr "Introduzca un número." #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Asegúrese de que no hay más de %(max)s dígito en total." +msgstr[1] "Asegúrese de que no hay más de %(max)s dígitos en total." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." @@ -413,7 +443,7 @@ msgid "" msgstr "" msgid "Null characters are not allowed." -msgstr "" +msgstr "Caracteres nulos no están permitidos." msgid "and" msgstr "y" @@ -424,7 +454,7 @@ msgstr "" #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "" +msgstr "El valor %(value)r no es una opción válida." msgid "This field cannot be null." msgstr "Este campo no puede ser nulo." @@ -449,7 +479,7 @@ msgstr "Campo tipo: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "El valor \"%(value)s\" debe ser Verdadero o Falso. " #, python-format msgid "“%(value)s” value must be either True, False, or None." @@ -534,6 +564,9 @@ msgstr "Entero" msgid "Big (8 byte) integer" msgstr "Entero grande (8 bytes)" +msgid "Small integer" +msgstr "Entero pequeño" + msgid "IPv4 address" msgstr "Dirección IPv4" @@ -547,6 +580,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Entero positivo" @@ -557,9 +593,6 @@ msgstr "Entero positivo pequeño" msgid "Slug (up to %(max_length)s)" msgstr "Slug (hasta %(max_length)s)" -msgid "Small integer" -msgstr "Entero pequeño" - msgid "Text" msgstr "Texto" @@ -582,7 +615,7 @@ msgid "URL" msgstr "URL" msgid "Raw binary data" -msgstr "" +msgstr "Los datos en bruto" #, python-format msgid "“%(value)s” is not a valid UUID." @@ -597,6 +630,12 @@ msgstr "Archivo" msgid "Image" msgstr "Imagen" +msgid "A JSON object" +msgstr "Un objeto JSON" + +msgid "Value must be valid JSON." +msgstr "El valor debe ser JSON válido" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -640,7 +679,7 @@ msgid "Enter a valid date/time." msgstr "Introduzca una fecha/hora válida." msgid "Enter a valid duration." -msgstr "" +msgstr "Introduzca una duración válida." #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." @@ -688,6 +727,9 @@ msgstr "Ingrese un valor completo." msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -696,18 +738,21 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "" -msgid "ManagementForm data is missing or has been tampered with" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "" msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "" msgstr[1] "" @@ -773,17 +818,9 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "Año" - -msgid "Month" -msgstr "Mes" - -msgid "Day" -msgstr "Día" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "sí, no, tal vez" +msgstr "sí,no,tal vez" #, python-format msgid "%(size)d byte" @@ -1090,9 +1127,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Prohibido" @@ -1170,7 +1204,7 @@ msgid "No %(verbose_name)s found matching the query" msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "La página no es \"last\", ni puede ser convertido a un int." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1191,8 +1225,8 @@ msgstr "" msgid "Index of %(directory)s" msgstr "Índice de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" +msgid "The install worked successfully! Congratulations!" +msgstr "¡La instalación funcionó con éxito! ¡Felicidades!" #, python-format msgid "" @@ -1200,9 +1234,6 @@ msgid "" "target=\"_blank\" rel=\"noopener\">release notes for Django %(version)s" msgstr "" -msgid "The install worked successfully! Congratulations!" -msgstr "" - #, python-format msgid "" "You are seeing this page because , 2020 # Eduardo , 2017 # Leonardo J. Caballero G. , 2016 # Sebastián Magrí, 2011 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -26,6 +27,9 @@ msgstr "Afrikáans" msgid "Arabic" msgstr "Árabe" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Asturiano" @@ -149,6 +153,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesio" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -179,6 +186,9 @@ msgstr "Canarés" msgid "Korean" msgstr "Coreano" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luxenburgués" @@ -263,9 +273,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Tailandés" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turco" @@ -555,6 +571,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Entero positivo" @@ -605,6 +624,12 @@ msgstr "Archivo" msgid "Image" msgstr "Imagen" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "la instancia del %(model)s con %(field)s %(value)r no existe." @@ -699,6 +724,9 @@ msgstr "Ingrese un valor completo." msgid "Enter a valid UUID." msgstr "Ingrese un UUID válido." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -783,17 +811,9 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "sí, no, quizás" +msgstr "sí,no,quizás" #, python-format msgid "%(size)d byte" @@ -1100,9 +1120,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Prohibido" diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo index 91b5e24393f4..d4f7c64d16e5 100644 Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po index d934fd91159e..d38446f523dd 100644 --- a/django/conf/locale/et/LC_MESSAGES/django.po +++ b/django/conf/locale/et/LC_MESSAGES/django.po @@ -2,20 +2,21 @@ # # Translators: # eallik , 2011 +# Erlend , 2020 # Jannis Leidel , 2011 # Janno Liivak , 2013-2015 # madisvain , 2011 -# Martin Pajuste , 2014-2015 -# Martin Pajuste , 2016-2017,2019 +# Martin , 2014-2015,2021 +# Martin , 2016-2017,2019-2020 # Marti Raudsepp , 2014,2016 # Ragnar Rebase , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-12-28 02:29+0000\n" -"Last-Translator: Ragnar Rebase \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-22 11:50+0000\n" +"Last-Translator: Martin \n" "Language-Team: Estonian (http://www.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -30,6 +31,9 @@ msgstr "afrikaani" msgid "Arabic" msgstr "araabia" +msgid "Algerian Arabic" +msgstr "Alžeeria Araabia" + msgid "Asturian" msgstr "astuuria" @@ -67,7 +71,7 @@ msgid "German" msgstr "saksa" msgid "Lower Sorbian" -msgstr " alamsorbi" +msgstr "alamsorbi" msgid "Greek" msgstr "kreeka" @@ -153,6 +157,9 @@ msgstr "interlingua" msgid "Indonesian" msgstr "indoneesi" +msgid "Igbo" +msgstr "ibo" + msgid "Ido" msgstr "ido" @@ -183,6 +190,9 @@ msgstr "kannada" msgid "Korean" msgstr "korea" +msgid "Kyrgyz" +msgstr "kirgiisi" + msgid "Luxembourgish" msgstr "letseburgi" @@ -267,9 +277,15 @@ msgstr "tamiili" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tadžiki" + msgid "Thai" msgstr "tai" +msgid "Turkmen" +msgstr "türkmeeni" + msgid "Turkish" msgstr "türgi" @@ -309,6 +325,11 @@ msgstr "Staatilised failid" msgid "Syndication" msgstr "Sündikeerimine" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "See lehe number ei ole täisarv" @@ -562,6 +583,9 @@ msgstr "Täisarv" msgid "Big (8 byte) integer" msgstr "Suur (8 baiti) täisarv" +msgid "Small integer" +msgstr "Väike täisarv" + msgid "IPv4 address" msgstr "IPv4 aadress" @@ -575,6 +599,9 @@ msgstr "“%(value)s” väärtus peab olema kas Tühi, Tõene või Väär." msgid "Boolean (Either True, False or None)" msgstr "Tõeväärtus (Kas tõene, väär või tühi)" +msgid "Positive big integer" +msgstr "Positiivne suur täisarv" + msgid "Positive integer" msgstr "Positiivne täisarv" @@ -585,9 +612,6 @@ msgstr "Positiivne väikene täisarv" msgid "Slug (up to %(max_length)s)" msgstr "Nälk (kuni %(max_length)s märki)" -msgid "Small integer" -msgstr "Väike täisarv" - msgid "Text" msgstr "Tekst" @@ -629,6 +653,12 @@ msgstr "Fail" msgid "Image" msgstr "Pilt" +msgid "A JSON object" +msgstr "JSON objekt" + +msgid "Value must be valid JSON." +msgstr "Väärtus peab olema korrektne JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s isendit %(field)s %(value)r ei leidu." @@ -721,6 +751,9 @@ msgstr "Sisestage täielik väärtus." msgid "Enter a valid UUID." msgstr "Sisestage korrektne UUID." +msgid "Enter a valid JSON." +msgstr "Sisestage korrektne JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -729,20 +762,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Peidetud väli %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm andmed on kadunud või nendega on keegi midagi teinud" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Palun kinnitage %d või vähem vormi." -msgstr[1] "Palun kinnitage %d või vähem vormi." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Palun kinnitage kõige rohkem %d vorm." +msgstr[1] "Palun kinnitage kõige rohkem %d vormi." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Palun kinnitage %d või rohkem vormi." -msgstr[1] "Palun kinnitage %d või rohkem vormi." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Palun kinnitage vähemalt %d vorm." +msgstr[1] "Palun kinnitage vähemalt %d vormi." msgid "Order" msgstr "Järjestus" @@ -806,15 +842,7 @@ msgstr "Jah" msgid "No" msgstr "Ei" -msgid "Year" -msgstr "Aasta" - -msgid "Month" -msgstr "Kuu" - -msgid "Day" -msgstr "Päev" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "jah,ei,võib-olla" @@ -1123,9 +1151,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutit" -msgid "0 minutes" -msgstr "0 minutit" - msgid "Forbidden" msgstr "Keelatud" @@ -1241,8 +1266,8 @@ msgstr "“%(path)s” ei eksisteeri" msgid "Index of %(directory)s" msgstr "%(directory)s sisuloend" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Veebiraamistik tähtaegadega perfektsionistidele." +msgid "The install worked successfully! Congratulations!" +msgstr "Paigaldamine õnnestus! Palju õnne!" #, python-format msgid "" @@ -1252,9 +1277,6 @@ msgstr "" "Vaata release notes Djangole %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Paigaldamine õnnestus! Palju õnne!" - #, python-format msgid "" "You are seeing this page because , 2013,2016 -# Ander Martínez , 2013-2014 -# Eneko Illarramendi , 2017-2019 +# Ander Martinez , 2013-2014 +# Eneko Illarramendi , 2017-2019,2021 # Jannis Leidel , 2011 # jazpillaga , 2011 # julen, 2011-2012 # julen, 2013,2015 +# Mikel Maldonado , 2021 # totorika93 , 2012 -# Unai Zalakain , 2013 +# 67feb0cba3962a6c9f09eb0e43697461_528661a , 2013 # Urtzi Odriozola , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-05-09 16:11+0000\n" +"Last-Translator: Mikel Maldonado \n" "Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,6 +32,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabiera" +msgid "Algerian Arabic" +msgstr "Algeriar Arabiera" + msgid "Asturian" msgstr "Asturiera" @@ -154,6 +158,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesiera" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -184,6 +191,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreera" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Luxenburgera" @@ -268,9 +278,15 @@ msgstr "Tamilera" msgid "Telugu" msgstr "Telugua" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Thailandiera" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Turkiera" @@ -310,6 +326,11 @@ msgstr "Fitxategi estatikoak" msgid "Syndication" msgstr "Sindikazioa" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Orrialde hori ez da zenbaki bat" @@ -461,11 +482,11 @@ msgstr "Eremuaren mota: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "\"%(value)s\" blioa True edo False izan behar da." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "\"%(value)s\" balioa, True, False edo None izan behar da." msgid "Boolean (Either True or False)" msgstr "Boolearra (True edo False)" @@ -482,12 +503,15 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"\"%(value)s\" balioa data formatu okerra dauka. UUUU-HH-EE formatua izan " +"behar da." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"\"%(value)s\" balioa formatu egokia dauka (UUUU-HH-EE), baina data okerra." msgid "Date (without time)" msgstr "Data (ordurik gabe)" @@ -509,7 +533,7 @@ msgstr "Data (orduarekin)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "\"%(value)s\" balioa zenbaki hamartarra izan behar da." msgid "Decimal number" msgstr "Zenbaki hamartarra" @@ -519,6 +543,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"\"%(value)s\" balioa formatu okerra dauka. [EE][[OO:]MM:]ss[.uuuuuu] " +"formatua izan behar du." msgid "Duration" msgstr "Iraupena" @@ -531,14 +557,14 @@ msgstr "Fitxategiaren bidea" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "\"%(value)s\" float izan behar da." msgid "Floating point number" msgstr "Koma higikorreko zenbakia (float)" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "\"%(value)s\" zenbaki osoa izan behar da." msgid "Integer" msgstr "Zenbaki osoa" @@ -546,6 +572,9 @@ msgstr "Zenbaki osoa" msgid "Big (8 byte) integer" msgstr "Zenbaki osoa (handia 8 byte)" +msgid "Small integer" +msgstr "Osoko txikia" + msgid "IPv4 address" msgstr "IPv4 sare-helbidea" @@ -554,11 +583,14 @@ msgstr "IP helbidea" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "\"%(value)s\" None, True edo False izan behar da." msgid "Boolean (Either True, False or None)" msgstr "Boolearra (True, False edo None)" +msgid "Positive big integer" +msgstr "Zenbaki positivo osoa-handia" + msgid "Positive integer" msgstr "Osoko positiboa" @@ -569,9 +601,6 @@ msgstr "Osoko positibo txikia" msgid "Slug (up to %(max_length)s)" msgstr "Slug (gehienez %(max_length)s)" -msgid "Small integer" -msgstr "Osoko txikia" - msgid "Text" msgstr "Testua" @@ -609,6 +638,12 @@ msgstr "Fitxategia" msgid "Image" msgstr "Irudia" +msgid "A JSON object" +msgstr "JSON objektu bat" + +msgid "Value must be valid JSON." +msgstr "Balioa baliozko JSON bat izan behar da." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -703,6 +738,9 @@ msgstr "Sartu balio osoa." msgid "Enter a valid UUID." msgstr "Idatzi baleko UUID bat." +msgid "Enter a valid JSON." +msgstr "Sartu baliozko JSON bat" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -711,20 +749,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(%(name)s eremu ezkutua) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm daturik ez dago edo ez da balekoa." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Bidali formulario %d edo gutxiago, mesedez." -msgstr[1] "Bidali %d formulario edo gutxiago, mesedez." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Gehitu formulario %d edo gehiago" -msgstr[1] "Bidali %d formulario edo gehiago, mesedez." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Ordena" @@ -785,15 +826,7 @@ msgstr "Bai" msgid "No" msgstr "Ez" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "bai,ez,agian" @@ -1102,9 +1135,6 @@ msgid_plural "%d minutes" msgstr[0] "minutu %d" msgstr[1] "%d minutu" -msgid "0 minutes" -msgstr "0 minutu" - msgid "Forbidden" msgstr "Debekatuta" @@ -1206,8 +1236,8 @@ msgstr "" msgid "Index of %(directory)s" msgstr "%(directory)s zerrenda" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: epeekin perfekzionistak direnentzat Web frameworka." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalazioak arrakastaz funtzionatu du! Zorionak!" #, python-format msgid "" @@ -1218,9 +1248,6 @@ msgstr "" "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">argitaratze " "oharrak" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalazioak arrakastaz funtzionatu du! Zorionak!" - #, python-format msgid "" "You are seeing this page because , 2020 # Ali Vakilzade , 2015 # Arash Fazeli , 2012 # Eric Hamiter , 2019 @@ -10,6 +11,8 @@ # MJafar Mashhadi , 2018 # Mohammad Hossein Mojtahedi , 2013,2019 # Pouya Abbassi, 2016 +# Pouya Abbassi, 2016 +# rahim agh , 2020-2021 # Reza Mohammadi , 2013-2016 # Saeed , 2011 # Sina Cheraghi , 2011 @@ -17,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-03 06:19+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -34,6 +37,9 @@ msgstr "آفریکانس" msgid "Arabic" msgstr "عربی" +msgid "Algerian Arabic" +msgstr "عربی الجزایری" + msgid "Asturian" msgstr "آستوری" @@ -128,7 +134,7 @@ msgid "Irish" msgstr "ایرلندی" msgid "Scottish Gaelic" -msgstr "اسکاتلندی" +msgstr "گیلیک اسکاتلندی" msgid "Galician" msgstr "گالیسیایی" @@ -157,6 +163,9 @@ msgstr "اینترلینگوا" msgid "Indonesian" msgstr "اندونزیایی" +msgid "Igbo" +msgstr "ایگبو" + msgid "Ido" msgstr "ایدو" @@ -187,6 +196,9 @@ msgstr "کناده‌ای" msgid "Korean" msgstr "کره‌ای" +msgid "Kyrgyz" +msgstr "قرقیزی" + msgid "Luxembourgish" msgstr "لوگزامبورگی" @@ -271,9 +283,15 @@ msgstr "تامیلی" msgid "Telugu" msgstr "تلوگویی" +msgid "Tajik" +msgstr "تاجیک" + msgid "Thai" msgstr "تایلندی" +msgid "Turkmen" +msgstr "ترکمن" + msgid "Turkish" msgstr "ترکی" @@ -290,7 +308,7 @@ msgid "Urdu" msgstr "اردو" msgid "Uzbek" -msgstr "" +msgstr "ازبکی" msgid "Vietnamese" msgstr "ویتنامی" @@ -313,11 +331,16 @@ msgstr "پرونده‌های استاتیک" msgid "Syndication" msgstr "پیوند" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" -msgstr "شمارهٔ صفحه باید یک عدد باشد" +msgstr "شمارهٔ صفحه یک عدد طبیعی نیست" msgid "That page number is less than 1" -msgstr "شمارهٔ صفحه باید بزرگتر از ۱ باشد" +msgstr "شمارهٔ صفحه کوچکتر از ۱ است" msgid "That page contains no results" msgstr "این صفحه خالی از اطلاعات است" @@ -338,11 +361,14 @@ msgstr "یک ایمیل آدرس معتبر وارد کنید." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"یک \"اسلاگ\" معتبر متشکل از حروف، اعداد، خط زیر یا خط فاصله، وارد کنید. " msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"یک \"اسلاگ\" معتبر وارد کنید که شامل حروف یونیکد، اعداد، خط زیر یا خط فاصله " +"باشد." msgid "Enter a valid IPv4 address." msgstr "یک نشانی IPv4 معتبر وارد کنید." @@ -424,6 +450,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"استفاده از پرونده با پسوند '%(extension)s' مجاز نیست. پسوند‌های مجاز عبارتند " +"از: '%(allowed_extensions)s'" msgid "Null characters are not allowed." msgstr "کاراکترهای تهی مجاز نیستند." @@ -463,11 +491,11 @@ msgstr "فیلد با نوع: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "مقدار «%(value)s» باید True یا False باشد." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "مقدار «%(value)s» باید True یا False یا None باشد." msgid "Boolean (Either True or False)" msgstr "بولی (درست یا غلط)" @@ -484,12 +512,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"مقدار «%(value)s» در قالب نادرستی وارد شده است. تاریخ باید در قالب YYYY-MM-" +"DD باشد." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"مقدار تاریخ «%(value)s» با اینکه در قالب درستی (YYYY-MM-DD) است ولی تاریخ " +"ناممکنی را نشان می‌دهد." msgid "Date (without time)" msgstr "تاریخ (بدون زمان)" @@ -499,19 +531,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"مقدار \"%(value)s\" یک قالب نامعتبر دارد. باید در قالب YYYY-MM-DD HH:MM[:" +"ss[.uuuuuu]][TZ] باشد." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"مقدار \"%(value)s\" یک قالب معتبر دارد (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) " +"اما یک تاریخ/زمان نامعتبر است." msgid "Date (with time)" msgstr "تاریخ (با زمان)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "مقدار '%(value)s' باید عدد دسیمال باشد." msgid "Decimal number" msgstr "عدد دهدهی" @@ -521,6 +557,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"مقدار «%(value)s» در قالب نادرستی وارد شده است. باید در قالب ‎[DD] [HH:" +"[MM:]]ss[.uuuuuu]‎ باشد." msgid "Duration" msgstr "بازهٔ زمانی" @@ -533,14 +571,14 @@ msgstr "مسیر پرونده" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "مقدار «%(value)s» باید عدد اعشاری فلوت باشد." msgid "Floating point number" msgstr "عدد اعشاری" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "مقدار «%(value)s» باید عدد حقیقی باشد." msgid "Integer" msgstr "عدد صحیح" @@ -548,6 +586,9 @@ msgstr "عدد صحیح" msgid "Big (8 byte) integer" msgstr "بزرگ (8 بایت) عدد صحیح" +msgid "Small integer" +msgstr "عدد صحیح کوچک" + msgid "IPv4 address" msgstr "IPv4 آدرس" @@ -556,11 +597,14 @@ msgstr "نشانی IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "مقدار «%(value)s» باید True یا False یا None باشد." msgid "Boolean (Either True, False or None)" msgstr "‌بولی (درست، نادرست یا پوچ)" +msgid "Positive big integer" +msgstr "عدد صحیح مثبت" + msgid "Positive integer" msgstr "عدد صحیح مثبت" @@ -571,9 +615,6 @@ msgstr "مثبت عدد صحیح کوچک" msgid "Slug (up to %(max_length)s)" msgstr "تیتر (حداکثر %(max_length)s)" -msgid "Small integer" -msgstr "عدد صحیح کوچک" - msgid "Text" msgstr "متن" @@ -582,12 +623,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"مقدار «%(value)s» در قالب نادرستی وارد شده است. باید در قالب HH:MM[:ss[." +"uuuuuu]]‎ باشد." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"مقدار «%(value)s» با اینکه در قالب درستی (HH:MM[:ss[.uuuuuu]]‎) است ولی زمان " +"ناممکنی را نشان می‌دهد." msgid "Time" msgstr "زمان" @@ -600,7 +645,7 @@ msgstr "دادهٔ دودویی خام" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "\"%(value)s\" یک UUID معتبر نیست." msgid "Universally unique identifier" msgstr "شناسه منحصر به فرد سراسری" @@ -611,6 +656,12 @@ msgstr "پرونده" msgid "Image" msgstr "تصویر" +msgid "A JSON object" +msgstr "یک شیء JSON" + +msgid "Value must be valid JSON." +msgstr "مقدار، باید یک JSON معتبر باشد." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s با %(field)s %(value)r وجود ندارد." @@ -701,6 +752,9 @@ msgstr "یک مقدار کامل وارد کنید." msgid "Enter a valid UUID." msgstr "یک UUID معتبر وارد کنید." +msgid "Enter a valid JSON." +msgstr "یک JSON معتبر وارد کنید" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -709,20 +763,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(فیلد پنهان %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "اطلاعات ManagementForm ناقص است و یا دستکاری شده است." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "لطفاً %d یا کمتر فرم بفرستید." -msgstr[1] "لطفاً %d یا کمتر فرم بفرستید." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "لطفاً تعدا فرم‌ها حداکثر %d باشد." +msgstr[1] "لطفاً تعداد فرم‌ها حداکثر %d باشد." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "لطفاً %d یا بیشتر فرم بفرستید." -msgstr[1] "لطفاً %d یا بیشتر فرم بفرستید." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "لطفاً تعداد فرم‌ها حداقل %d باشد." +msgstr[1] "لطفاً تعدا فرم‌ ها حداقل %d باشد." msgid "Order" msgstr "ترتیب:" @@ -757,13 +814,15 @@ msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" یک مقدار معتبر نیست." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)sدر محدوده زمانی %(current_timezone)s، قابل تفسیر نیست؛ ممکن است " +"نامشخص باشد یا اصلاً وجود نداشته باشد." msgid "Clear" msgstr "پاک کردن" @@ -783,15 +842,7 @@ msgstr "بله" msgid "No" msgstr "خیر" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "بله،خیر،شاید" @@ -1055,7 +1106,7 @@ msgstr "این مقدار آدرس IPv6 معتبری نیست." #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" -msgstr "" +msgstr "%(truncated_text)s ..." msgid "or" msgstr "یا" @@ -1100,9 +1151,6 @@ msgid_plural "%d minutes" msgstr[0] "%d دقیقه" msgstr[1] "%d دقیقه" -msgid "0 minutes" -msgstr "0 دقیقه" - msgid "Forbidden" msgstr "ممنوع" @@ -1115,12 +1163,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"شما این پیغام را می‌بینید چون این وب‌گاه HTTPS نیازمند یک \"Referer header\" " +"یا سرتیتر ارجاع دهنده است که باید توسط مرورگر شما ارسال شود. این سرتیتر به " +"دلایل امنیتی مورد نیاز است تا اطمینان حاصل شود که مرورگر شما توسط شخص سومی " +"مورد سوءاستفاده قرار نگرفته باشد." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"اگر در مرورگر خود سر تیتر \"Referer\" را غیرفعال کرده‌اید، لطفاً آن را فعال " +"کنید، یا حداقل برای این وب‌گاه یا برای ارتباطات HTTPS و یا برای درخواست‌های " +"\"Same-origin\" فعال کنید." msgid "" "If you are using the tag or " @@ -1129,6 +1184,12 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"اگر شما از تگ استفاده " +"می‌کنید یا سر تیتر \"Referrer-Policy: no-referrer\" را اضافه کرده‌اید، لطفاً " +"آن را حذف کنید. محافظ CSRF به سرتیتر \"Referer\" نیاز دارد تا بتواند بررسی " +"سخت‌گیرانه ارجاع دهنده را انجام دهد. اگر ملاحظاتی در مورد حریم خصوصی دارید از " +"روش‎‌های جایگزین مانند برای ارجاع دادن به وب‌گاه‌های " +"شخص ثالث استفاده کنید." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1143,6 +1204,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"اگر مرورگر خود را تنظیم کرده‌اید که کوکی غیرفعال باشد، لطفاً مجدداً آن را فعال " +"کنید؛ حداقل برای این وب‌گاه یا برای درخواست‌های \"same-origin\"." msgid "More information is available with DEBUG=True." msgstr "اطلاعات بیشتر با DEBUG=True ارائه خواهد شد." @@ -1176,14 +1239,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "نوشته تاریخ \"%(datestr)s\" در قالب \"%(format)s\" نامعتبر است" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "هیچ %(verbose_name)s ای مطابق جستجو پیدا نشد." msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "صفحه \"آخرین\" نیست یا شماره صفحه قابل ترجمه به یک عدد صحیح نیست." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1191,21 +1254,21 @@ msgstr "صفحه‌ی اشتباه (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "لیست خالی و \"%(class_name)s.allow_empty\" برابر False است." msgid "Directory indexes are not allowed here." msgstr "شاخص دایرکتوری اینجا قابل قبول نیست." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "\"%(path)s\" وجود ندارد " #, python-format msgid "Index of %(directory)s" msgstr "فهرست %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "جنگو: فریمورک وب برای کمال گرایانی که محدودیت زمانی دارند." +msgid "The install worked successfully! Congratulations!" +msgstr "نصب درست کار کرد. تبریک می گویم!" #, python-format msgid "" @@ -1216,9 +1279,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">release notes برای نسخه %(version)s " "جنگو" -msgid "The install worked successfully! Congratulations!" -msgstr "نصب درست کار کرد. تبریک می گویم!" - #, python-format msgid "" "You are seeing this page because , 2011 # Jannis Leidel , 2011 # Lasse Liehu , 2015 @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-21 09:38+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-13 07:20+0000\n" "Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" @@ -28,6 +28,9 @@ msgstr "afrikaans" msgid "Arabic" msgstr "arabia" +msgid "Algerian Arabic" +msgstr "Algerian arabia" + msgid "Asturian" msgstr "asturian kieli" @@ -151,6 +154,9 @@ msgstr "interlingua" msgid "Indonesian" msgstr "indonesia" +msgid "Igbo" +msgstr "igbo" + msgid "Ido" msgstr "ido" @@ -173,7 +179,7 @@ msgid "Kazakh" msgstr "kazakin kieli" msgid "Khmer" -msgstr "khmer" +msgstr "khmerin kieli" msgid "Kannada" msgstr "kannada" @@ -181,6 +187,9 @@ msgstr "kannada" msgid "Korean" msgstr "korea" +msgid "Kyrgyz" +msgstr "kirgiisi" + msgid "Luxembourgish" msgstr "luxemburgin kieli" @@ -265,9 +274,15 @@ msgstr "tamili" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tadžikki" + msgid "Thai" msgstr "thain kieli" +msgid "Turkmen" +msgstr "turkmeeni" + msgid "Turkish" msgstr "turkki" @@ -307,6 +322,11 @@ msgstr "Staattiset tiedostot" msgid "Syndication" msgstr "Syndikointi" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Annettu sivunumero ei ole kokonaisluku" @@ -332,18 +352,18 @@ msgstr "Syötä kelvollinen sähköpostiosoite." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" -"Tässä voidaan käyttää vain kirjaimia, numeroita sekä ala- ja tavuviivoja (_ " -"-)." +"Anna lyhytnimi joka koostuu vain kirjaimista, numeroista sekä ala- ja " +"tavuviivoista." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -"Tässä voidaan käyttää vain Unicode-kirjaimia, numeroita sekä ala- ja " -"tavuviivoja." +"Anna lyhytnimi joka koostuu vain Unicode-kirjaimista, numeroista sekä ala- " +"ja tavuviivoista." msgid "Enter a valid IPv4 address." -msgstr "Syötä kelvollinen IPv4-osoite." +msgstr "DSyötä kelvollinen IPv4-osoite." msgid "Enter a valid IPv6 address." msgstr "Syötä kelvollinen IPv6-osoite." @@ -352,7 +372,7 @@ msgid "Enter a valid IPv4 or IPv6 address." msgstr "Syötä kelvollinen IPv4- tai IPv6-osoite." msgid "Enter only digits separated by commas." -msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä." +msgstr "Vain pilkulla erotetut numeromerkit kelpaavat tässä." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." @@ -559,6 +579,9 @@ msgstr "Kokonaisluku" msgid "Big (8 byte) integer" msgstr "Suuri (8-tavuinen) kokonaisluku" +msgid "Small integer" +msgstr "Pieni kokonaisluku" + msgid "IPv4 address" msgstr "IPv4-osoite" @@ -572,6 +595,9 @@ msgstr "%(value)s-arvo tulee olla joko ei mitään, tosi tai epätosi." msgid "Boolean (Either True, False or None)" msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)" +msgid "Positive big integer" +msgstr "suuri positiivinen kokonaisluku" + msgid "Positive integer" msgstr "Positiivinen kokonaisluku" @@ -582,9 +608,6 @@ msgstr "Pieni positiivinen kokonaisluku" msgid "Slug (up to %(max_length)s)" msgstr "Lyhytnimi (enintään %(max_length)s merkkiä)" -msgid "Small integer" -msgstr "Pieni kokonaisluku" - msgid "Text" msgstr "Tekstiä" @@ -624,6 +647,12 @@ msgstr "Tiedosto" msgid "Image" msgstr "Kuva" +msgid "A JSON object" +msgstr "JSON-tietue" + +msgid "Value must be valid JSON." +msgstr "Arvon pitää olla kelvollista JSONia." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s-tietuetta %(field)s-kentällä %(value)r ei ole olemassa." @@ -715,6 +744,9 @@ msgstr "Syötä kokonainen arvo." msgid "Enter a valid UUID." msgstr "Syötä oikea UUID." +msgid "Enter a valid JSON." +msgstr "Syötä oikea JSON-arvo." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -723,18 +755,24 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Piilokenttä %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm-tiedot puuttuvat tai niitä on muutettu" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm-tiedot puuttuvat tai niitä on muutettu. Puuttuvat kentät ovat " +"%(field_names)s. Jos ongelma toistuu, voi olla että joudut raportoimaan " +"tämän bugina." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "Lähetä enintään %d lomake." msgstr[1] "Lähetä enintään %d lomaketta." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "Lähetä vähintään %d lomake." msgstr[1] "Lähetä vähintään %d lomaketta." @@ -799,15 +837,7 @@ msgstr "Kyllä" msgid "No" msgstr "Ei" -msgid "Year" -msgstr "Vuosi" - -msgid "Month" -msgstr "Kuukausi" - -msgid "Day" -msgstr "Päivä" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "kyllä,ei,ehkä" @@ -1116,9 +1146,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuutti" msgstr[1] "%d minuuttia" -msgid "0 minutes" -msgstr "0 minuuttia" - msgid "Forbidden" msgstr "Kielletty" @@ -1235,8 +1262,8 @@ msgstr "\"%(path)s\" ei ole olemassa" msgid "Index of %(directory)s" msgstr "Hakemistolistaus: %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" +msgid "The install worked successfully! Congratulations!" +msgstr "Asennus toimi! Onneksi olkoon!" #, python-format msgid "" @@ -1246,9 +1273,6 @@ msgstr "" "Katso Django %(version)s julkaisutiedot" -msgid "The install worked successfully! Congratulations!" -msgstr "Asennus toimi! Onneksi olkoon!" - #, python-format msgid "" "You are seeing this page because , 2021 # Simon Charette , 2012 -# Claude Paroz , 2013-2019 +# Claude Paroz , 2013-2021 # Claude Paroz , 2011 # Jannis Leidel , 2011 # Jean-Baptiste Mora, 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-29 09:09+0000\n" -"Last-Translator: Claude Paroz \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-02 13:13+0000\n" +"Last-Translator: Bruno Brouard \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,6 +29,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabe" +msgid "Algerian Arabic" +msgstr "Arabe algérien" + msgid "Asturian" msgstr "Asturien" @@ -41,7 +45,7 @@ msgid "Belarusian" msgstr "Biélorusse" msgid "Bengali" -msgstr "Bengalî" +msgstr "Bengali" msgid "Breton" msgstr "Breton" @@ -59,7 +63,7 @@ msgid "Welsh" msgstr "Gallois" msgid "Danish" -msgstr "Dannois" +msgstr "Danois" msgid "German" msgstr "Allemand" @@ -116,7 +120,7 @@ msgid "French" msgstr "Français" msgid "Frisian" -msgstr "Frise" +msgstr "Frison" msgid "Irish" msgstr "Irlandais" @@ -151,6 +155,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonésien" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -181,6 +188,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Coréen" +msgid "Kyrgyz" +msgstr "Kirghiz" + msgid "Luxembourgish" msgstr "Luxembourgeois" @@ -194,7 +204,7 @@ msgid "Macedonian" msgstr "Macédonien" msgid "Malayalam" -msgstr "Malayâlam" +msgstr "Malayalam" msgid "Mongolian" msgstr "Mongole" @@ -206,7 +216,7 @@ msgid "Burmese" msgstr "Birman" msgid "Norwegian Bokmål" -msgstr "Norvégien Bokmal" +msgstr "Norvégien bokmål" msgid "Nepali" msgstr "Népalais" @@ -215,7 +225,7 @@ msgid "Dutch" msgstr "Hollandais" msgid "Norwegian Nynorsk" -msgstr "Norvégien Nynorsk" +msgstr "Norvégien nynorsk" msgid "Ossetic" msgstr "Ossète" @@ -265,9 +275,15 @@ msgstr "Tamoul" msgid "Telugu" msgstr "Télougou" +msgid "Tajik" +msgstr "Tadjik" + msgid "Thai" msgstr "Thaï" +msgid "Turkmen" +msgstr "Turkmène" + msgid "Turkish" msgstr "Turc" @@ -299,7 +315,7 @@ msgid "Messages" msgstr "Messages" msgid "Site Maps" -msgstr "Plans de sites" +msgstr "Plans des sites" msgid "Static Files" msgstr "Fichiers statiques" @@ -307,6 +323,11 @@ msgstr "Fichiers statiques" msgid "Syndication" msgstr "Syndication" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Ce numéro de page n’est pas un nombre entier" @@ -332,8 +353,8 @@ msgstr "Saisissez une adresse de courriel valide." 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." +"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas (_) " +"et des traits d’union." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " @@ -477,14 +498,14 @@ msgstr "La valeur « %(value)s » doit être soit True (vrai), soit False (fau #, python-format msgid "“%(value)s” value must be either True, False, or None." msgstr "" -"La valeur « %(value)s » doit être True (vrai), False (faux) ou None (aucun)." +"La valeur « %(value)s » doit être True (vrai), False (faux) ou None (vide)." msgid "Boolean (Either True or False)" -msgstr "Booléen (soit vrai ou faux)" +msgstr "Booléen (soit True (vrai) ou False (faux))" #, python-format msgid "String (up to %(max_length)s)" -msgstr "Chaîne de caractère (jusqu'à %(max_length)s)" +msgstr "Chaîne de caractères (jusqu'à %(max_length)s)" msgid "Comma-separated integers" msgstr "Des entiers séparés par une virgule" @@ -568,6 +589,9 @@ msgstr "Entier" msgid "Big (8 byte) integer" msgstr "Grand entier (8 octets)" +msgid "Small integer" +msgstr "Petit nombre entier" + msgid "IPv4 address" msgstr "Adresse IPv4" @@ -577,11 +601,13 @@ msgstr "Adresse IP" #, python-format msgid "“%(value)s” value must be either None, True or False." msgstr "" -"La valeur « %(value)s » doit valoir soit None (vide), True (vrai) ou False " -"(faux)." +"La valeur « %(value)s » doit être None (vide), True (vrai) ou False (faux)." msgid "Boolean (Either True, False or None)" -msgstr "Booléen (soit vrai, faux ou nul)" +msgstr "Booléen (soit None (vide), True (vrai) ou False (faux))" + +msgid "Positive big integer" +msgstr "Grand nombre entier positif" msgid "Positive integer" msgstr "Nombre entier positif" @@ -593,9 +619,6 @@ msgstr "Petit nombre entier positif" msgid "Slug (up to %(max_length)s)" msgstr "Slug (jusqu'à %(max_length)s car.)" -msgid "Small integer" -msgstr "Petit nombre entier" - msgid "Text" msgstr "Texte" @@ -637,6 +660,12 @@ msgstr "Fichier" msgid "Image" msgstr "Image" +msgid "A JSON object" +msgstr "Un objet JSON" + +msgid "Value must be valid JSON." +msgstr "La valeur doit respecter la syntaxe JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "L’instance %(model)s avec %(value)r dans %(field)s n’existe pas." @@ -730,6 +759,9 @@ msgstr "Saisissez une valeur complète." msgid "Enter a valid UUID." msgstr "Saisissez un UUID valide." +msgid "Enter a valid JSON." +msgstr "Saisissez du contenu JSON valide." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr " :" @@ -738,20 +770,24 @@ msgstr " :" msgid "(Hidden field %(name)s) %(error)s" msgstr "(champ masqué %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" -"Les données du formulaire ManagementForm sont manquantes ou ont été " -"manipulées" +"Des données du formulaire ManagementForm sont manquantes ou ont été " +"manipulées. Champs manquants : %(field_names)s. Vous pourriez créer un " +"rapport de bogue si le problème persiste." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Ne soumettez pas plus de %d formulaire." -msgstr[1] "Ne soumettez pas plus de %d formulaires." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Veuillez soumettre au plus %d formulaire." +msgstr[1] "Veuillez soumettre au plus %d formulaires." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "Veuillez soumettre au moins %d formulaire." msgstr[1] "Veuillez soumettre au moins %d formulaires." @@ -763,12 +799,12 @@ msgstr "Supprimer" #, python-format msgid "Please correct the duplicate data for %(field)s." -msgstr "Corrigez les données à double dans %(field)s." +msgstr "Corrigez les données en double dans %(field)s." #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -"Corrigez les données à double dans %(field)s qui doit contenir des valeurs " +"Corrigez les données en double dans %(field)s qui doit contenir des valeurs " "uniques." #, python-format @@ -776,11 +812,11 @@ msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" -"Corrigez les données à double dans %(field_name)s qui doit contenir des " +"Corrigez les données en double dans %(field_name)s qui doit contenir des " "valeurs uniques pour la partie %(lookup)s de %(date_field)s." msgid "Please correct the duplicate values below." -msgstr "Corrigez les valeurs à double ci-dessous." +msgstr "Corrigez les valeurs en double ci-dessous." msgid "The inline value did not match the parent instance." msgstr "La valeur en ligne ne correspond pas à l’instance parente." @@ -820,15 +856,7 @@ msgstr "Oui" msgid "No" msgstr "Non" -msgid "Year" -msgstr "Année" - -msgid "Month" -msgstr "Mois" - -msgid "Day" -msgstr "Jour" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "oui,non,peut-être" @@ -1024,7 +1052,7 @@ msgstr "août" msgctxt "abbrev. month" msgid "Sept." -msgstr "sep." +msgstr "sept." msgctxt "abbrev. month" msgid "Oct." @@ -1137,9 +1165,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -msgid "0 minutes" -msgstr "0 minute" - msgid "Forbidden" msgstr "Interdit" @@ -1265,8 +1290,8 @@ msgstr "« %(path)s » n’existe pas" msgid "Index of %(directory)s" msgstr "Index de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django : le cadriciel Web pour les perfectionnistes sous contrainte." +msgid "The install worked successfully! Congratulations!" +msgstr "L’installation s’est déroulée avec succès. Félicitations !" #, python-format msgid "" @@ -1277,9 +1302,6 @@ msgstr "" "releases/\" target=\"_blank\" rel=\"noopener\">notes de publication de " "Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "L’installation s’est déroulée avec succès. Félicitations !" - #, python-format msgid "" "You are seeing this page because , 2020 # Jannis Leidel , 2011 # John Moylan , 2013 # John Stafford , 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,6 +30,9 @@ msgstr "Afracáinis" msgid "Arabic" msgstr "Araibis" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Astúiris" @@ -152,6 +156,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indinéisis" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -182,6 +189,9 @@ msgstr "Cannadais" msgid "Korean" msgstr "Cóiréis" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Lucsamburgach" @@ -266,9 +276,15 @@ msgstr "Tamailis" msgid "Telugu" msgstr "Teileagúis" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Téalainnis" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Tuircis" @@ -565,6 +581,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Boole (Fíor, Bréagach nó Dada)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Slánuimhir dearfach" @@ -615,6 +634,12 @@ msgstr "Comhaid" msgid "Image" msgstr "Íomhá" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -708,6 +733,9 @@ msgstr "" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -798,17 +826,9 @@ msgstr "Tá" msgid "No" msgstr "Níl" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "tá, níl, b'fhéidir" +msgstr "tá,níl,b'fhéidir" #, python-format msgid "%(size)d byte" @@ -1136,9 +1156,6 @@ msgstr[2] "%d nóiméad" msgstr[3] "%d nóiméad" msgstr[4] "%d nóiméad" -msgid "0 minutes" -msgstr "0 nóiméad" - msgid "Forbidden" msgstr "Toirmiscthe" diff --git a/django/conf/locale/gd/LC_MESSAGES/django.mo b/django/conf/locale/gd/LC_MESSAGES/django.mo index 8497b252cced..5173b1a9b65b 100644 Binary files a/django/conf/locale/gd/LC_MESSAGES/django.mo and b/django/conf/locale/gd/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/gd/LC_MESSAGES/django.po b/django/conf/locale/gd/LC_MESSAGES/django.po index 2b8feebf26e7..8c46e5ae4536 100644 --- a/django/conf/locale/gd/LC_MESSAGES/django.po +++ b/django/conf/locale/gd/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Michael Bauer, 2014 -# GunChleoc, 2015-2017 +# GunChleoc, 2015-2017,2021 # GunChleoc, 2015 # GunChleoc, 2014-2015 # Michael Bauer, 2014 @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-12-13 12:46+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-05 09:31+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" @@ -28,6 +28,9 @@ msgstr "Afraganais" msgid "Arabic" msgstr "Arabais" +msgid "Algerian Arabic" +msgstr "Arabais Aildireach" + msgid "Asturian" msgstr "Astùrais" @@ -151,6 +154,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Innd-Innsis" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -181,6 +187,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Coirèanais" +msgid "Kyrgyz" +msgstr "Cìorgasais" + msgid "Luxembourgish" msgstr "Lugsamburgais" @@ -265,9 +274,15 @@ msgstr "Taimilis" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Taidigis" + msgid "Thai" msgstr "Tàidh" +msgid "Turkmen" +msgstr "Turcmanais" + msgid "Turkish" msgstr "Turcais" @@ -307,6 +322,11 @@ msgstr "Faidhlichean stadastaireachd" msgid "Syndication" msgstr "Siondacaideadh" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Chan eil àireamh na duilleige seo 'na àireamh slàn" @@ -595,6 +615,9 @@ msgstr "Àireamh shlàn" msgid "Big (8 byte) integer" msgstr "Mòr-àireamh shlàn (8 baidht)" +msgid "Small integer" +msgstr "Beag-àireamh slàn" + msgid "IPv4 address" msgstr "Seòladh IPv4" @@ -608,6 +631,9 @@ msgstr "Feumaidh “%(value)s” a bhith None, True no False." msgid "Boolean (Either True, False or None)" msgstr "Booleach (True, False no None)" +msgid "Positive big integer" +msgstr "Àireamh shlàn dhearbh" + msgid "Positive integer" msgstr "Àireamh shlàn dhearbh" @@ -618,9 +644,6 @@ msgstr "Beag-àireamh shlàn dhearbh" msgid "Slug (up to %(max_length)s)" msgstr "Sluga (suas ri %(max_length)s)" -msgid "Small integer" -msgstr "Beag-àireamh slàn" - msgid "Text" msgstr "Teacsa" @@ -662,6 +685,12 @@ msgstr "Faidhle" msgid "Image" msgstr "Dealbh" +msgid "A JSON object" +msgstr "Oibseact JSON" + +msgid "Value must be valid JSON." +msgstr "Feumaidh an luach a bhith ’na JSON dligheach." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Chan eil ionstans dhe %(model)s le %(field)s %(value)r ann." @@ -674,11 +703,11 @@ msgstr "Dàimh aonan gu aonan" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "Daimh %(from)s-%(to)s" +msgstr "Dàimh %(from)s-%(to)s" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "Daimhean %(from)s-%(to)s" +msgstr "Dàimhean %(from)s-%(to)s" msgid "Many-to-many relationship" msgstr "Dàimh iomadh rud gu iomadh rud" @@ -765,6 +794,9 @@ msgstr "Cuir a-steach luach slàn." msgid "Enter a valid UUID." msgstr "Cuir a-steach UUID dligheach." +msgid "Enter a valid JSON." +msgstr "Cuir a-steach JSON dligheach." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -773,24 +805,27 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Raon falaichte %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Tha dàta an fhoirm stiùiridh a dhìth no chaidh beantainn ris" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Cuir a-null %d fhoirm no nas lugha dhiubh." -msgstr[1] "Cuir a-null %d fhoirm no nas lugha dhiubh." -msgstr[2] "Cuir a-null %d foirmean no nas lugha dhiubh." -msgstr[3] "Cuir a-null %d foirm no nas lugha dhiubh." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Cuir a-null %d fhoirm no barrachd dhiubh." -msgstr[1] "Cuir a-null %d fhoirm no barrachd dhiubh." -msgstr[2] "Cuir a-null %d foirmean no barrachd dhiubh." -msgstr[3] "Cuir a-null %d foirm no barrachd dhiubh." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" msgid "Order" msgstr "Òrdugh" @@ -856,15 +891,7 @@ msgstr "Tha" msgid "No" msgstr "Chan eil" -msgid "Year" -msgstr "Bliadhna" - -msgid "Month" -msgstr "Mìos" - -msgid "Day" -msgstr "Latha" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "yes,no,maybe" @@ -1187,9 +1214,6 @@ msgstr[1] "%d mhionaid" msgstr[2] "%d mionaidean" msgstr[3] "%d mionaid" -msgid "0 minutes" -msgstr "0 mionaid" - msgid "Forbidden" msgstr "Toirmisgte" @@ -1313,8 +1337,8 @@ msgstr "Chan eil “%(path)s” ann" msgid "Index of %(directory)s" msgstr "Clàr-amais dhe %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: am frèam-obrach-lìn leis a choileanas foirfichean cinn-ama." +msgid "The install worked successfully! Congratulations!" +msgstr "Chaidh a stàladh! Meal do naidheachd!" #, python-format msgid "" @@ -1325,9 +1349,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">nòtaichean sgaoilidh airson Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Chaidh a stàladh! Meal do naidheachd!" - #, python-format msgid "" "You are seeing this page because , 2011-2012 +# 534b44a19bf18d20b71ecc4eb77c572f_db336e9 , 2011-2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2015,2017,2019 +# Meir Kriheli , 2011-2015,2017,2019-2020 # אורי רודברג , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-19 11:47+0000\n" -"Last-Translator: אורי רודברג \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-08-02 13:17+0000\n" +"Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,6 +26,9 @@ msgstr "אפריקאנס" msgid "Arabic" msgstr "ערבית" +msgid "Algerian Arabic" +msgstr "ערבית אלג'ירית" + msgid "Asturian" msgstr "אסטורית" @@ -149,6 +152,9 @@ msgstr "אינטרלינגואה" msgid "Indonesian" msgstr "אינדונזית" +msgid "Igbo" +msgstr "איגבו" + msgid "Ido" msgstr "אידו" @@ -179,6 +185,9 @@ msgstr "קאנאדה" msgid "Korean" msgstr "קוריאנית" +msgid "Kyrgyz" +msgstr "קירגיזית" + msgid "Luxembourgish" msgstr "לוקסמבורגית" @@ -263,9 +272,15 @@ msgstr "טמילית" msgid "Telugu" msgstr "טלגו" +msgid "Tajik" +msgstr "טג'יקית" + msgid "Thai" msgstr "תאילנדית" +msgid "Turkmen" +msgstr "טורקמנית" + msgid "Turkish" msgstr "טורקית" @@ -282,7 +297,7 @@ msgid "Urdu" msgstr "אורדו" msgid "Uzbek" -msgstr "" +msgstr "אוזבקית" msgid "Vietnamese" msgstr "וייטנאמית" @@ -330,11 +345,13 @@ msgstr "נא להזין כתובת דוא\"ל חוקית" msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"יש להזין 'slug' חוקי המכיל אותיות לטיניות, ספרות, קווים תחתונים או מקפים." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"יש להזין 'slug' חוקי המכיל אותיות יוניקוד, ספרות, קווים תחתונים או מקפים." msgid "Enter a valid IPv4 address." msgstr "יש להזין כתובת IPv4 חוקית." @@ -426,6 +443,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"סיומת הקובץ \"%(extension)s\" אסורה. הסיומות המותרות הן: " +"'%(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "תווי NULL אינם מותרים. " @@ -465,11 +484,11 @@ msgstr "שדה מסוג: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "הערך \"%(value)s\" חייב להיות True או False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "\"%(value)s\" חייב להיות אחד מ־True‏, False, או None." msgid "Boolean (Either True or False)" msgstr "בוליאני (אמת או שקר)" @@ -486,12 +505,13 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"הערך \"%(value)s\" מכיל פורמט תאריך לא חוקי. חייב להיות בפורמט YYYY-MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" +msgstr "הערך \"%(value)s\" בפורמט הנכון (YYYY-MM-DD), אך אינו תאריך חוקי." msgid "Date (without time)" msgstr "תאריך (ללא שעה)" @@ -501,19 +521,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"הערך \"%(value)s\" מכיל פורמט לא חוקי. הוא חייב להיות בפורמטYYYY-MM-DD HH:" +"MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"הערך \"%(value)s\" בפורמט הנכון (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) אך אינו " +"מהווה תאריך/שעה חוקיים." msgid "Date (with time)" msgstr "תאריך (כולל שעה)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "הערך \"%(value)s\" חייב להיות מספר עשרוני." msgid "Decimal number" msgstr "מספר עשרוני" @@ -523,6 +547,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"הערך \"%(value)s\" מכיל פורמט לא חוקי. הוא חייב להיות בפורמט [DD] " +"[[HH:]MM:]ss[.uuuuuu]." msgid "Duration" msgstr "משך" @@ -535,7 +561,7 @@ msgstr "נתיב קובץ" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "“%(value)s” חייב להיות מספר נקודה צפה." msgid "Floating point number" msgstr "מספר עשרוני" @@ -558,11 +584,14 @@ msgstr "כתובת IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "\"%(value)s\" חייב להיות אחד מ־None‏, True, או False." msgid "Boolean (Either True, False or None)" msgstr "בוליאני (אמת, שקר או כלום)" +msgid "Positive big integer" +msgstr "מספר שלם גדול וחיובי" + msgid "Positive integer" msgstr "מספר שלם חיובי" @@ -584,12 +613,15 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"הערך “%(value)s” מכיל פורמט לא חוקי. הוא חייב להיות בפורמט HH:MM[:ss[." +"uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"הערך “%(value)s” בפורמט הנכון (HH:MM[:ss[.uuuuuu]]) אך אינו מהווה שעה חוקית." msgid "Time" msgstr "זמן" @@ -602,7 +634,7 @@ msgstr "מידע בינארי גולמי" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "\"%(value)s\" אינו UUID חוקי." msgid "Universally unique identifier" msgstr "מזהה ייחודי אוניברסלי" @@ -613,6 +645,12 @@ msgstr "קובץ" msgid "Image" msgstr "תמונה" +msgid "A JSON object" +msgstr "אובייקט JSON" + +msgid "Value must be valid JSON." +msgstr "הערך חייב להיות JSON חוקי." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "פריט %(model)s עם %(field)s %(value)r אינו קיים." @@ -704,6 +742,9 @@ msgstr "יש להזין ערך שלם." msgid "Enter a valid UUID." msgstr "יש להזין UUID חוקי." +msgid "Enter a valid JSON." +msgstr "נא להזין JSON חוקי." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -771,6 +812,8 @@ msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"לא ניתן לפרש את %(datetime)s באזור הזמן %(current_timezone)s; הוא עשוי להיות " +"דו־משמעי או לא קיים." msgid "Clear" msgstr "לסלק" @@ -790,15 +833,7 @@ msgstr "כן" msgid "No" msgstr "לא" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "כן,לא,אולי" @@ -1121,9 +1156,6 @@ msgstr[1] "%d דקות" msgstr[2] "%d דקות" msgstr[3] "%d דקות" -msgid "0 minutes" -msgstr "0 דקות" - msgid "Forbidden" msgstr "אסור" @@ -1136,12 +1168,17 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"הודעה זו מופיעה מאחר ואתר ה־HTTPS הזה דורש מהדפדפן שלך לשלוח \"Referer header" +"\", אך הוא לא נשלח. זה נדרש מסיבות אבטחה, כדי להבטיח שהדפדפן שלך לא נחטף ע" +"\"י צד שלישי." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"אם ביטלת \"Referer\" headers בדפדפן שלך, נא לאפשר אותם מחדש, לפחות עבור אתר " +"זה, חיבורי HTTPS או בקשות \"same-origin\"." msgid "" "If you are using the tag or " @@ -1150,6 +1187,10 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"אם השתמשת בתגאו הוספת header " +"של “Referrer-Policy: no-referrer”, נא להסיר אותם. הגנת ה־CSRF דורשת" +" ‎“Referer” header לבדיקת ה־referer. אם פרטיות מדאיגה אותך, ניתן להשתמש " +"בתחליפים כמו לקישור אל אתרי צד שלישי." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1163,6 +1204,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"אם ביטלת עוגיות בדפדפן שלך, נא לאפשר אותם מחדש לפחות עבור אתר זה או בקשות " +"“same-origin”." msgid "More information is available with DEBUG=True." msgstr "מידע נוסף זמין עם " @@ -1196,14 +1239,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "מחרוזת תאריך %(datestr)s אינה חוקית בפורמט %(format)s." #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "לא נמצא/ה %(verbose_name)s התואם/ת לשאילתה" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "העמוד אינו \"last\" או לא ניתן להמרה למספר שם." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1211,14 +1254,14 @@ msgstr "עמוד לא חוקי (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "רשימה ריקה ו־“%(class_name)s.allow_empty” הוא False." msgid "Directory indexes are not allowed here." msgstr "אינדקסים על תיקיה אסורים כאן." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "\"%(path)s\" אינו קיים" #, python-format msgid "Index of %(directory)s" @@ -1253,7 +1296,7 @@ msgid "Django Documentation" msgstr "תיעוד Django" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "נושאים, הפניות ומדריכים לביצוע" msgid "Tutorial: A Polling App" msgstr "מדריך ללומד: יישום לסקרים." diff --git a/django/conf/locale/hi/LC_MESSAGES/django.mo b/django/conf/locale/hi/LC_MESSAGES/django.mo index 870aaa65bfbd..b1aa3f68e2f5 100644 Binary files a/django/conf/locale/hi/LC_MESSAGES/django.mo and b/django/conf/locale/hi/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hi/LC_MESSAGES/django.po b/django/conf/locale/hi/LC_MESSAGES/django.po index 9d4557b65aa5..427d0151fc09 100644 --- a/django/conf/locale/hi/LC_MESSAGES/django.po +++ b/django/conf/locale/hi/LC_MESSAGES/django.po @@ -3,15 +3,16 @@ # Translators: # alkuma , 2013 # Chandan kumar , 2012 +# Claude Paroz , 2020 # Jannis Leidel , 2011 # Pratik , 2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Hindi (http://www.transifex.com/django/django/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,6 +26,9 @@ msgstr "अफ़्रीकांस" msgid "Arabic" msgstr "अरबी" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "" @@ -148,6 +152,9 @@ msgstr "इंतर्लिंगुआ" msgid "Indonesian" msgstr "इन्डोनेशियन " +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "" @@ -178,6 +185,9 @@ msgstr "कन्‍नड़" msgid "Korean" msgstr "कोरियन" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "लक्संबर्गी" @@ -262,9 +272,15 @@ msgstr "तमिल" msgid "Telugu" msgstr "तेलुगु" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "थाई" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "तुर्किश" @@ -545,6 +561,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "बूलियन (सही, गलत या कुछ नहीं)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "धनात्मक पूर्णांक" @@ -595,6 +614,12 @@ msgstr "फाइल" msgid "Image" msgstr "छवि" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -681,6 +706,9 @@ msgstr "" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr "" @@ -763,17 +791,9 @@ msgstr "हाँ" msgid "No" msgstr "नहीं" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "हाँ, नहीं, शायद" +msgstr "हाँ,नहीं,शायद" #, python-format msgid "%(size)d byte" @@ -1080,9 +1100,6 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -msgid "0 minutes" -msgstr "" - msgid "Forbidden" msgstr "" diff --git a/django/conf/locale/hsb/LC_MESSAGES/django.mo b/django/conf/locale/hsb/LC_MESSAGES/django.mo index 0f1496af2102..0c8da038fd74 100644 Binary files a/django/conf/locale/hsb/LC_MESSAGES/django.mo and b/django/conf/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hsb/LC_MESSAGES/django.po b/django/conf/locale/hsb/LC_MESSAGES/django.po index 54780386c09a..1d0aa1895844 100644 --- a/django/conf/locale/hsb/LC_MESSAGES/django.po +++ b/django/conf/locale/hsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2019 +# Michael Wolf , 2016-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 21:57+0000\n" +"Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" "MIME-Version: 1.0\n" @@ -24,6 +24,9 @@ msgstr "Afrikaanšćina" msgid "Arabic" msgstr "Arabšćina" +msgid "Algerian Arabic" +msgstr "Algeriska arabšćina" + msgid "Asturian" msgstr "Asturišćina" @@ -147,6 +150,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonezišćina" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -177,6 +183,9 @@ msgstr "Kannadšćina" msgid "Korean" msgstr "Korejšćina" +msgid "Kyrgyz" +msgstr "Kirgišćina" + msgid "Luxembourgish" msgstr "Luxemburgšćina" @@ -261,9 +270,15 @@ msgstr "Tamilšćina" msgid "Telugu" msgstr "Telugušćina" +msgid "Tajik" +msgstr "Tadźikišćina" + msgid "Thai" msgstr "Thaišćina" +msgid "Turkmen" +msgstr "Turkmenšćina" + msgid "Turkish" msgstr "Turkowšćina" @@ -280,7 +295,7 @@ msgid "Urdu" msgstr "Urdušćina" msgid "Uzbek" -msgstr "" +msgstr "Uzbekšćina" msgid "Vietnamese" msgstr "Vietnamšćina" @@ -303,6 +318,11 @@ msgstr "Statiske dataje" msgid "Syndication" msgstr "Syndikacija" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Tute čisko strony cyła ličba njeje." @@ -556,14 +576,14 @@ msgstr "Datajowa šćežka" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Hódnota „%(value)s“ dyrbi decimalna ličba być." msgid "Floating point number" msgstr "Komowa ličba typa float" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Hódnota „%(value)s“ dyrbi integer być." msgid "Integer" msgstr "Integer" @@ -571,6 +591,9 @@ msgstr "Integer" msgid "Big (8 byte) integer" msgstr "Big (8 byte) integer" +msgid "Small integer" +msgstr "Mała cyła ličba" + msgid "IPv4 address" msgstr "IPv4-adresa" @@ -579,11 +602,14 @@ msgstr "IP-adresa" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Hódnota „%(value)s“ dyrbi pak None, True pak False być." msgid "Boolean (Either True, False or None)" msgstr "Boolean (pak True, False pak None)" +msgid "Positive big integer" +msgstr "Pozitiwna wulka cyła ličba" + msgid "Positive integer" msgstr "Pozitiwna cyła ličba" @@ -594,9 +620,6 @@ msgstr "Pozitiwna mała cyła ličba" msgid "Slug (up to %(max_length)s)" msgstr "Adresowe mjeno (hač %(max_length)s)" -msgid "Small integer" -msgstr "Mała cyła ličba" - msgid "Text" msgstr "Tekst" @@ -605,12 +628,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Hódnota „%(value)s“ ma njepłaćiwy format. Dyrbi we formaće HH:MM[:ss[." +"uuuuuu]] być." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Hódnota „%(value)s“ ma korektny format (HH:MM[:ss[.uuuuuu]]), ale je " +"njepłaćiwy čas." msgid "Time" msgstr "Čas" @@ -623,7 +650,7 @@ msgstr "Hrube binarne daty" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "„%(value)s“ płaćiwy UUID njeje." msgid "Universally unique identifier" msgstr "Uniwerselnje jónkróćny identifikator" @@ -634,6 +661,12 @@ msgstr "Dataja" msgid "Image" msgstr "Wobraz" +msgid "A JSON object" +msgstr "JSON-objekt" + +msgid "Value must be valid JSON." +msgstr "Hódnota dyrbi płaćiwy JSON być." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Instanca %(model)s z %(field)s %(value)r njeeksistuje." @@ -735,6 +768,9 @@ msgstr "Zapodajće dospołnu hódnotu." msgid "Enter a valid UUID." msgstr "Zapodajće płaćiwy UUID." +msgid "Enter a valid JSON." +msgstr "Zapodajće płaćiwy JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -743,24 +779,29 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Schowane polo field %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Daty ManagementForm faluja abo su so sfalšowali" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Daty ManagementForm faluja abo su skepsane. Falowace pola: %(field_names)s. " +"Móžeće zmylkowu rozprawu spisać, jeli problem dale eksistuje." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Prošu wotpósćelće %d formular" -msgstr[1] "Prošu wotpósćelće %d formularaj abo mjenje" -msgstr[2] "Prošu wotpósćelće %d formulary abo mjenje" -msgstr[3] "Prošu wotpósćelće %d formularow abo mjenje" +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Prošu wotpósćelće maksimalnje %d formular." +msgstr[1] "Prošu wotpósćelće maksimalnje %d formularaj." +msgstr[2] "Prošu wotpósćelće maksimalnje %d formulary." +msgstr[3] "Prošu wotpósćelće maksimalnje %d formularow." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Prošu wotpósćelće %d formular abo wjace" -msgstr[1] "Prošu wotpósćelće %d formularaj abo wjace" -msgstr[2] "Prošu wotpósćelće %d formulary abo wjace" -msgstr[3] "Prošu wotpósćelće %d formularow abo wjace" +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Prošu wotpósćelće minimalnje %d formular." +msgstr[1] "Prošu wotpósćelće minimalnje %d formularaj." +msgstr[2] "Prošu wotpósćelće minimalnje %d formulary." +msgstr[3] "Prošu wotpósćelće minimalnje %d formularow." msgid "Order" msgstr "Porjad" @@ -797,13 +838,15 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" płaćiwa hódnota njeje." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s njeda so w časowym pasmje %(current_timezone)s interpretować; " +"je snano dwuzmyslny abo njeeksistuje." msgid "Clear" msgstr "Zhašeć" @@ -823,15 +866,7 @@ msgstr "Haj" msgid "No" msgstr "Ně" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "haj,ně,snano" @@ -1154,9 +1189,6 @@ msgstr[1] "%d mjeńšinje" msgstr[2] "%d mjeńšiny" msgstr[3] "%d mjeńšin" -msgid "0 minutes" -msgstr "0 mjeńšin" - msgid "Forbidden" msgstr "Zakazany" @@ -1169,12 +1201,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Widźiće tutu zdźělenku, dokelž HTTPS-sydło „hłowu Referer“ trjeba, zo by so " +"do webwobhladowaka słało, ale njeje so pósłała. Tuta hłowa je z přičinow " +"wěstoty trěbna, zo by so zawěsćiło, zo waš wobhladowak so wot třećich " +"njekapruje." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Jei sće swój wobhladowak tak konfigurował, zo su hłowy „Referer“ " +"znjemóžnjene, zmóžńće je, znajmjeńša za tute sydło abo za HTTPS-zwiski abo " +"za naprašowanja „sameorigin“." msgid "" "If you are using the tag or " @@ -1183,6 +1222,10 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Jeli značku wužiwaće abo hłowu „Referrer-Policy: no-referrer“ zapřijimaće, " +"wotstrońće je prošu. CSRF-škit trjeba hłowu „Referer“ , zo by striktnu " +"kontrolu referer přewjedźe. Jeli so wo priwatnosć staraće, wužiwajće " +"alternatiwy kaž za wotkazy k sydłam třećich." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1197,6 +1240,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Jeli sće swój wobhladowak tak konfigurował, zo su placki znjemóžnjene, " +"zmóžńće je zaso, znajmjeńša za tute sydło abo za naprašowanja „same-origin“." msgid "More information is available with DEBUG=True." msgstr "Z DEBUG=True su dalše informacije k dispoziciji." @@ -1231,13 +1276,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" +"Njepłaćiwy „%(format)s“ za datumowy znamješkowy rjaćazk „%(datestr)s“ podaty" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "Žane %(verbose_name)s namakane, kotrež naprašowanju wotpowěduje" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "Strona „last“ njeje, ani njeda so do int konwertować." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1245,21 +1291,21 @@ msgstr "Njepłaćiwa strona (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Prózdna lisćina a „%(class_name)s.allow_empty“ je False." msgid "Directory indexes are not allowed here." msgstr "Zapisowe indeksy tu dowolone njejsu." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "„%(path)s“ njeeksistuje" #, python-format msgid "Index of %(directory)s" msgstr "Indeks %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Web framework za perfekcionistow z terminami." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalacija bě wuspěšna! Zbožopřeće!" #, python-format msgid "" @@ -1270,9 +1316,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">wersijowe informacije za Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalacija bě wuspěšna! Zbožopřeće!" - #, python-format msgid "" "You are seeing this page because , 2018 -# András Veres-Szentkirályi, 2016-2019 +# András Veres-Szentkirályi, 2016-2021 # Attila Nagy <>, 2012 # Dóra Szendrei , 2017 # Istvan Farkas , 2019 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-18 10:10+0000\n" -"Last-Translator: Istvan Farkas \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-01 15:20+0000\n" +"Last-Translator: András Veres-Szentkirályi\n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -31,6 +31,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arab" +msgid "Algerian Arabic" +msgstr "algériai arab" + msgid "Asturian" msgstr "Asztúriai" @@ -154,6 +157,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonéz" +msgid "Igbo" +msgstr "igbo" + msgid "Ido" msgstr "Ido" @@ -184,6 +190,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreai" +msgid "Kyrgyz" +msgstr "kirgiz" + msgid "Luxembourgish" msgstr "Luxemburgi" @@ -268,9 +277,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "tadzsik" + msgid "Thai" msgstr "Thai" +msgid "Turkmen" +msgstr "türkmén" + msgid "Turkish" msgstr "Török" @@ -310,6 +325,11 @@ msgstr "Statikus fájlok" msgid "Syndication" msgstr "Szindikáció" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Az oldalszám nem egész szám." @@ -570,6 +590,9 @@ msgstr "Egész" msgid "Big (8 byte) integer" msgstr "Nagy egész szám (8 bájtos)" +msgid "Small integer" +msgstr "Kis egész" + msgid "IPv4 address" msgstr "IPv4 cím" @@ -583,6 +606,9 @@ msgstr "Az \"%(value)s\" értéke csak üres, True, vagy False lehet." msgid "Boolean (Either True, False or None)" msgstr "Logikai (True, False vagy None)" +msgid "Positive big integer" +msgstr "Pozitív nagy egész" + msgid "Positive integer" msgstr "Pozitív egész" @@ -593,9 +619,6 @@ msgstr "Pozitív kis egész" msgid "Slug (up to %(max_length)s)" msgstr "URL-barát cím (%(max_length)s hosszig)" -msgid "Small integer" -msgstr "Kis egész" - msgid "Text" msgstr "Szöveg" @@ -637,6 +660,12 @@ msgstr "Fájl" msgid "Image" msgstr "Kép" +msgid "A JSON object" +msgstr "Egy JSON objektum" + +msgid "Value must be valid JSON." +msgstr "Az érték érvényes JSON kell legyen." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s példány %(value)r %(field)s értékkel nem létezik." @@ -732,6 +761,9 @@ msgstr "Adjon meg egy teljes értéket." msgid "Enter a valid UUID." msgstr "Adjon meg egy érvényes UUID-t." +msgid "Enter a valid JSON." +msgstr "Adjon meg egy érvényes JSON-t." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -740,18 +772,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Rejtett mező: %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm adatok hiányoznak vagy belenyúltak" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm adatok hiányoznak vagy hamisításra kerültek. A hiányzó mezők: " +"%(field_names)s. Ha ez többször is előfordul, érdemes bejelenteni hibaként." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "Legfeljebb %d űrlapot küldjön be." msgstr[1] "Legfeljebb %d űrlapot küldjön be." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "Legalább %d űrlapot küldjön be." msgstr[1] "Legalább %d űrlapot küldjön be." @@ -820,15 +857,7 @@ msgstr "Igen" msgid "No" msgstr "Nem" -msgid "Year" -msgstr "Év" - -msgid "Month" -msgstr "Hónap" - -msgid "Day" -msgstr "Nap" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "igen,nem,talán" @@ -1137,9 +1166,6 @@ msgid_plural "%d minutes" msgstr[0] "%d perc" msgstr[1] "%d perc" -msgid "0 minutes" -msgstr "0 perc" - msgid "Forbidden" msgstr "Hozzáférés megtagadva" @@ -1258,9 +1284,8 @@ msgstr "A(z) \"%(path)s\" útvonal nem létezik" msgid "Index of %(directory)s" msgstr "A %(directory)s könyvtár tartalma" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" -"Django: webes keretrendszer azoknak, akiknek a tökéletesség határidőre kell." +msgid "The install worked successfully! Congratulations!" +msgstr "A telepítés sikeresen végződött! Gratulálunk!" #, python-format msgid "" @@ -1271,9 +1296,6 @@ msgstr "" "releases/\" target=\"_blank\" rel=\"noopener\">kiadási megjegyzéseinek " "megtekintése" -msgid "The install worked successfully! Congratulations!" -msgstr "A telepítés sikeresen végződött! Gratulálunk!" - #, python-format msgid "" "You are seeing this page because , 2015-2019 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi , 2016,2020 # rodin , 2011 # rodin , 2013-2016 # sage , 2018-2019 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-18 04:50+0000\n" -"Last-Translator: sage \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 12:25+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -32,6 +32,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arab" +msgid "Algerian Arabic" +msgstr "Arab Aljazair" + msgid "Asturian" msgstr "Asturia" @@ -155,6 +158,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesia" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -185,6 +191,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Korea" +msgid "Kyrgyz" +msgstr "Kirgis" + msgid "Luxembourgish" msgstr "Luksemburg" @@ -269,9 +278,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tajik" + msgid "Thai" msgstr "Thailand" +msgid "Turkmen" +msgstr "Turkmenistan" + msgid "Turkish" msgstr "Turki" @@ -311,6 +326,11 @@ msgstr "Berkas Statis" msgid "Syndication" msgstr "Sindikasi" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Nomor halaman itu bukan sebuah integer" @@ -555,6 +575,9 @@ msgstr "Bilangan Asli" msgid "Big (8 byte) integer" msgstr "Bilangan asli raksasa (8 byte)" +msgid "Small integer" +msgstr "Bilangan asli kecil" + msgid "IPv4 address" msgstr "Alamat IPv4" @@ -568,6 +591,9 @@ msgstr "Nilai “%(value)s” harus berupa None, True, atau False." msgid "Boolean (Either True, False or None)" msgstr "Boolean (Salah satu dari True, False, atau None)" +msgid "Positive big integer" +msgstr "Integer besar positif" + msgid "Positive integer" msgstr "Bilangan asli positif" @@ -578,9 +604,6 @@ msgstr "Bilangan asli kecil positif" msgid "Slug (up to %(max_length)s)" msgstr "Slug (hingga %(max_length)s karakter)" -msgid "Small integer" -msgstr "Bilangan asli kecil" - msgid "Text" msgstr "Teks" @@ -622,6 +645,12 @@ msgstr "Berkas" msgid "Image" msgstr "Gambar" +msgid "A JSON object" +msgstr "Objek JSON" + +msgid "Value must be valid JSON." +msgstr "Nilai harus JSON yang valid." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Salinan %(model)s dengan %(field)s %(value)r tidak ada." @@ -715,6 +744,9 @@ msgstr "Masukkan nilai yang komplet." msgid "Enter a valid UUID." msgstr "Masukan UUID yang benar." +msgid "Enter a valid JSON." +msgstr "Masukkan JSON yang valid." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -723,18 +755,21 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Bidang tersembunyi %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Data ManagementForm hilang atau telah dirusak " +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Pastikan mengirim %d formulir atau lebih sedikit. " +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Kirimkan %d atau lebih formulir." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" msgid "Order" msgstr "Urutan" @@ -799,15 +834,7 @@ msgstr "Ya" msgid "No" msgstr "Tidak" -msgid "Year" -msgstr "Tahun" - -msgid "Month" -msgstr "Bulan" - -msgid "Day" -msgstr "Hari" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ya,tidak,mungkin" @@ -1109,9 +1136,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d menit" -msgid "0 minutes" -msgstr "0 menit" - msgid "Forbidden" msgstr "Terlarang" @@ -1231,9 +1255,8 @@ msgstr "“%(path)s” tidak ada" msgid "Index of %(directory)s" msgstr "Daftar isi %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" -"Django: kerangka kerja Web untuk para perfeksionis dengan tenggat waktu." +msgid "The install worked successfully! Congratulations!" +msgstr "Selamat! Instalasi berjalan lancar!" #, python-format msgid "" @@ -1243,9 +1266,6 @@ msgstr "" "Lihat catatan rilis untuk Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Selamat! Instalasi berjalan lancar!" - #, python-format msgid "" "You are seeing this page because , 2020 +# Mariusz Felisiak , 2020 +# Okpala Olisa , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-30 12:26+0000\n" +"Last-Translator: Mariusz Felisiak \n" +"Language-Team: Igbo (http://www.transifex.com/django/django/language/ig/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ig\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Afrikaans" +msgstr "Afrikaans" + +msgid "Arabic" +msgstr "Arabici" + +msgid "Algerian Arabic" +msgstr "Arabici ndị Algeria " + +msgid "Asturian" +msgstr "Asturian" + +msgid "Azerbaijani" +msgstr "Azerbaijani" + +msgid "Bulgarian" +msgstr "Bulgaria" + +msgid "Belarusian" +msgstr "Belarusia" + +msgid "Bengali" +msgstr "Bengali" + +msgid "Breton" +msgstr "Breton" + +msgid "Bosnian" +msgstr "Bosnian" + +msgid "Catalan" +msgstr "Catalan" + +msgid "Czech" +msgstr "Czech" + +msgid "Welsh" +msgstr "Welsh" + +msgid "Danish" +msgstr "Danishi" + +msgid "German" +msgstr "Germani" + +msgid "Lower Sorbian" +msgstr "Sorbian nke Ala" + +msgid "Greek" +msgstr "Greeki" + +msgid "English" +msgstr "Bekee" + +msgid "Australian English" +msgstr "Bekee ndị Australia" + +msgid "British English" +msgstr "Bekee ndị Britain" + +msgid "Esperanto" +msgstr "Esperanto" + +msgid "Spanish" +msgstr "Spanishi" + +msgid "Argentinian Spanish" +msgstr "Spanishi ndị Argentina" + +msgid "Colombian Spanish" +msgstr "Spanishi ndị Colombia " + +msgid "Mexican Spanish" +msgstr "Spanishi ndị Mexico " + +msgid "Nicaraguan Spanish" +msgstr "Spanishi ndị Nicaraguan" + +msgid "Venezuelan Spanish" +msgstr "Spanishi ndị Venezuela " + +msgid "Estonian" +msgstr "Estonian" + +msgid "Basque" +msgstr "Basque" + +msgid "Persian" +msgstr "Persian" + +msgid "Finnish" +msgstr "Finnishi" + +msgid "French" +msgstr "Fụrenchị" + +msgid "Frisian" +msgstr "Frisian" + +msgid "Irish" +msgstr "Irishi" + +msgid "Scottish Gaelic" +msgstr "Scottish Gaelici" + +msgid "Galician" +msgstr "Galiciani" + +msgid "Hebrew" +msgstr "Hibru" + +msgid "Hindi" +msgstr "Hindi" + +msgid "Croatian" +msgstr "Croatian" + +msgid "Upper Sorbian" +msgstr "Sorbian nke Elu" + +msgid "Hungarian" +msgstr "Hungarian" + +msgid "Armenian" +msgstr "Armeniani" + +msgid "Interlingua" +msgstr "Interlingua" + +msgid "Indonesian" +msgstr "Indonesian" + +msgid "Igbo" +msgstr "ìgbò" + +msgid "Ido" +msgstr "Ido" + +msgid "Icelandic" +msgstr "Icelandici" + +msgid "Italian" +msgstr "Italian" + +msgid "Japanese" +msgstr "Japanisi " + +msgid "Georgian" +msgstr "Georgian" + +msgid "Kabyle" +msgstr "Kabyle" + +msgid "Kazakh" +msgstr "Kazakh" + +msgid "Khmer" +msgstr "Khmer" + +msgid "Kannada" +msgstr "Kannada" + +msgid "Korean" +msgstr "Korean" + +msgid "Kyrgyz" +msgstr "Kyrgyz" + +msgid "Luxembourgish" +msgstr "Luxembourgish" + +msgid "Lithuanian" +msgstr "Lithuanian" + +msgid "Latvian" +msgstr "Latvian" + +msgid "Macedonian" +msgstr "Macedonian" + +msgid "Malayalam" +msgstr "Malayalam" + +msgid "Mongolian" +msgstr "Mongolian" + +msgid "Marathi" +msgstr "Marathi" + +msgid "Burmese" +msgstr "Burmese" + +msgid "Norwegian Bokmål" +msgstr "Bokmål ndị Norway" + +msgid "Nepali" +msgstr "Nepali" + +msgid "Dutch" +msgstr "Dutch" + +msgid "Norwegian Nynorsk" +msgstr "Nynorsk ndị Norway " + +msgid "Ossetic" +msgstr "Ossetici" + +msgid "Punjabi" +msgstr "Punjabi" + +msgid "Polish" +msgstr "Polishi" + +msgid "Portuguese" +msgstr "Portuguisi" + +msgid "Brazilian Portuguese" +msgstr "Portuguese ndị Brazil" + +msgid "Romanian" +msgstr "Romaniani" + +msgid "Russian" +msgstr "Russiani" + +msgid "Slovak" +msgstr "Slovaki" + +msgid "Slovenian" +msgstr "Sloveniani" + +msgid "Albanian" +msgstr "Albaniani" + +msgid "Serbian" +msgstr "Serbiani" + +msgid "Serbian Latin" +msgstr "Serbian Latini" + +msgid "Swedish" +msgstr "Swedishi" + +msgid "Swahili" +msgstr "Swahili" + +msgid "Tamil" +msgstr "Tamil" + +msgid "Telugu" +msgstr "Telugu" + +msgid "Tajik" +msgstr "Tajik" + +msgid "Thai" +msgstr "Thai" + +msgid "Turkmen" +msgstr "Turkmen" + +msgid "Turkish" +msgstr "Turkishi" + +msgid "Tatar" +msgstr "Tatar" + +msgid "Udmurt" +msgstr "Udmurt" + +msgid "Ukrainian" +msgstr "Ukrainiani" + +msgid "Urdu" +msgstr "Urdu" + +msgid "Uzbek" +msgstr "Uzbeki" + +msgid "Vietnamese" +msgstr "Vietnamesi" + +msgid "Simplified Chinese" +msgstr "Chinisi Ndị Mfe" + +msgid "Traditional Chinese" +msgstr "Odịnala Chinisi" + +msgid "Messages" +msgstr "Ozi" + +msgid "Site Maps" +msgstr "Maapụ Saịtị" + +msgid "Static Files" +msgstr "Faịlụ Nkwụsiri ike" + +msgid "Syndication" +msgstr "Nyefee Njikwa" + +msgid "That page number is not an integer" +msgstr "Nọmba peeji ahụ abụghị onu ogugu" + +msgid "That page number is less than 1" +msgstr "Nọmba peeji ahụ erughị 1" + +msgid "That page contains no results" +msgstr "Peeji ahụ enweghị nsonaazụ ọ bụla" + +msgid "Enter a valid value." +msgstr "Tinye uru zuru oke." + +msgid "Enter a valid URL." +msgstr "Tinye URL zuru oke." + +msgid "Enter a valid integer." +msgstr "Tinye nọmba zuru oke." + +msgid "Enter a valid email address." +msgstr "Tinye adreesị ozi ịntanetị n'zuru oke." + +#. Translators: "letters" means latin letters: a-z and A-Z. +msgid "" +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." +msgstr "" +"Tinye “slug” zuru oke nke mejupụtara mkpụrụedemede, ọnụọgụ, underscores ma ọ " +"bụ hyphens." + +msgid "" +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " +"hyphens." +msgstr "" +"Tinye “slug” zuru oke nke mejupụtara Unicode mkpụrụedemede, ọnụọgụ, " +"underscores ma ọ bụ hyphens." + +msgid "Enter a valid IPv4 address." +msgstr "Tinye adreesị IPv4 zuru oke." + +msgid "Enter a valid IPv6 address." +msgstr "Tinye adreesị IPv6 zuru oke." + +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Tinye adreesị IPv4 ma obu IPv6 zuru oke." + +msgid "Enter only digits separated by commas." +msgstr "Tinye naanị ọnụọgụ kewapụrụ site na comma." + +#, python-format +msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." +msgstr "Gbaa mbọ hụ na %(limit_value)s (ọ bụ %(show_value)s)." + +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "Gbaa mbọ hụ na orughị ma ọ bụ hara nhata %(limit_value)s." + +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "Gbaa mbọ hụ na okarịa ma ọ bụ hara nhata%(limit_value)s." + +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Gbaa mbọ hụ na a nwere opekata mpe %(limit_value)d odide (o nwere " +"%(show_value)d)." + +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Gbaa mbọ hụ na a nwere kacha %(limit_value)d odide (o nwere%(show_value)d)." + +msgid "Enter a number." +msgstr "Tinye nọmba." + +#, python-format +msgid "Ensure that there are no more than %(max)s digit in total." +msgid_plural "Ensure that there are no more than %(max)s digits in total." +msgstr[0] "Gbaa mbọ hụ na ọ dighi karịrị %(max)s nọmba na mkpokọta." + +#, python-format +msgid "Ensure that there are no more than %(max)s decimal place." +msgid_plural "Ensure that there are no more than %(max)s decimal places." +msgstr[0] "Gbaa mbọ hụ na ọ dighi karịrị %(max)s na ebe ntụpọ." + +#, python-format +msgid "" +"Ensure that there are no more than %(max)s digit before the decimal point." +msgid_plural "" +"Ensure that there are no more than %(max)s digits before the decimal point." +msgstr[0] "Gbaa mbọ hụ na ọ dighi karịrị %(max)s nọmba tupu akụkụ ebe ntụpọ." + +#, python-format +msgid "" +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." +msgstr "" +"Ndọtị Faịlị “%(extension)s”anaghị anabata. Ndọtị nke kwere n'nabata bu: " +"%(allowed_extensions)s." + +msgid "Null characters are not allowed." +msgstr "Anabataghị ihe odide n'enweghị isi." + +msgid "and" +msgstr "na" + +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s ya na nke a %(field_labels)s dị adị." + +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "Nọmba %(value)r abụghị ezigbo nhọrọ." + +msgid "This field cannot be null." +msgstr "Ebe a enweghị ike ịbụ ihe efu." + +msgid "This field cannot be blank." +msgstr "Ebe a enweghị ike ịbụ ohere efu." + +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(model_name)s ya na nke a %(field_label)s dị adi." + +#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. +#. Eg: "Title must be unique for pub_date year" +#, python-format +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." +msgstr "" +"%(field_label)s ga-abụ ihe pụrụ iche maka %(date_field_label)s " +"%(lookup_type)s." + +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "Ebe a nke ụdị: %(field_type)s" + +#, python-format +msgid "“%(value)s” value must be either True or False." +msgstr "“%(value)s” uru a ga-abụrịrị Eziokwu ma ọ bụ Ugha." + +#, python-format +msgid "“%(value)s” value must be either True, False, or None." +msgstr "“%(value)s”uru a ga-abụrịrị Eziokwu, Ugha, ma ọ bụ Onweghị." + +msgid "Boolean (Either True or False)" +msgstr "Boolean (Eziokwu ma o bụ Ugha)" + +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "String (ruo %(max_length)s)" + +msgid "Comma-separated integers" +msgstr "Rikom-kewapụrụ nomba" + +#, python-format +msgid "" +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " +"format." +msgstr "" +"“%(value)s” uru a nwere usoro nke n'adịghị adị. Ọ ga-abụrịrị n'ụdị YYYY-MM-" +"DD." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "" +"“%(value)s”uru a nwere usoro ziri ezi (YYYY-MM-DD) mana ọ bụ ụbọchị n'abaghị " +"uru." + +msgid "Date (without time)" +msgstr "Ubọchị (na-enweghị oge)" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"“%(value)s” uru a nwere usoro nke n'adịghị adị. Ọ ga-abụrịrị n'ụdị YYYY-MM-" +"DD HH:MM[:ss[.uuuuuu]][TZ] usoro. " + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." +msgstr "" +"“%(value)s”uru a nwere usoro ziri ezi (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ])mana ọ bụ ụbọchị n'abaghị uru." + +msgid "Date (with time)" +msgstr "Ubọchị (na oge)" + +#, python-format +msgid "“%(value)s” value must be a decimal number." +msgstr "“%(value)s” uru a ga-abụrịrị nọmba ntụpọ." + +msgid "Decimal number" +msgstr "Nọmba ntụpọ." + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." +"uuuuuu] format." +msgstr "" +"“%(value)s”uru a nwere usoro nke n'adịghị adị. Ọ ga-abụrịrị n'ụdị [DD] " +"[[HH:]MM:]ss[.uuuuuu]usoro." + +msgid "Duration" +msgstr "Oge ole" + +msgid "Email address" +msgstr "Adreesị ozi ịntanetị" + +msgid "File path" +msgstr "Uzọ Faịlụ di" + +#, python-format +msgid "“%(value)s” value must be a float." +msgstr "“%(value)s”uru a ga-abụrịrị float." + +msgid "Floating point number" +msgstr "Nọmba ebe floating no " + +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "“%(value)s” uru a ga-abụrịrị onu ogugu" + +msgid "Integer" +msgstr "Onu ogugu" + +msgid "Big (8 byte) integer" +msgstr "Onu ogugu (8 byte) nnukwu" + +msgid "IPv4 address" +msgstr "Adreesị IPv4" + +msgid "IP address" +msgstr "Adreesị IP" + +#, python-format +msgid "“%(value)s” value must be either None, True or False." +msgstr "“%(value)s”uru a ga-abụrịrị na Odighị, Eziokwu ma ọ bụ.Ugha." + +msgid "Boolean (Either True, False or None)" +msgstr "Boolean (Ihe a ga abụriri eziokwu, ụgha ma ọ bu na onweghi)" + +msgid "Positive big integer" +msgstr "Nnukwu nomba nke oma" + +msgid "Positive integer" +msgstr "Nọmba nke oma" + +msgid "Positive small integer" +msgstr "Obere nọmba nke oma" + +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "Slug (ruo %(max_length)s)" + +msgid "Small integer" +msgstr "Onu ogugu nke obere" + +msgid "Text" +msgstr "Ederede" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." +msgstr "" +"“%(value)s” uru a nwere usoro nke n'adịghị adị. Ọ ga-abụrịrị n'ụdị HH:MM[:" +"ss[.uuuuuu]]usoro." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." +msgstr "" +"“%(value)s” uru a nwere usoro ziri ezi (HH:MM[:ss[.uuuuuu]]) mana ọ bu oge " +"n'abaghị uru." + +msgid "Time" +msgstr "Oge" + +msgid "URL" +msgstr "URL" + +msgid "Raw binary data" +msgstr "Raw binary data" + +#, python-format +msgid "“%(value)s” is not a valid UUID." +msgstr "“%(value)s”abụghị UUID n’kwesịrị ekwesị." + +msgid "Universally unique identifier" +msgstr "Universally unique identifier" + +msgid "File" +msgstr "Faịlụ" + +msgid "Image" +msgstr "Foto" + +msgid "A JSON object" +msgstr "Ihe JSON" + +msgid "Value must be valid JSON." +msgstr "Uru a ga-abụrịrị JSON n’kwesịrị ekwesị." + +#, python-format +msgid "%(model)s instance with %(field)s %(value)r does not exist." +msgstr "%(model)s dịka %(field)s %(value)r adịghị adị." + +msgid "Foreign Key (type determined by related field)" +msgstr "Foreign Key (ụdị kpebiri site na mpaghara metụtara)" + +msgid "One-to-one relationship" +msgstr "Mmekọrịta otu-na-otu" + +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "%(from)s-%(to)s mmekọrịta" + +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "%(from)s-%(to)s mmekọrịta" + +msgid "Many-to-many relationship" +msgstr "Mmekọrịta otutu-na-otutu" + +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the +#. label +msgid ":?.!" +msgstr ":?.!" + +msgid "This field is required." +msgstr "Ebe a kwesiri ekwesi." + +msgid "Enter a whole number." +msgstr "Tinye nọmba onu ogugu." + +msgid "Enter a valid date." +msgstr "Tinye ụbọchị zuru oke." + +msgid "Enter a valid time." +msgstr "Tinye oge zuru oke." + +msgid "Enter a valid date/time." +msgstr "Tinye ụbọchị / oge zuru oke" + +msgid "Enter a valid duration." +msgstr "Tinye oge onuno zuru oke." + +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "Onu ogugu ubochi a gha aburiri n’agbata {min_days} na {max_days}." + +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Onweghi faịlụ a debanyere. Lee ụdị encoding a ntinye na ederede." + +msgid "No file was submitted." +msgstr "E nweghị faịlụ e watara" + +msgid "The submitted file is empty." +msgstr "O nweghị ihe dị n'ime faịlụ e wetara" + +#, python-format +msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid_plural "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr[0] "" +"Gbaa mbọ hụ na aha faịlụ a nwere kacha %(max)d odide (o nwere %(length)d)." + +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "" +"Biko nyefee faịlụ a ma ọ bụ tinye akara na igbe akara, ọ bụghị ha abụọ." + +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Bugote foto n’zuru oke. Faịlụ a ị bugoro abụghị foto ma ọ bụ foto rụrụ arụ." + +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "Họrọ ezigbo nhọrọ. %(value)sabụghị otu nhọrọ n'ime nke dịnụ." + +msgid "Enter a list of values." +msgstr "Tinye ndepụta nke ụkpụrụ." + +msgid "Enter a complete value." +msgstr "Tinye uru zuru okè" + +msgid "Enter a valid UUID." +msgstr "Tinye UUID kwesịrị ekwesị" + +msgid "Enter a valid JSON." +msgstr "Tinye JSON kwesịrị ekwesị" + +#. Translators: This is the default suffix added to form field labels +msgid ":" +msgstr ":" + +#, python-format +msgid "(Hidden field %(name)s) %(error)s" +msgstr "(Ebe ezoro ezo%(name)s) %(error)s" + +msgid "ManagementForm data is missing or has been tampered with" +msgstr "Data ManagementForm na-efu efu ma ọ bụ a kpara ya aka" + +#, python-format +msgid "Please submit %d or fewer forms." +msgid_plural "Please submit %d or fewer forms." +msgstr[0] "Biko nyefee %d ma ọ bụ fomụ di ole na ole." + +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "Biko nyefee%d ma ọ bụ fomụ karịrị otu ahụ" + +msgid "Order" +msgstr "Usoro" + +msgid "Delete" +msgstr "Hichapụ" + +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Biko dozie data oji abuo a maka %(field)s." + +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "Biko dozie data oji abuo a maka %(field)s, nke gha diriri iche." + +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"Biko dozie data oji abuo a maka %(field_name)s nke gha diriri iche maka " +"%(lookup)s n'ime %(date_field)s." + +msgid "Please correct the duplicate values below." +msgstr "Biko dozie uru oji abuo nke no n'okpuru." + +msgid "The inline value did not match the parent instance." +msgstr "Uru inline a adabaghị na parent instance." + +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "Họrọ ezigbo nhọrọ. Nhọrọ a abụghị otu nhọrọ dịnụ." + +#, python-format +msgid "“%(pk)s” is not a valid value." +msgstr "%(pk)sabụghi uru kwesịrị ekwesị" + +#, python-format +msgid "" +"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " +"may be ambiguous or it may not exist." +msgstr "" +"%(datetime)s enweghị ike ịkọwa na mpaghara oge %(current_timezone)s; onwere " +"ike iju anya ma obu ọ gaghị adị." + +msgid "Clear" +msgstr "Kpochapu" + +msgid "Currently" +msgstr "Ugbu a" + +msgid "Change" +msgstr "Gbanwee" + +msgid "Unknown" +msgstr "Ihe N’amaghi" + +msgid "Yes" +msgstr "Ee" + +msgid "No" +msgstr "Mba" + +#. Translators: Please do not add spaces around commas. +msgid "yes,no,maybe" +msgstr "ee, mba, nwere ike" + +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d bytes" + +#, python-format +msgid "%s KB" +msgstr "%s KB" + +#, python-format +msgid "%s MB" +msgstr "%s MB" + +#, python-format +msgid "%s GB" +msgstr "%s GB" + +#, python-format +msgid "%s TB" +msgstr "%s TB" + +#, python-format +msgid "%s PB" +msgstr "%s PB" + +msgid "p.m." +msgstr "p.m." + +msgid "a.m." +msgstr "a.m." + +msgid "PM" +msgstr "PM" + +msgid "AM" +msgstr "AM" + +msgid "midnight" +msgstr "etiti Abalị" + +msgid "noon" +msgstr "Ehihie" + +msgid "Monday" +msgstr "Mọnde" + +msgid "Tuesday" +msgstr "Tiuzdee" + +msgid "Wednesday" +msgstr "Wenezdee" + +msgid "Thursday" +msgstr "Tọọzdee" + +msgid "Friday" +msgstr "Fraịdee" + +msgid "Saturday" +msgstr "Satọdee" + +msgid "Sunday" +msgstr "Mbọsi Uka" + +msgid "Mon" +msgstr "Mọnde" + +msgid "Tue" +msgstr "Tiu" + +msgid "Wed" +msgstr "Wen" + +msgid "Thu" +msgstr "Tọọ" + +msgid "Fri" +msgstr "Fraị" + +msgid "Sat" +msgstr "Sat" + +msgid "Sun" +msgstr "Ụka" + +msgid "January" +msgstr "Jenụwarị" + +msgid "February" +msgstr "Febrụwarị" + +msgid "March" +msgstr "Maachị" + +msgid "April" +msgstr "Eprel" + +msgid "May" +msgstr "Mee" + +msgid "June" +msgstr "Juun" + +msgid "July" +msgstr "Julaị" + +msgid "August" +msgstr "Ọgọọst" + +msgid "September" +msgstr "Septemba" + +msgid "October" +msgstr "Ọktoba" + +msgid "November" +msgstr "Novemba" + +msgid "December" +msgstr "Disemba" + +msgid "jan" +msgstr "jen" + +msgid "feb" +msgstr "feb" + +msgid "mar" +msgstr "maa" + +msgid "apr" +msgstr "epr" + +msgid "may" +msgstr "mee" + +msgid "jun" +msgstr "juu" + +msgid "jul" +msgstr "jul" + +msgid "aug" +msgstr "ọgọ" + +msgid "sep" +msgstr "sep" + +msgid "oct" +msgstr "ọkt" + +msgid "nov" +msgstr "nov" + +msgid "dec" +msgstr "dis" + +msgctxt "abbrev. month" +msgid "Jan." +msgstr "Jenụwarị" + +msgctxt "abbrev. month" +msgid "Feb." +msgstr "Feb." + +msgctxt "abbrev. month" +msgid "March" +msgstr "Maachị" + +msgctxt "abbrev. month" +msgid "April" +msgstr "Eprel" + +msgctxt "abbrev. month" +msgid "May" +msgstr "Mee" + +msgctxt "abbrev. month" +msgid "June" +msgstr "Juun" + +msgctxt "abbrev. month" +msgid "July" +msgstr "Julaị" + +msgctxt "abbrev. month" +msgid "Aug." +msgstr "Ọgọ." + +msgctxt "abbrev. month" +msgid "Sept." +msgstr "Sep." + +msgctxt "abbrev. month" +msgid "Oct." +msgstr "Ọkt." + +msgctxt "abbrev. month" +msgid "Nov." +msgstr "Nov." + +msgctxt "abbrev. month" +msgid "Dec." +msgstr "Dis." + +msgctxt "alt. month" +msgid "January" +msgstr "Jenụwarị" + +msgctxt "alt. month" +msgid "February" +msgstr "Febrụwarị" + +msgctxt "alt. month" +msgid "March" +msgstr "Maachị" + +msgctxt "alt. month" +msgid "April" +msgstr "Eprel" + +msgctxt "alt. month" +msgid "May" +msgstr "Mee" + +msgctxt "alt. month" +msgid "June" +msgstr "Juun" + +msgctxt "alt. month" +msgid "July" +msgstr "Julaị" + +msgctxt "alt. month" +msgid "August" +msgstr "Ọgọọst" + +msgctxt "alt. month" +msgid "September" +msgstr "Septemba" + +msgctxt "alt. month" +msgid "October" +msgstr "Ọktoba" + +msgctxt "alt. month" +msgid "November" +msgstr "Novemba" + +msgctxt "alt. month" +msgid "December" +msgstr "Disemba" + +msgid "This is not a valid IPv6 address." +msgstr "Nke a abaghị adresị IPv6 zuru oke." + +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s…" +msgstr "%(truncated_text)s…" + +msgid "or" +msgstr "ma obu" + +#. Translators: This string is used as a separator between list elements +msgid ", " +msgstr ", " + +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%d afọ" + +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%dọnwa" + +#, python-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d izu" + +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d ụbọchị" + +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d awa" + +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d nkeji" + +msgid "Forbidden" +msgstr "Amachibidoro" + +msgid "CSRF verification failed. Request aborted." +msgstr "Nyocha CSRF emeghị nke ọma. Ajuju atọrọ.." + +msgid "" +"You are seeing this message because this HTTPS site requires a “Referer " +"header” to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." +msgstr "" +"I na-ahụ ozi a n'ihi na saịtị HTTPS a chọrọ “Onye isi okwu” ka ihe nchọgharị " +"weebụ gị zitere gị, mana onweghi nke zitere. Achọrọ isi ihe a maka ebumnuche " +"nchekwa, iji jide n’aka na ndị ọzọ anaghị egbochi ihe nchọgharị gị." + +msgid "" +"If you have configured your browser to disable “Referer” headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for “same-" +"origin” requests." +msgstr "" +"Ọ bụrụ na ihazila ihe nchọgharị gị iji gbanyụọ ndị na-eji “ndị nnọchianya”, " +"biko jisie iketiachi ya, ma ọ dịkarịa maka saịtị a, ma ọ bụ maka njikọ " +"HTTPS, ma ọ bụ maka a arịrịọ “otu ụdị”." + +msgid "" +"If you are using the tag or " +"including the “Referrer-Policy: no-referrer” header, please remove them. The " +"CSRF protection requires the “Referer” header to do strict referer checking. " +"If you’re concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" +"Ọ bụrụ na ị na-eji akara " +"mmado ma ọ bụ gụnyere isi nke \"Iwu-Onye na gba ama: neweghị onye na-gba ama" +"\", biko wepu ha. Nchedo CSRF chọrọ ka isi “onye na gba ama” wee mee nyocha " +"ike nlele nke gbara ama. Ọ bụrụ na ihe gbasara gị gbasara nzuzo, jiri ụzọ " +"ọzọ dị ka njikọ maka saịtị ndị ọzọ." + +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" +"I na-ahụ ozi a n'ihi na saịtị a chọrọ CSRF cookie mgbe ị na-edobe akwụkwọ. " +"Achọrọ cookie a maka ebumnuche nchekwa, iji hụ na ndị ọzọ anaghị egbochi ihe " +"nchọgharị gị." + +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for “same-origin” requests." +msgstr "" +"Ọ bụrụ na ịhazila ihe nchọgharị gị iji gbanyụọ kuki, biko tiachi ya ka o na " +"ruo oru, opekata mpe maka saịtị a, ma ọ bụ maka “otu ụdị\"." + +msgid "More information is available with DEBUG=True." +msgstr "Ihe omuma ndi ozo di na DEBUG = Eziokwu." + +msgid "No year specified" +msgstr "Ọ dịghị afọ akọwapụtara" + +msgid "Date out of range" +msgstr "Ubọchị a puru na usoro" + +msgid "No month specified" +msgstr "Onweghị ọnwa akọwapụtara" + +msgid "No day specified" +msgstr "Onweghi ụbọchị akọwapụtara" + +msgid "No week specified" +msgstr "Onweghi izu akọwapụtara" + +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr " %(verbose_name_plural)sadịghị" + +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"Ọdịnihu %(verbose_name_plural)s adịghị adị n'ihi %(class_name)s.allow_future " +"bu ugha." + +#, python-format +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" +msgstr "String ụbọchị nabaghị uru “%(datestr)s” Ntọala enyere “%(format)s”" + +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "Mba %(verbose_name)s hụrụ ihe dabara na ajụjụ a" + +msgid "Page is not “last”, nor can it be converted to an int." +msgstr "Peeji a a-abụghị “nke ikpeazụ”, a pụghị ịgbanwe ya na int." + +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "Peeji na-abaghị uru (%(page_number)s): %(message)s" + +#, python-format +msgid "Empty list and “%(class_name)s.allow_empty” is False." +msgstr "Tọgbọ chakoo ndepụta na “%(class_name)s.allow_empty” bụ Ugha." + +msgid "Directory indexes are not allowed here." +msgstr "Anaghị anabata directory indexes ebe a." + +#, python-format +msgid "“%(path)s” does not exist" +msgstr "“%(path)s” a dịghị" + +#, python-format +msgid "Index of %(directory)s" +msgstr "Index of %(directory)s" + +msgid "Django: the Web framework for perfectionists with deadlines." +msgstr "" +"Django: usoro Ntanetị maka ndị na-achọkarị izu okè ya na oge edetu imecha." + +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" +"Lee akwukwo e bipụtara maka Django" +"%(version)s" + +msgid "The install worked successfully! Congratulations!" +msgstr "Nwụnye ahụ dabara nke ọma! Ị mere nke ọma!" + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " +"URLs." +msgstr "" +"I na-ahụ peeji a n'ihi na DEBUG=True dị na faili setting gị mana ịhazibeghị URL ọ bụla." + +msgid "Django Documentation" +msgstr "Akwụkwọ Ederede Django" + +msgid "Topics, references, & how-to’s" +msgstr "Isiokwu, ntụaka, & otu esi-mee" + +msgid "Tutorial: A Polling App" +msgstr "Nkuzi: App Ntuli Aka" + +msgid "Get started with Django" +msgstr "Bido na Django" + +msgid "Django Community" +msgstr "Obodo Django" + +msgid "Connect, get help, or contribute" +msgstr "Jikọọ, nweta enyemaka, ma ọ bụ tinye aka." diff --git a/tests/gis_tests/maps/__init__.py b/django/conf/locale/ig/__init__.py similarity index 100% rename from tests/gis_tests/maps/__init__.py rename to django/conf/locale/ig/__init__.py diff --git a/django/conf/locale/ig/formats.py b/django/conf/locale/ig/formats.py new file mode 100644 index 000000000000..61fc2c0c77d0 --- /dev/null +++ b/django/conf/locale/ig/formats.py @@ -0,0 +1,32 @@ +# This file is distributed under the same license as the Django package. +# +# The *_FORMAT strings use the Django date format syntax, +# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +DATE_FORMAT = 'j F Y' +TIME_FORMAT = 'P' +DATETIME_FORMAT = 'j F Y P' +YEAR_MONTH_FORMAT = 'F Y' +MONTH_DAY_FORMAT = 'j F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' +FIRST_DAY_OF_WEEK = 1 # Monday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = [ + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y', # '25.10.06' +] +DATETIME_INPUT_FORMATS = [ + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200' + '%d.%m.%y %H:%M', # '25.10.06 14:30' + '%d.%m.%y', # '25.10.06' +] +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = ',' +NUMBER_GROUPING = 3 diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index 71e58361880d..6d631ac9fdde 100644 Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index 9b06ea364741..27607b81d577 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -1,20 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# gudmundur , 2011 +# db999e1e0e51ac90b00482cb5db0f98b_32999f5 <3ec5202d5df408dd2f95d8c361fed970_5926>, 2011 # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 # Matt R, 2018 # saevarom , 2011 # saevarom , 2013,2015 -# Thordur Sigurdsson , 2016-2019 +# Thordur Sigurdsson , 2016-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-20 05:29+0000\n" -"Last-Translator: Thordur Sigurdsson \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -29,6 +29,9 @@ msgstr "Afríkanska" msgid "Arabic" msgstr "Arabíska" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Astúríska" @@ -152,6 +155,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indónesíska" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -182,6 +188,9 @@ msgstr "Kannadanska" msgid "Korean" msgstr "Kóreska" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Lúxemborgíska" @@ -266,9 +275,15 @@ msgstr "Tamílska" msgid "Telugu" msgstr "Telúgúska" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Tælenska" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Tyrkneska" @@ -575,6 +590,9 @@ msgstr "„%(value)s“ verður að vera eitt eftirtalinna: None, True eða Fals msgid "Boolean (Either True, False or None)" msgstr "Boole-gildi (True, False eða None)" +msgid "Positive big integer" +msgstr "Jákvæð stór heiltala" + msgid "Positive integer" msgstr "Jákvæð heiltala" @@ -629,6 +647,12 @@ msgstr "Skrá" msgid "Image" msgstr "Mynd" +msgid "A JSON object" +msgstr "JSON hlutur" + +msgid "Value must be valid JSON." +msgstr "Gildi verður að vera gilt JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s hlutur með %(field)s %(value)r er ekki til." @@ -720,6 +744,9 @@ msgstr "Sláðu inn heilt gildi." msgid "Enter a valid UUID." msgstr "Sláðu inn gilt UUID." +msgid "Enter a valid JSON." +msgstr "Sláðu inn gilt JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -807,15 +834,7 @@ msgstr "Já" msgid "No" msgstr "Nei" -msgid "Year" -msgstr "Ár" - -msgid "Month" -msgstr "Mánuður" - -msgid "Day" -msgstr "Dagur" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "já,nei,kannski" @@ -1124,9 +1143,6 @@ msgid_plural "%d minutes" msgstr[0] "%d mínúta" msgstr[1] "%d mínútur" -msgid "0 minutes" -msgstr "0 mínútur" - msgid "Forbidden" msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index dec6b1fd6316..b0b7ccfb0f23 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 3b78b46ce7af..e57303453717 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ # Themis Savvidis , 2013 # Luciano De Falco Alfano, 2016 # Marco Bonetti, 2014 -# Mirco Grillo , 2018 +# Mirco Grillo , 2018,2020 # Nicola Larosa , 2013 -# palmux , 2014-2015,2017 +# palmux , 2014-2015,2017,2021 # Mattia Procopio , 2015 # Riccardo Magliocchetti , 2017 # Stefano Brentegani , 2014-2017 @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 16:42+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -38,6 +38,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabo" +msgid "Algerian Arabic" +msgstr "Arabo Algerino" + msgid "Asturian" msgstr "Asturiano" @@ -161,6 +164,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesiano" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -191,6 +197,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Coreano" +msgid "Kyrgyz" +msgstr "Kirghiso" + msgid "Luxembourgish" msgstr "Lussemburghese" @@ -275,9 +284,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tajik" + msgid "Thai" msgstr "Tailandese" +msgid "Turkmen" +msgstr "Turkmeno" + msgid "Turkish" msgstr "Turco" @@ -294,7 +309,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbeko" msgid "Vietnamese" msgstr "Vietnamita" @@ -317,6 +332,11 @@ msgstr "File statici" msgid "Syndication" msgstr "Aggregazione" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + msgid "That page number is not an integer" msgstr "Quel numero di pagina non è un integer" @@ -342,11 +362,15 @@ msgstr "Inserisci un indirizzo email valido." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Inserisci uno \"slug\" valido contenente lettere, cifre, sottolineati o " +"trattini." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o " +"trattini." msgid "Enter a valid IPv4 address." msgstr "Inserisci un indirizzo IPv4 valido." @@ -430,6 +454,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Il file con estensione \"%(extension)s\" non e' permesso. Le estensioni " +"permesse sono: %(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "I caratteri null non sono ammessi." @@ -469,11 +495,11 @@ msgstr "Campo di tipo: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Il valore \"%(value)s\" deve essere True oppure False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Il valore di \"%(value)s\" deve essere True, False o None" msgid "Boolean (Either True or False)" msgstr "Booleano (Vero o Falso)" @@ -490,12 +516,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"Il valore \"%(value)s\" ha un formato di data non valido. Deve essere nel " +"formato AAAA-MM-GG." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"Il valore di \"%(value)s\" ha il corretto formato (AAAA-MM-GG) ma non è una " +"data valida." msgid "Date (without time)" msgstr "Data (senza ora)" @@ -505,19 +535,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Il valore \"%(value)s\" ha un formato non valido. Deve essere nel formato " +"AAAA-MM-GG HH:MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"Il valore di \"%(value)s\" ha il formato corretto (AAAA-MM-GG HH:MM[:ss[." +"uuuuuu]][TZ]) ma non è una data/ora valida." msgid "Date (with time)" msgstr "Data (con ora)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "Il valore \"%(value)s\" deve essere un numero decimale." msgid "Decimal number" msgstr "Numero decimale" @@ -527,6 +561,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"Il valore \"%(value)s\" ha un formato non valido. Deve essere nel formato " +"[GG] [[HH:]MM:]ss[.uuuuuu]." msgid "Duration" msgstr "Durata" @@ -539,14 +575,14 @@ msgstr "Percorso file" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Il valore di \"%(value)s\" deve essere un numero a virgola mobile." msgid "Floating point number" msgstr "Numero in virgola mobile" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Il valore \"%(value)s\" deve essere un intero." msgid "Integer" msgstr "Intero" @@ -554,6 +590,9 @@ msgstr "Intero" msgid "Big (8 byte) integer" msgstr "Intero grande (8 byte)" +msgid "Small integer" +msgstr "Piccolo intero" + msgid "IPv4 address" msgstr "Indirizzo IPv4" @@ -562,11 +601,14 @@ msgstr "Indirizzo IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Il valore \"%(value)s\" deve essere None, True oppure False." msgid "Boolean (Either True, False or None)" msgstr "Booleano (True, False o None)" +msgid "Positive big integer" +msgstr "Intero positivo" + msgid "Positive integer" msgstr "Intero positivo" @@ -577,9 +619,6 @@ msgstr "Piccolo intero positivo" msgid "Slug (up to %(max_length)s)" msgstr "Slug (fino a %(max_length)s)" -msgid "Small integer" -msgstr "Piccolo intero" - msgid "Text" msgstr "Testo" @@ -588,12 +627,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Il valore di \"%(value)s\" ha un formato non valido. Deve essere nel formato " +"HH:MM[:ss[.uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Il valore di \"%(value)s\" ha il corretto formato (HH:MM[:ss[.uuuuuu]]) ma " +"non è un orario valido." msgid "Time" msgstr "Ora" @@ -606,7 +649,7 @@ msgstr "Dati binari grezzi" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "\"%(value)s\" non è uno UUID valido." msgid "Universally unique identifier" msgstr "Identificatore univoco universale" @@ -617,6 +660,12 @@ msgstr "File" msgid "Image" msgstr "Immagine" +msgid "A JSON object" +msgstr "Un oggetto JSON" + +msgid "Value must be valid JSON." +msgstr "Il valore deve essere un JSON valido." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "L'istanza del modello %(model)s con %(field)s %(value)r non esiste." @@ -711,6 +760,9 @@ msgstr "Inserisci un valore completo." msgid "Enter a valid UUID." msgstr "Inserire un UUID valido." +msgid "Enter a valid JSON." +msgstr "Inserisci un JSON valido." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -719,20 +771,26 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Campo nascosto %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "I dati del ManagementForm sono mancanti oppure sono stati manomessi" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Mancano i dati ManagementForm o sono stati manomessi. Campi mancanti: " +"%(field_names)s. Potrebbe essere necessario inviare una segnalazione di " +"errore se il problema persiste." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Inoltrare %d o meno form." -msgstr[1] "Si prega di inviare %d o meno form." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Si prega di inviare al massimo %d form." +msgstr[1] "Si prega di inviare al massimo %d form." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Inoltrare %d o più form." -msgstr[1] "Si prega di inviare %d o più form." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Si prega di inviare almeno %d form." +msgstr[1] "Si prega di inviare almeno %d form." msgid "Order" msgstr "Ordine" @@ -770,13 +828,15 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" non è un valore valido." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +" %(datetime)s non può essere interpretato nel fuso orario " +"%(current_timezone)s: potrebbe essere ambiguo o non esistere." msgid "Clear" msgstr "Svuota" @@ -796,15 +856,7 @@ msgstr "Sì" msgid "No" msgstr "No" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "sì,no,forse" @@ -1113,9 +1165,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -msgid "0 minutes" -msgstr "0 minuti" - msgid "Forbidden" msgstr "Proibito" @@ -1128,12 +1177,19 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Stai vedendo questo messaggio perché questo sito HTTPS richiede una " +"\"Referer header\" che deve essere inviata dal tuo browser web, ma non è " +"stato inviato nulla. Questo header è richiesto per ragioni di sicurezza, per " +"assicurare che il tuo browser non sia stato dirottato da terze parti." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Se hai configurato il tuo browser web per disattivare l'invio delle " +"intestazioni \"Referer\", riattiva questo invio, almeno per questo sito, o " +"per le connessioni HTTPS, o per le connessioni \"same-origin\"." msgid "" "If you are using the tag or " @@ -1142,6 +1198,11 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Se usi il tag o includi " +"header 'Referrer-Policy: no-referrer', per favore rimuovili. Per la " +"protezione CSRF è necessario eseguire un controllo rigoroso sull'header " +"'Referer'. Se ti preoccupano le ricadute sulla privacy, puoi ricorrere ad " +"alternative come per i link a siti di terze parti." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1156,6 +1217,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Se hai configurato il tuo browser web per disattivare l'invio dei cookies, " +"riattivalo almeno per questo sito, o per connessioni \"same-origin\"" msgid "More information is available with DEBUG=True." msgstr "Maggiorni informazioni sono disponibili con DEBUG=True" @@ -1189,14 +1252,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "Data non valida \"%(datestr)s\" con il formato \"%(format)s\"" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "Trovato nessun %(verbose_name)s corrispondente alla query" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "La pagina non è \"last\", né può essere convertita in un int." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1204,21 +1267,21 @@ msgstr "Pagina non valida (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Lista vuota e \"%(class_name)s.allow_empty\" è False." msgid "Directory indexes are not allowed here." msgstr "Indici di directory non sono consentiti qui." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "\"%(path)s\" non esiste" #, python-format msgid "Index of %(directory)s" msgstr "Indice di %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: il framework Web per i perfezionisti con delle scadenze." +msgid "The install worked successfully! Congratulations!" +msgstr "Installazione completata con successo! Congratulazioni!" #, python-format msgid "" @@ -1229,9 +1292,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">note di rilascio per Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Installazione completata con successo! Congratulazioni!" - #, python-format msgid "" "You are seeing this page because , 2016 +# tadasu , 2020 # GOTO Hayato , 2019 # Jannis Leidel , 2011 # Kentaro Matsuzaki , 2015 @@ -9,14 +10,16 @@ # Nikita K , 2019 # Shinichi Katsumata , 2019 # Shinya Okano , 2012-2019 +# Takuro Onoue , 2020 +# Takuya N , 2020 # Tetsuya Morimoto , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 12:25+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -31,6 +34,9 @@ msgstr "アフリカーンス語" msgid "Arabic" msgstr "アラビア語" +msgid "Algerian Arabic" +msgstr "アラビア語(アルジェリア)" + msgid "Asturian" msgstr "アストゥリアス語" @@ -154,6 +160,9 @@ msgstr "インターリングア" msgid "Indonesian" msgstr "インドネシア語" +msgid "Igbo" +msgstr "イグボ語" + msgid "Ido" msgstr "イド語" @@ -184,6 +193,9 @@ msgstr "カンナダ語" msgid "Korean" msgstr "韓国語" +msgid "Kyrgyz" +msgstr "キルギス語" + msgid "Luxembourgish" msgstr "ルクセンブルグ語" @@ -268,9 +280,15 @@ msgstr "タミル語" msgid "Telugu" msgstr "テルグ語" +msgid "Tajik" +msgstr "タジク語" + msgid "Thai" msgstr "タイ語" +msgid "Turkmen" +msgstr "トルクメン語" + msgid "Turkish" msgstr "トルコ語" @@ -287,7 +305,7 @@ msgid "Urdu" msgstr "ウルドゥー語" msgid "Uzbek" -msgstr "" +msgstr "ウズベク語" msgid "Vietnamese" msgstr "ベトナム語" @@ -310,6 +328,11 @@ msgstr "静的ファイル" msgid "Syndication" msgstr "シンジケーション" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "このページ番号は整数ではありません。" @@ -335,11 +358,14 @@ msgstr "有効なメールアドレスを入力してください。" msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"“slug” には半角の英数字、アンダースコア、ハイフン以外は使用できません。" msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"ユニコード文字、数字、アンダースコアまたはハイフンで構成された、有効なスラグ" +"を入力してください。" msgid "Enter a valid IPv4 address." msgstr "有効なIPアドレス (IPv4) を入力してください。" @@ -375,8 +401,8 @@ msgid_plural "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" -"この値が少なくとも %(limit_value)d 文字以上であることを確認してください" -"( %(show_value)d 文字になっています)。" +"この値が少なくとも %(limit_value)d 文字以上であることを確認してください " +"(%(show_value)d 文字になっています)。" #, python-format msgid "" @@ -414,6 +440,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"ファイル拡張子 “%(extension)s” は許可されていません。許可されている拡張子は " +"%(allowed_extensions)s です。" msgid "Null characters are not allowed." msgstr "何か文字を入力してください。" @@ -454,11 +482,11 @@ msgstr "タイプが %(field_type)s のフィールド" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "“%(value)s” は True または False にしなければなりません。" #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "“%(value)s” は True 、 False または None の値でなければなりません。" msgid "Boolean (Either True or False)" msgstr "ブール値 (真: True または偽: False)" @@ -475,12 +503,13 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"“%(value)s” は無効な日付形式です。YYYY-MM-DD 形式にしなければなりません。" #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" +msgstr "“%(value)s” は有効な日付形式(YYYY-MM-DD)ですが、不正な日付です。" msgid "Date (without time)" msgstr "日付" @@ -490,19 +519,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"“%(value)s” は無効な形式の値です。 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 形式で" +"なければなりません。" #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"“%(value)s” は正しい形式 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) の値ですが、無" +"効な日時です。" msgid "Date (with time)" msgstr "日時" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "“%(value)s” は10進浮動小数値にしなければなりません。" msgid "Decimal number" msgstr "10 進数 (小数可)" @@ -512,6 +545,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"“%(value)s” は無効な形式の値です。 [DD] [HH:[MM:]]ss[.uuuuuu] 形式でなければ" +"なりません。" msgid "Duration" msgstr "時間差分" @@ -524,14 +559,14 @@ msgstr "ファイルの場所" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "“%(value)s” は小数値にしなければなりません。" msgid "Floating point number" msgstr "浮動小数点" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "“%(value)s” は整数値にしなければなりません。" msgid "Integer" msgstr "整数" @@ -539,6 +574,9 @@ msgstr "整数" msgid "Big (8 byte) integer" msgstr "大きな(8バイト)整数" +msgid "Small integer" +msgstr "小さな整数" + msgid "IPv4 address" msgstr "IPv4アドレス" @@ -547,11 +585,14 @@ msgstr "IP アドレス" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "“%(value)s” は None、True または False の値でなければなりません。" msgid "Boolean (Either True, False or None)" msgstr "ブール値 (真: True 、偽: False または None)" +msgid "Positive big integer" +msgstr "正の多倍長整数" + msgid "Positive integer" msgstr "正の整数" @@ -562,9 +603,6 @@ msgstr "小さな正の整数" msgid "Slug (up to %(max_length)s)" msgstr "スラグ(%(max_length)s文字以内)" -msgid "Small integer" -msgstr "小さな整数" - msgid "Text" msgstr "テキスト" @@ -573,12 +611,14 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"“%(value)s” は無効な形式の値です。 HH:MM[:ss[.uuuuuu]] 形式でなければなりませ" +"ん。" #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." -msgstr "" +msgstr "“%(value)s” は正しい形式(HH:MM[:ss[.uuuuuu]])ですが、無効な時刻です。" msgid "Time" msgstr "時刻" @@ -591,7 +631,7 @@ msgstr "生のバイナリデータ" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "“%(value)s” は有効なUUIDではありません。" msgid "Universally unique identifier" msgstr "汎用一意識別子" @@ -602,6 +642,12 @@ msgstr "ファイル" msgid "Image" msgstr "画像" +msgid "A JSON object" +msgstr "JSONオブジェクト" + +msgid "Value must be valid JSON." +msgstr "JSONとして正しい値にしてください。" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s が %(value)r である %(model)s のインスタンスは存在しません。" @@ -694,6 +740,9 @@ msgstr "すべての値を入力してください。" msgid "Enter a valid UUID." msgstr "UUIDを正しく入力してください。" +msgid "Enter a valid JSON." +msgstr "JSONを正しく入力してください。" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -702,18 +751,21 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(隠しフィールド %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "マネジメントフォームのデータが見つからないか、改竄されています。" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "%d 個またはそれより少ないフォームを送信してください。" +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "%d 個またはそれより多いフォームを送信してください。" +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" msgid "Order" msgstr "並び変え" @@ -750,13 +802,15 @@ msgstr "正しく選択してください。選択したものは候補にあり #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s” は無効な値です。" #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s は %(current_timezone)s のタイムゾーンでは解釈できませんでした。" +"それは曖昧であるか、存在しない可能性があります。" msgid "Clear" msgstr "クリア" @@ -776,15 +830,7 @@ msgstr "はい" msgid "No" msgstr "いいえ" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "はい,いいえ,たぶん" @@ -1086,9 +1132,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -msgid "0 minutes" -msgstr "0 分" - msgid "Forbidden" msgstr "アクセス禁止" @@ -1101,12 +1144,18 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"このメッセージが表示されている理由は、このHTTPSのサイトはウェブブラウザからリ" +"ファラーヘッダが送信されることを必須としていますが、送信されなかったためで" +"す。このヘッダはセキュリティ上の理由(使用中のブラウザが第三者によってハイ" +"ジャックされていないことを確認するため)で必要です。" msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"もしブラウザのリファラーヘッダを無効に設定しているならば、HTTPS接続やsame-" +"originリクエストのために、少なくともこのサイトでは再度有効にしてください。" msgid "" "If you are using the tag or " @@ -1115,6 +1164,11 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"もし タグを使用しているか " +"“Referrer-Policy: no-referrer” ヘッダを含んでいる場合は削除してください。" +"CSRF プロテクションは、厳密に “Referer” ヘッダが必要です。プライバシーが気に" +"なる場合は などの代替で第三者サイトと接続してくださ" +"い。" msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1129,6 +1183,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"もしブラウザのクッキーを無効に設定しているならば、same-originリクエストのため" +"に少なくともこのサイトでは再度有効にしてください。" msgid "More information is available with DEBUG=True." msgstr "詳細な情報は DEBUG=True を設定すると利用できます。" @@ -1162,14 +1218,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "指定された形式 “%(format)s” では “%(datestr)s” は無効な日付文字列です" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "クエリーに一致する %(verbose_name)s は見つかりませんでした" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "ページが 「最後」ではないか、数値に変換できる値ではありません。" #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1177,21 +1233,21 @@ msgstr "無効なページです (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "空の一覧かつ “%(class_name)s.allow_empty” が False です。" msgid "Directory indexes are not allowed here." msgstr "ここではディレクトリインデックスが許可されていません。" #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” が存在しません" #, python-format msgid "Index of %(directory)s" msgstr "%(directory)sのディレクトリインデックス" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: 納期を逃さない完璧主義者のためのWebフレームワーク" +msgid "The install worked successfully! Congratulations!" +msgstr "インストールは成功しました！おめでとうございます！" #, python-format msgid "" @@ -1201,9 +1257,6 @@ msgstr "" "Django%(version)sのリリースノートを見る。" -msgid "The install worked successfully! Congratulations!" -msgstr "インストールは成功しました！おめでとうございます！" - #, python-format msgid "" "You are seeing this page because , 2014 # JunGu Kang , 2017 # Jiyoon, Ha , 2016 +# DONGHO JEONG , 2020 # Park Hyunwoo , 2017 # Geonho Kim / Leo Kim , 2019 # hoseung2 , 2017 # Ian Y. Choi , 2015 # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jay Oh , 2020 # Le Tartuffe , 2014,2016 # Jonghwa Seo , 2019 +# Jubeen Lee , 2020 # JuneHyeon Bae , 2014 # JunGu Kang , 2015 # JunGu Kang , 2019 # Kagami Sascha Rosylight , 2017 -# Noh Seho , 2018 +# Seho Noh , 2018 # Subin Choi , 2016 # Taesik Yoon , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-09-05 12:57+0000\n" +"Last-Translator: DONGHO JEONG \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,6 +42,9 @@ msgstr "아프리칸스어" msgid "Arabic" msgstr "아랍어" +msgid "Algerian Arabic" +msgstr "알제리 아랍어" + msgid "Asturian" msgstr "호주어" @@ -162,6 +168,9 @@ msgstr "인테르링구아어" msgid "Indonesian" msgstr "인도네시아어" +msgid "Igbo" +msgstr "이그보어" + msgid "Ido" msgstr "이도어" @@ -192,6 +201,9 @@ msgstr "칸나다어" msgid "Korean" msgstr "한국어" +msgid "Kyrgyz" +msgstr "키르키즈 공화국어" + msgid "Luxembourgish" msgstr "룩셈부르크" @@ -276,9 +288,15 @@ msgstr "타밀어" msgid "Telugu" msgstr "텔루구어" +msgid "Tajik" +msgstr "타지크어" + msgid "Thai" msgstr "태국어" +msgid "Turkmen" +msgstr "튀르크멘어" + msgid "Turkish" msgstr "터키어" @@ -295,7 +313,7 @@ msgid "Urdu" msgstr "우르드어" msgid "Uzbek" -msgstr "" +msgstr "우즈베크어" msgid "Vietnamese" msgstr "베트남어" @@ -342,12 +360,14 @@ msgstr "올바른 이메일 주소를 입력하세요." #. Translators: "letters" means latin letters: a-z and A-Z. msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." -msgstr "" +msgstr "문자, 숫자, '_', '-'만 가능합니다." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"유니코드 문자, 숫자, 언더스코어 또는 하이픈으로 구성된 올바른 내용을 입력하세" +"요." msgid "Enter a valid IPv4 address." msgstr "올바른 IPv4 주소를 입력하세요." @@ -422,6 +442,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"파일 확장자 '%(extension)s'는 허용되지 않습니다. 허용된 확장자: " +"'%(allowed_extensions)s'." msgid "Null characters are not allowed." msgstr "null 문자는 사용할 수 없습니다. " @@ -462,14 +484,14 @@ msgstr "%(field_type)s 형식 필드" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "'%(value)s' 값은 반드시 True 또는 False 중 하나여야만 합니다." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "'%(value)s'값은 반드시 True, False, None 중 하나여야만 합니다." msgid "Boolean (Either True or False)" -msgstr "boolean(참 또는 거짓)" +msgstr "boolean(True 또는 False)" #, python-format msgid "String (up to %(max_length)s)" @@ -482,13 +504,14 @@ msgstr "정수(콤마로 구분)" msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "" +msgstr "'%(value)s' 값은 날짜 형식이 아닙니다. YYYY-MM-DD 형식이어야 합니다." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"'%(value)s' 값은 올바른 형식(YYYY-MM-DD)이지만 유효하지 않은 날짜입니다." msgid "Date (without time)" msgstr "날짜(시간 제외)" @@ -498,19 +521,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"'%(value)s' 값은 올바르지 않은 형식입니다. YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ] 형식이어야 합니다." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"'%(value)s' 값은 올바른 형식이지만 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 유효" +"하지 않은 날짜/시간입니다." msgid "Date (with time)" msgstr "날짜(시간 포함)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "'%(value)s' 값은 10진수를 입력하여야 합니다." msgid "Decimal number" msgstr "10진수" @@ -520,6 +547,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"'%(value)s' 값은 올바르지 않은 형식입니다. [DD] [HH:[MM:]]ss[.uuuuuu] 형식이" +"어야 합니다." msgid "Duration" msgstr "지속시간" @@ -558,7 +587,10 @@ msgid "“%(value)s” value must be either None, True or False." msgstr "\"%(value)s\" 값은 반드시 None, True 또는 False이어야 합니다." msgid "Boolean (Either True, False or None)" -msgstr "boolean (참, 거짓 또는 none)" +msgstr "boolean (True, False 또는 None)" + +msgid "Positive big integer" +msgstr "큰 양의 정수" msgid "Positive integer" msgstr "양의 정수" @@ -606,7 +638,7 @@ msgid "“%(value)s” is not a valid UUID." msgstr "\"%(value)s\"은 유효하지 않은 UUID입니다." msgid "Universally unique identifier" -msgstr "" +msgstr "범용 고유 식별 수단(UUID)" msgid "File" msgstr "파일" @@ -614,6 +646,12 @@ msgstr "파일" msgid "Image" msgstr "이미지" +msgid "A JSON object" +msgstr "JSON 객체" + +msgid "Value must be valid JSON." +msgstr "올바른 JSON 형식이여야 합니다." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s %(value)r 를 가지는 %(model)s 인스턴스가 존재하지 않습니다." @@ -702,6 +740,9 @@ msgstr "완전한 값을 입력하세요." msgid "Enter a valid UUID." msgstr "올바른 UUID를 입력하세요." +msgid "Enter a valid JSON." +msgstr "올바른 JSON을 입력하세요." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -756,13 +797,15 @@ msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목 #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "\"%(pk)s\" 은/는 유효한 값이 아닙니다." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s 은/는 %(current_timezone)s 시간대에서 해석될 수 없습니다; 정보" +"가 모호하거나 존재하지 않을 수 있습니다." msgid "Clear" msgstr "취소" @@ -782,15 +825,7 @@ msgstr "예" msgid "No" msgstr "아니오" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "예,아니오,아마도" @@ -1092,9 +1127,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d분" -msgid "0 minutes" -msgstr "0분" - msgid "Forbidden" msgstr "Forbidden" @@ -1107,12 +1139,18 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"이 메세지가 보이는 이유는 이 HTTPS 사이트가 당신의 웹 브라우저로부터 '참조 헤" +"더'를 요구하지만, 아무것도 받기 못하였기 때문입니다. 이 헤더는 보안상의 문제" +"로 필요하며, 제3자에 의해 당신의 웹 브라우저가 해킹당하고 있지 않다는 것을 보" +"장합니다." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"만약 브라우저 설정에서 '참조' 헤더를 비활성화 시켰을 경우, 적어도 이 사이트" +"나 HTTPS 연결, '동일-출처' 요청에 대해서는 이를 다시 활성화 시키십시오. " msgid "" "If you are using the tag or " @@ -1121,6 +1159,11 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"태그나 'Referrer-Policy: no-" +"referrer' 헤더를 포함하고 있다면, 제거해주시기 바랍니다. CSRF 방지를 위한 리" +"퍼러 검사를 위해 'Referer' 헤더가 필요합니다. 개인 정보에 대해 우려가 있는 경" +"우, 서드 파티 사이트에 대한 링크에 와 같은 대안을 사" +"용할 수 있습니다." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1135,6 +1178,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"만약 브라우저 설정에서 쿠키를 비활성화 시켰을 경우, 적어도 이 사이트나 '동일-" +"출처' 요청에 대해서는 활성화 시키십시오." msgid "More information is available with DEBUG=True." msgstr "DEBUG=True 로 더 많은 정보를 확인할 수 있습니다." @@ -1168,14 +1213,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "날짜 문자열 '%(datestr)s'이 표준 형식 '%(format)s'과 다릅니다." #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "쿼리 결과에 %(verbose_name)s가 없습니다." msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "'마지막' 페이지가 아니거나, 정수형으로 변환할 수 없습니다." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1183,14 +1228,14 @@ msgstr "Invalid page (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "빈 리스트이고 '%(class_name)s.allow_empty'가 False입니다." msgid "Directory indexes are not allowed here." msgstr "디렉토리 인덱스는 이곳에 사용할 수 없습니다." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "\"%(path)s\" 이/가 존재하지 않습니다." #, python-format msgid "Index of %(directory)s" @@ -1225,7 +1270,7 @@ msgid "Django Documentation" msgstr "Django 문서" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "주제, 레퍼런스, & 입문참조하다" msgid "Tutorial: A Polling App" msgstr "튜토리얼: 폴링 애플리케이션" diff --git a/django/conf/locale/ky/LC_MESSAGES/django.mo b/django/conf/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..e39498447b3e Binary files /dev/null and b/django/conf/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ky/LC_MESSAGES/django.po b/django/conf/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..b923e3b9d516 --- /dev/null +++ b/django/conf/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,1276 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020-2021 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-02 11:54+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Afrikaans" +msgstr "Африканча" + +msgid "Arabic" +msgstr "Арабча" + +msgid "Algerian Arabic" +msgstr "Алжир арабчасы" + +msgid "Asturian" +msgstr "Австрийче" + +msgid "Azerbaijani" +msgstr "Азерче" + +msgid "Bulgarian" +msgstr "Болгарча" + +msgid "Belarusian" +msgstr "Белорусча" + +msgid "Bengali" +msgstr "Бенгалча" + +msgid "Breton" +msgstr "Бретончо" + +msgid "Bosnian" +msgstr "Босния" + +msgid "Catalan" +msgstr "Каталан" + +msgid "Czech" +msgstr "Чехче" + +msgid "Welsh" +msgstr "Валлий" + +msgid "Danish" +msgstr "Данчийче" + +msgid "German" +msgstr "Немисче" + +msgid "Lower Sorbian" +msgstr "Сорб" + +msgid "Greek" +msgstr "Грекче" + +msgid "English" +msgstr "Англисче" + +msgid "Australian English" +msgstr "Авс. Англисчеси" + +msgid "British English" +msgstr "Бр. Англ." + +msgid "Esperanto" +msgstr "Есперанто" + +msgid "Spanish" +msgstr "Испанча" + +msgid "Argentinian Spanish" +msgstr "Арг. исп" + +msgid "Colombian Spanish" +msgstr "Колумб Испанчасы" + +msgid "Mexican Spanish" +msgstr "Мекс. исп" + +msgid "Nicaraguan Spanish" +msgstr "Никарагуа испанчасы" + +msgid "Venezuelan Spanish" +msgstr "Венесуела Испанчасы" + +msgid "Estonian" +msgstr "Эстон" + +msgid "Basque" +msgstr "Баск" + +msgid "Persian" +msgstr "Персче" + +msgid "Finnish" +msgstr "Финче" + +msgid "French" +msgstr "Французча" + +msgid "Frisian" +msgstr "Фризче" + +msgid "Irish" +msgstr "Ирланча" + +msgid "Scottish Gaelic" +msgstr "Шотланча" + +msgid "Galician" +msgstr "Галицианча" + +msgid "Hebrew" +msgstr "Жөөтчө" + +msgid "Hindi" +msgstr "Хиндче" + +msgid "Croatian" +msgstr "Хорватча" + +msgid "Upper Sorbian" +msgstr "Жогорку Сорбчо" + +msgid "Hungarian" +msgstr "Венгрче" + +msgid "Armenian" +msgstr "Арменче" + +msgid "Interlingua" +msgstr "Эл аралык" + +msgid "Indonesian" +msgstr "Индонезче" + +msgid "Igbo" +msgstr "Игбо" + +msgid "Ido" +msgstr "идо" + +msgid "Icelandic" +msgstr "Исландча" + +msgid "Italian" +msgstr "Итальянча" + +msgid "Japanese" +msgstr "Жапончо" + +msgid "Georgian" +msgstr "Грузинче" + +msgid "Kabyle" +msgstr "Кабилче" + +msgid "Kazakh" +msgstr "Казакча" + +msgid "Khmer" +msgstr "Кхмер" + +msgid "Kannada" +msgstr "Канадча" + +msgid "Korean" +msgstr "Корейче" + +msgid "Kyrgyz" +msgstr "Кыргызча" + +msgid "Luxembourgish" +msgstr "Люкцембургча" + +msgid "Lithuanian" +msgstr "Литвача" + +msgid "Latvian" +msgstr "Латвияча" + +msgid "Macedonian" +msgstr "Македончо" + +msgid "Malayalam" +msgstr "Малаяламча" + +msgid "Mongolian" +msgstr "Монголчо" + +msgid "Marathi" +msgstr "Марати" + +msgid "Burmese" +msgstr "Бурмача" + +msgid "Norwegian Bokmål" +msgstr "Норвег Бокмолчо" + +msgid "Nepali" +msgstr "Непалча" + +msgid "Dutch" +msgstr "Голландча" + +msgid "Norwegian Nynorsk" +msgstr "Норвегиялык нюнор" + +msgid "Ossetic" +msgstr "Оссетче" + +msgid "Punjabi" +msgstr "Пенжабча" + +msgid "Polish" +msgstr "Полякча" + +msgid "Portuguese" +msgstr "Португалча" + +msgid "Brazilian Portuguese" +msgstr "Бразилиялык португалчасы" + +msgid "Romanian" +msgstr "Румынча" + +msgid "Russian" +msgstr "Орусча" + +msgid "Slovak" +msgstr "Словакча" + +msgid "Slovenian" +msgstr "Словенияча" + +msgid "Albanian" +msgstr "Албанча" + +msgid "Serbian" +msgstr "Сербче" + +msgid "Serbian Latin" +msgstr "Серб латынчасы" + +msgid "Swedish" +msgstr "Шведче" + +msgid "Swahili" +msgstr "Свахилче" + +msgid "Tamil" +msgstr "Тамиль" + +msgid "Telugu" +msgstr "Телугу" + +msgid "Tajik" +msgstr "Тажикче" + +msgid "Thai" +msgstr "Тайча" + +msgid "Turkmen" +msgstr "Түркмөнчө" + +msgid "Turkish" +msgstr "Түркчө" + +msgid "Tatar" +msgstr "Татарча" + +msgid "Udmurt" +msgstr "Удмурча" + +msgid "Ukrainian" +msgstr "Украинче" + +msgid "Urdu" +msgstr "Урду" + +msgid "Uzbek" +msgstr "Өзбекче" + +msgid "Vietnamese" +msgstr "Вьетнамча" + +msgid "Simplified Chinese" +msgstr "Жеңилдетилген кытайча" + +msgid "Traditional Chinese" +msgstr "салттык кытайча" + +msgid "Messages" +msgstr "Билдирүүлөр" + +msgid "Site Maps" +msgstr "сайт картасы" + +msgid "Static Files" +msgstr "Туруктуу файлдар" + +msgid "Syndication" +msgstr "Синдикат" + +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "..." + +msgid "That page number is not an integer" +msgstr "Бул барактын номуру сан эмес" + +msgid "That page number is less than 1" +msgstr "Бул барактын номуру 1 ден кичине" + +msgid "That page contains no results" +msgstr "Бул баракта жыйынтык жок" + +msgid "Enter a valid value." +msgstr "Туура маани киргиз" + +msgid "Enter a valid URL." +msgstr "Туура URL киргиз" + +msgid "Enter a valid integer." +msgstr "Туура натурал сан тер." + +msgid "Enter a valid email address." +msgstr "Туура эдарек тер." + +#. Translators: "letters" means latin letters: a-z and A-Z. +msgid "" +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." +msgstr "" +"ариптер, цифралар, дефис же астыңкы сызык камтыган туура слаг киргизиңиз." + +msgid "" +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " +"hyphens." +msgstr "" +"Юникод символдор, цифралар, астыңкы сызыктар же дефис камтыган туурга слаг " +"киргизиңиз." + +msgid "Enter a valid IPv4 address." +msgstr "Туура IPv4 тер." + +msgid "Enter a valid IPv6 address." +msgstr "Туура IPv6 тер." + +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Туура IPv4 же IPv6 тер." + +msgid "Enter only digits separated by commas." +msgstr "Жалаң үтүр менен бөлүнгөн сан тер." + +#, python-format +msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." +msgstr "Бул маани %(limit_value)s ашпоосун текшериңиз (азыр %(show_value)s)" + +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "%(limit_value)s карата кичине же барабар маани болгонун текшериңиз" + +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "%(limit_value)s карата чоң же барабар маани болгонун текшериңиз" + +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Бул маани жок дегенде %(limit_value)dсимвол камтыганын текшериңиз (азыркысы " +"%(show_value)d)." + +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Бул маани эң көп %(limit_value)dсимвол камтыганын текшериңиз (азыркысы " +"%(show_value)d)." + +msgid "Enter a number." +msgstr "Сан киргизиңиз." + +#, python-format +msgid "Ensure that there are no more than %(max)s digit in total." +msgid_plural "Ensure that there are no more than %(max)s digits in total." +msgstr[0] "Жалпысынан %(max)sорундан ашпоосун текшериңиз." + +#, python-format +msgid "Ensure that there are no more than %(max)s decimal place." +msgid_plural "Ensure that there are no more than %(max)s decimal places." +msgstr[0] "Жалпысынан ондук сандын%(max)s ашпоосун текшериңиз." + +#, python-format +msgid "" +"Ensure that there are no more than %(max)s digit before the decimal point." +msgid_plural "" +"Ensure that there are no more than %(max)s digits before the decimal point." +msgstr[0] "Жалпысынан үтүргө чейин%(max)s ашпоосун текшериңиз." + +#, python-format +msgid "" +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." +msgstr "" +"%(extension)sфайл кеңейтүүсү кабыл алынбайт. Кабыл алынгандар: " +"%(allowed_extensions)s." + +msgid "Null characters are not allowed." +msgstr "Боштук кабыл алынбайт" + +msgid "and" +msgstr "жана" + +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s бул %(field_labels)s менен мурдатан эле бар" + +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "%(value)r мааниси туура эмес тандоо." + +msgid "This field cannot be null." +msgstr "Бул аймак жок маани албашы керек" + +msgid "This field cannot be blank." +msgstr "Бул аймак бош калбашы керек" + +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(model_name)s бул %(field_label)s менен мурдатан эле бар" + +#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. +#. Eg: "Title must be unique for pub_date year" +#, python-format +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." +msgstr "" +"%(field_label)s %(date_field_label)s %(lookup_type)s үчүн уникал болуусу " +"керек." + +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "аймактын түрү: %(field_type)s" + +#, python-format +msgid "“%(value)s” value must be either True or False." +msgstr "“%(value)s” мааниси же True же False болуусу керек." + +#, python-format +msgid "“%(value)s” value must be either True, False, or None." +msgstr "“%(value)s” мааниси же True же False же None болуусу керек." + +msgid "Boolean (Either True or False)" +msgstr "Булен (Туура же Ката)" + +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "Сап (%(max_length)s чейин)" + +msgid "Comma-separated integers" +msgstr "үтүр менен бөлүнгөн сан" + +#, python-format +msgid "" +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " +"format." +msgstr "" +"“%(value)s” мааниси туура эмес форматта. Ал ЖЖЖЖ-АА-КК форматта болуусу " +"керек." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "%(value)sмааниси туура (ЖЖЖЖ-АА-КК) форматта бирок ал күн туура эмес." + +msgid "Date (without time)" +msgstr "Күн (убакытсыз)" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"“%(value)s” мааниси туура эмес форматта. Ал ЖЖЖЖ-АА-КК СС:ММ[сс[.дддддд]]" +"[УЗ] форматта болуусу керек." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." +msgstr "" +"“%(value)s” мааниси туура форматта (ЖЖЖЖ-АА-КК СС:ММ[сс[.дддддд]][УЗ] ) " +"бирок ал күн/убакыт туура эмес." + +msgid "Date (with time)" +msgstr "Күн(убакыттуу)" + +#, python-format +msgid "“%(value)s” value must be a decimal number." +msgstr "“%(value)s” мааниси ондук сан болушу керек." + +msgid "Decimal number" +msgstr "ондук сан" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." +"uuuuuu] format." +msgstr "" +"“%(value)s” мааниси туура эмес форматта. Ал [КК][[CC:]MM:]cc[.дддддд] " +"форматта болуусу керек." + +msgid "Duration" +msgstr "Мөөнөт" + +msgid "Email address" +msgstr "электрондук дарек" + +msgid "File path" +msgstr "файл жайгашуусу" + +#, python-format +msgid "“%(value)s” value must be a float." +msgstr "“%(value)s” мааниси калкыган чекиттүү болуусу керек." + +msgid "Floating point number" +msgstr "калкыган чекит саны" + +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "“%(value)s” мааниси натуралдык сан болуусу керек." + +msgid "Integer" +msgstr "Натурал сан" + +msgid "Big (8 byte) integer" +msgstr "Чоң ( 8 байт) натурал сан" + +msgid "Small integer" +msgstr "кичине натурал сан" + +msgid "IPv4 address" +msgstr "IPv4 дареги" + +msgid "IP address" +msgstr "IP дареги" + +#, python-format +msgid "“%(value)s” value must be either None, True or False." +msgstr "“%(value)s” мааниси же None же True же False болуусу керек." + +msgid "Boolean (Either True, False or None)" +msgstr "Булен(Туура же Жалган же Куру)" + +msgid "Positive big integer" +msgstr "Оң чоң натуралдык сан." + +msgid "Positive integer" +msgstr "оң сан" + +msgid "Positive small integer" +msgstr "кичине оң сан" + +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "слаг ( %(max_length)s чейин)" + +msgid "Text" +msgstr "сап" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." +msgstr "" +"“%(value)s” мааниси туура эмес форматта. Ал СС:ММ[:сс[.ддддддд]] форматта " +"болуусу керек." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." +msgstr "" +"“%(value)s” мааниси туура форматта (СС:ММ[:cc[.дддддд]]) бирок ал убакыт " +"туура эмес." + +msgid "Time" +msgstr "Убакыт" + +msgid "URL" +msgstr "URL" + +msgid "Raw binary data" +msgstr "жалаң экилик берилиш" + +#, python-format +msgid "“%(value)s” is not a valid UUID." +msgstr "“%(value)s” туура эмес UUID." + +msgid "Universally unique identifier" +msgstr "универсал уникал көрсөтүүчү" + +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "Сүрөт" + +msgid "A JSON object" +msgstr "JSON обектиси" + +msgid "Value must be valid JSON." +msgstr "Маани туура JSON болушу керек." + +#, python-format +msgid "%(model)s instance with %(field)s %(value)r does not exist." +msgstr "%(model)s нерсеси %(field)s аймагы %(value)r маани менен табылбады." + +msgid "Foreign Key (type determined by related field)" +msgstr "Бөтөн Ачкыч (байланышкан аймак менен аныкталат)" + +msgid "One-to-one relationship" +msgstr "Бирге-бир байланышы" + +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "%(from)s-%(to)s байланышы" + +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "%(from)s-%(to)s байланыштары" + +msgid "Many-to-many relationship" +msgstr "көпкө-көп байланышы" + +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the +#. label +msgid ":?.!" +msgstr ":?.!" + +msgid "This field is required." +msgstr "Бул талаа керектүү." + +msgid "Enter a whole number." +msgstr "Толук сан киргиз." + +msgid "Enter a valid date." +msgstr "туура күн киргиз." + +msgid "Enter a valid time." +msgstr "Туура убакыт киргиз." + +msgid "Enter a valid date/time." +msgstr "Туура күн/убакыт киргиз." + +msgid "Enter a valid duration." +msgstr "Туура мөөнөт киргиз." + +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "Күндөрдүн саны {min_days} жана {max_days} арасында болуусу керек." + +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Файл жиберилген жок. Формдун бекитүү түрүн текшер." + +msgid "No file was submitted." +msgstr "Файл жиберилген жок." + +msgid "The submitted file is empty." +msgstr "Жиберилген файл бош." + +#, python-format +msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid_plural "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr[0] "" +"Бул файлдын аты эң көп %(max)dсимвол ала алат. (азыркысы %(length)d)." + +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "Сураныч же файл жибериңиз же тандоону бош калтырыңыз. Экөөн тең эмес." + +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Туура сүрөт жөнөтүңүз. Сиз жүктөгөн же сүрөт эмес же бузулган сүрөт." + +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "Туура тандоону танда. %(value)s мүмкүн болгон тандоо эмес." + +msgid "Enter a list of values." +msgstr "Туура маанилер тизмесин киргиз." + +msgid "Enter a complete value." +msgstr "Толук маани киргиз." + +msgid "Enter a valid UUID." +msgstr "Туура UUID киргиз." + +msgid "Enter a valid JSON." +msgstr "Туура JSON киргиз." + +#. Translators: This is the default suffix added to form field labels +msgid ":" +msgstr ":" + +#, python-format +msgid "(Hidden field %(name)s) %(error)s" +msgstr "(жашырылган аймак %(name)s) %(error)s" + +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm берилиши жетишпей атат же жасалма болуп атат. Жетишпеген " +"талаалар: %(field_names)s. Эгер көйгөй чечилбей атса сиз баг билдирүү " +"жөнөтсөңүз болот." + +#, python-format +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Сураныч, эң көп %d форм жөнөтүңүз." + +#, python-format +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Сураныч, эң аз %dформ жөнөтүңүз." + +msgid "Order" +msgstr "Тартип" + +msgid "Delete" +msgstr "Өчүрүү" + +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "%(field)s үчүн кайталанган маанилерди оңдоңуз." + +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "" +"%(field)s үчүн кайталанган маанилерди оңдоңуз алар уникал болуусу керек." + +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"%(field_name)s %(date_field)s да %(lookup)s үчүн уникал болусу керек. " +"Берилиштерди оңдоңуз." + +msgid "Please correct the duplicate values below." +msgstr "Төмөндө кайталанган маанилерди оңдоңуз." + +msgid "The inline value did not match the parent instance." +msgstr "Катардагы маани энелик нерсеге туура келбей жатат." + +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "Туура тандоо кылыңыз. Ал тандоо мүмкүнчүлүктөн сырткары." + +#, python-format +msgid "“%(pk)s” is not a valid value." +msgstr " “%(pk)s”туура эмес маани." + +#, python-format +msgid "" +"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " +"may be ambiguous or it may not exist." +msgstr "" +"%(datetime)sкүнү %(current_timezone)sубактысы боюнча чечмелене албай атат. " +"Ал экианжы же жок болушу мүмкүн." + +msgid "Clear" +msgstr "Тазалоо" + +msgid "Currently" +msgstr "Азыркы" + +msgid "Change" +msgstr "өзгөртүү" + +msgid "Unknown" +msgstr "Белгисиз" + +msgid "Yes" +msgstr "Ооба" + +msgid "No" +msgstr "Жок" + +#. Translators: Please do not add spaces around commas. +msgid "yes,no,maybe" +msgstr "ооба, жок, балким" + +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)dбит" + +#, python-format +msgid "%s KB" +msgstr "%s КБ" + +#, python-format +msgid "%s MB" +msgstr "%s мегабайт" + +#, python-format +msgid "%s GB" +msgstr "%s гигабайт" + +#, python-format +msgid "%s TB" +msgstr "%s терабайт" + +#, python-format +msgid "%s PB" +msgstr "%s пикабайт" + +msgid "p.m." +msgstr "түштөн кийин" + +msgid "a.m." +msgstr "түшкө чейин" + +msgid "PM" +msgstr "Түштөн кийин" + +msgid "AM" +msgstr "Түшкө чейин" + +msgid "midnight" +msgstr "Түнүчү" + +msgid "noon" +msgstr "ай" + +msgid "Monday" +msgstr "Дүйшөмбү" + +msgid "Tuesday" +msgstr "Шейшемби" + +msgid "Wednesday" +msgstr "Шаршемби" + +msgid "Thursday" +msgstr "Бейшемби" + +msgid "Friday" +msgstr "Жума" + +msgid "Saturday" +msgstr "Ишемби" + +msgid "Sunday" +msgstr "Жекшемби" + +msgid "Mon" +msgstr "Дүйш" + +msgid "Tue" +msgstr "Шей" + +msgid "Wed" +msgstr "Шар" + +msgid "Thu" +msgstr "Бей" + +msgid "Fri" +msgstr "Жума" + +msgid "Sat" +msgstr "Ише" + +msgid "Sun" +msgstr "Жек" + +msgid "January" +msgstr "Январь" + +msgid "February" +msgstr "Февраль" + +msgid "March" +msgstr "Март" + +msgid "April" +msgstr "Апрель" + +msgid "May" +msgstr "Май" + +msgid "June" +msgstr "Июнь" + +msgid "July" +msgstr "Июль" + +msgid "August" +msgstr "Август" + +msgid "September" +msgstr "Сентябрь" + +msgid "October" +msgstr "Октябрь" + +msgid "November" +msgstr "Ноябрь" + +msgid "December" +msgstr "Декабрь" + +msgid "jan" +msgstr "янв" + +msgid "feb" +msgstr "фев" + +msgid "mar" +msgstr "мар" + +msgid "apr" +msgstr "апр" + +msgid "may" +msgstr "май" + +msgid "jun" +msgstr "июн" + +msgid "jul" +msgstr "июл" + +msgid "aug" +msgstr "авг" + +msgid "sep" +msgstr "сен" + +msgid "oct" +msgstr "окт" + +msgid "nov" +msgstr "ноя" + +msgid "dec" +msgstr "дек" + +msgctxt "abbrev. month" +msgid "Jan." +msgstr "Янв." + +msgctxt "abbrev. month" +msgid "Feb." +msgstr "Фев." + +msgctxt "abbrev. month" +msgid "March" +msgstr "Март" + +msgctxt "abbrev. month" +msgid "April" +msgstr "Апрель" + +msgctxt "abbrev. month" +msgid "May" +msgstr "Май" + +msgctxt "abbrev. month" +msgid "June" +msgstr "Июнь" + +msgctxt "abbrev. month" +msgid "July" +msgstr "Июль" + +msgctxt "abbrev. month" +msgid "Aug." +msgstr "Авг." + +msgctxt "abbrev. month" +msgid "Sept." +msgstr "Сен." + +msgctxt "abbrev. month" +msgid "Oct." +msgstr "Окт." + +msgctxt "abbrev. month" +msgid "Nov." +msgstr "Ноя." + +msgctxt "abbrev. month" +msgid "Dec." +msgstr "Дек." + +msgctxt "alt. month" +msgid "January" +msgstr "Январь" + +msgctxt "alt. month" +msgid "February" +msgstr "Февраль" + +msgctxt "alt. month" +msgid "March" +msgstr "Март" + +msgctxt "alt. month" +msgid "April" +msgstr "Апрель" + +msgctxt "alt. month" +msgid "May" +msgstr "Май" + +msgctxt "alt. month" +msgid "June" +msgstr "Июнь" + +msgctxt "alt. month" +msgid "July" +msgstr "Июль" + +msgctxt "alt. month" +msgid "August" +msgstr "Август" + +msgctxt "alt. month" +msgid "September" +msgstr "Сентябрь" + +msgctxt "alt. month" +msgid "October" +msgstr "Октябрь" + +msgctxt "alt. month" +msgid "November" +msgstr "Ноябрь" + +msgctxt "alt. month" +msgid "December" +msgstr "Декабрь" + +msgid "This is not a valid IPv6 address." +msgstr "Бул туура эмес IPv6 дареги" + +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s…" +msgstr "%(truncated_text)s..." + +msgid "or" +msgstr "же" + +#. Translators: This string is used as a separator between list elements +msgid ", " +msgstr "," + +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%dжыл" + +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%dай" + +#, python-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%dжума" + +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%dкүн" + +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%dсаат" + +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%dмүнөт" + +msgid "Forbidden" +msgstr "Тыйылган" + +msgid "CSRF verification failed. Request aborted." +msgstr "CSRF текшерүү кыйрады. Суроо четке кагылды." + +msgid "" +"You are seeing this message because this HTTPS site requires a “Referer " +"header” to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." +msgstr "" +"Сиз бул билдирүүнү HTTPS сайты, браузер тарабынан жөнөтүлчү “Referer header” " +"тарабынан талап кылынганы бирок жөнөтүлбөгөндүгү үчүн көрүп атасыз. Бул " +"хэдер коопсуздук чаралары үчүн керек болот. Сиздин броузер үчүнчү тараптан " +"барымтага алынбаганын текшериңиз." + +msgid "" +"If you have configured your browser to disable “Referer” headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for “same-" +"origin” requests." +msgstr "" +"Эгер сиз броузерден “Referer” хэдерин өчүрүп салсаңыз, аны күйгүзүп коюңуз. " +"Жок дегенде ушул сайт үчүн же жок дегенде HTTPS байланышуу үчүн. Же болбосо " +"“same-origin” суроолору үчүн." + +msgid "" +"If you are using the tag or " +"including the “Referrer-Policy: no-referrer” header, please remove them. The " +"CSRF protection requires the “Referer” header to do strict referer checking. " +"If you’re concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" +"Эгер сиз тегин же “Referrer-" +"Policy: no-referrer” хэдерин колдонуп жатсаңыз, аларды өчүрүп салыңыз. CSRF " +"коргоосу “Referer” хэдерин талап кылат. Эгер сиз коопсуздук жөнүндө " +"кабатырланып атсаңыз үчүнчү жактар үчүн шилтемесин " +"колдонуңуз." + +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" +"Сиз бул билдирүүнү бул сайт форм жиберүүдө CSRF кукини талап кылгандыгы үчүн " +"көрүп жатасыз. Бул куки коопсуздуктан улам сиздин сайтыңыз үчүнчү жактан " +"чабуулга кабылбаганын текшерүү үчүн талап кылынат. " + +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for “same-origin” requests." +msgstr "" +"Эгер сиз броузерде кукиледи өчүрүп койсоңуз, аларды кайра күйгүзүп коюңуз. " +"Жок дегенде ушул сайтка же “same-origin” суроолоруна." + +msgid "More information is available with DEBUG=True." +msgstr "Сиз бул маалыматты DEBUG=True болгону үчүн көрүп жатасыз." + +msgid "No year specified" +msgstr "Жыл көрсөтүлгөн эмес" + +msgid "Date out of range" +msgstr "Күн чектен сырткары" + +msgid "No month specified" +msgstr "Ай көрсөтүлгөн эмес" + +msgid "No day specified" +msgstr "Апта күнү көрсөтүлгөн эмес" + +msgid "No week specified" +msgstr "Апта көрсөтүлгө эмес" + +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "%(verbose_name_plural)s жок" + +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"%(verbose_name_plural)s future си тейленбейт. Себеби %(class_name)s." +"allow_future си False маани алган." + +#, python-format +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" +msgstr "Туура эмес күн сабы “%(datestr)s” берилген формат болсо “%(format)s”." + +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "суроого эч бир %(verbose_name)s табылбады" + +msgid "Page is not “last”, nor can it be converted to an int." +msgstr "Барак акыркы эмес. Же натуралдык санга өткөрүлө албай атат." + +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "Туура эмес (%(page_number)s) барак: %(message)s" + +#, python-format +msgid "Empty list and “%(class_name)s.allow_empty” is False." +msgstr "Бош тизме жана “%(class_name)s.allow_empty” = False болуп калган." + +msgid "Directory indexes are not allowed here." +msgstr "Папка индекстери бул жерде иштей албайт." + +#, python-format +msgid "“%(path)s” does not exist" +msgstr "“%(path)s” жашабайт" + +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s индексттери" + +msgid "The install worked successfully! Congratulations!" +msgstr "Орнотуу ийгиликтүү аяктады! Куттуу болсун!" + +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" +"Жанго %(version)s үчүн чыгарылыш " +"эскертмелерин кара." + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " +"URLs." +msgstr "" +"Сиз бул бетти сиздин тууралоо файлыңызда DEBUG=True жана эчбир урл тууралабагандыгыңыз үчүн көрүп " +"жататсыз." + +msgid "Django Documentation" +msgstr "Жанго Түшүндүрмөсү" + +msgid "Topics, references, & how-to’s" +msgstr "Темалар, Сурамжылар, & кантип.. тер" + +msgid "Tutorial: A Polling App" +msgstr "Колдонмо:" + +msgid "Get started with Django" +msgstr "Жангону башта" + +msgid "Django Community" +msgstr "Жанго жамааты" + +msgid "Connect, get help, or contribute" +msgstr "Туташ, жардам ал, же салым кош" diff --git a/django/conf/locale/ky/__init__.py b/django/conf/locale/ky/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/conf/locale/ky/formats.py b/django/conf/locale/ky/formats.py new file mode 100644 index 000000000000..1dc42c41e417 --- /dev/null +++ b/django/conf/locale/ky/formats.py @@ -0,0 +1,32 @@ +# This file is distributed under the same license as the Django package. +# +# The *_FORMAT strings use the Django date format syntax, +# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +DATE_FORMAT = 'j E Y ж.' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j E Y ж. G:i' +YEAR_MONTH_FORMAT = 'F Y ж.' +MONTH_DAY_FORMAT = 'j F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' +FIRST_DAY_OF_WEEK = 1 # Дүйшөмбү, Monday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = [ + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y', # '25.10.06' +] +DATETIME_INPUT_FORMATS = [ + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200' + '%d.%m.%y %H:%M', # '25.10.06 14:30' + '%d.%m.%y', # '25.10.06' +] +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo index c8efe4a3df62..5b90ead5d54b 100644 Binary files a/django/conf/locale/lv/LC_MESSAGES/django.mo and b/django/conf/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/lv/LC_MESSAGES/django.po b/django/conf/locale/lv/LC_MESSAGES/django.po index cd78c3795a00..fd9b6562dbb0 100644 --- a/django/conf/locale/lv/LC_MESSAGES/django.po +++ b/django/conf/locale/lv/LC_MESSAGES/django.po @@ -8,14 +8,14 @@ # krikulis , 2014 # Māris Nartišs , 2016 # Mārtiņš Šulcs , 2018 -# NullIsNot0 , 2018-2019 +# NullIsNot0 , 2018-2021 # peterisb , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-07 07:15+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-25 23:29+0000\n" "Last-Translator: NullIsNot0 \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -32,6 +32,9 @@ msgstr "afrikāņu" msgid "Arabic" msgstr "arābu" +msgid "Algerian Arabic" +msgstr "Alžīrijas arābu" + msgid "Asturian" msgstr "asturiešu" @@ -155,6 +158,9 @@ msgstr "modernā latīņu valoda" msgid "Indonesian" msgstr "indonēziešu" +msgid "Igbo" +msgstr "igbo" + msgid "Ido" msgstr "ido" @@ -185,6 +191,9 @@ msgstr "kannādiešu" msgid "Korean" msgstr "korejiešu" +msgid "Kyrgyz" +msgstr "kirgīzu" + msgid "Luxembourgish" msgstr "luksemburgiešu" @@ -269,9 +278,15 @@ msgstr "tamilu" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tadžiku" + msgid "Thai" msgstr "taizemiešu" +msgid "Turkmen" +msgstr "turkmēņu" + msgid "Turkish" msgstr "turku" @@ -311,6 +326,11 @@ msgstr "Statiski faili" msgid "Syndication" msgstr "Sindikācija" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Lapas numurs nav cipars" @@ -569,6 +589,9 @@ msgstr "Vesels skaitlis" msgid "Big (8 byte) integer" msgstr "Liels (8 baitu) vesels skaitlis" +msgid "Small integer" +msgstr "Mazs vesels skaitlis" + msgid "IPv4 address" msgstr "IPv4 adrese" @@ -582,6 +605,9 @@ msgstr "“%(value)s” vērtībai ir jābūt None, True vai False." msgid "Boolean (Either True, False or None)" msgstr "Boolean (jā, nē vai neviens)" +msgid "Positive big integer" +msgstr "Liels pozitīvs vesels skaitlis" + msgid "Positive integer" msgstr "Naturāls skaitlis" @@ -592,9 +618,6 @@ msgstr "Mazs pozitīvs vesels skaitlis" msgid "Slug (up to %(max_length)s)" msgstr "Identifikators (līdz %(max_length)s)" -msgid "Small integer" -msgstr "Mazs vesels skaitlis" - msgid "Text" msgstr "Teksts" @@ -636,6 +659,12 @@ msgstr "Fails" msgid "Image" msgstr "Attēls" +msgid "A JSON object" +msgstr "JSON objekts" + +msgid "Value must be valid JSON." +msgstr "Vērtībai ir jābūt derīgam JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s instance ar %(field)s %(value)r neeksistē." @@ -729,6 +758,9 @@ msgstr "Ievadiet pilnu vērtību." msgid "Enter a valid UUID." msgstr "Ievadi derīgu UUID." +msgid "Enter a valid JSON." +msgstr "Ievadiet korektu JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -737,22 +769,27 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Slēpts lauks %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Trūkst ManagementForm dati vai arī tie ir bojāti" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm trūkst datu vai tie ir mainīti. Trūkstošie lauki: " +"%(field_names)s. Paziņojiet par kļūdu, ja problēma atkārtojas." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Lūdzu ievadiet %d vai mazāk formas." -msgstr[1] "Lūdzu ievadiet %d vai mazāk formas." -msgstr[2] "Lūdzu ievadiet %d vai mazāk formas." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Lūdzu iesniedziet ne vairāk kā %d formu." +msgstr[1] "Lūdzu iesniedziet ne vairāk kā %d formu." +msgstr[2] "Lūdzu iesniedziet ne vairāk kā %d formas." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Lūdzu ievadiet %d vai vairāk formas " -msgstr[1] "Lūdzu ievadiet %d vai vairāk formas " -msgstr[2] "Lūdzu ievadiet %d vai vairāk formas " +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Lūdzu iesniedziet vismaz %d formu." +msgstr[1] "Lūdzu iesniedziet vismaz %d formu." +msgstr[2] "Lūdzu iesniedziet vismaz %d formas." msgid "Order" msgstr "Sakārtojums" @@ -816,15 +853,7 @@ msgstr "Jā" msgid "No" msgstr "Nē" -msgid "Year" -msgstr "Gads" - -msgid "Month" -msgstr "Mēnesis" - -msgid "Day" -msgstr "Diena" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "jā,nē,varbūt" @@ -1140,9 +1169,6 @@ msgstr[0] "%d minūtes" msgstr[1] "%d minūte" msgstr[2] "%d minūtes" -msgid "0 minutes" -msgstr "0 minūšu" - msgid "Forbidden" msgstr "Aizliegts" @@ -1260,8 +1286,8 @@ msgstr "\"%(path)s\" neeksistē" msgid "Index of %(directory)s" msgstr "%(directory)s saturs" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Web izstrādes ietvars perfekcionistiem ar izpildes termiņiem." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalācija veiksmīga! Apsveicam!" #, python-format msgid "" @@ -1271,9 +1297,6 @@ msgstr "" "Apskatīt laidiena piezīmes Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalācija veiksmīga! Apsveicam!" - #, python-format msgid "" "You are seeing this page because , 2021 +# Claude Paroz , 2020 # dekomote , 2015 # Jannis Leidel , 2011 # Vasil Vangelovski , 2016-2017 @@ -10,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-05-12 22:47+0000\n" +"Last-Translator: Bojan Drangovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" "MIME-Version: 1.0\n" @@ -27,6 +29,9 @@ msgstr "Африканс" msgid "Arabic" msgstr "Арапски" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Астуриски" @@ -142,7 +147,7 @@ msgid "Hungarian" msgstr "Унгарски" msgid "Armenian" -msgstr "" +msgstr "Ерменски" msgid "Interlingua" msgstr "Интерлингва" @@ -150,6 +155,9 @@ msgstr "Интерлингва" msgid "Indonesian" msgstr "Индонезиски" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Идо" @@ -180,6 +188,9 @@ msgstr "Канада" msgid "Korean" msgstr "Корејски" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Луксембуршки" @@ -264,9 +275,15 @@ msgstr "Тамил" msgid "Telugu" msgstr "Телугу" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Тајландски" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Турски" @@ -306,6 +323,11 @@ msgstr "Статички датотеки" msgid "Syndication" msgstr "Синдикација" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Тој број на страна не е цел број" @@ -425,7 +447,7 @@ msgid "" msgstr "" msgid "Null characters are not allowed." -msgstr "" +msgstr "Null карактери не се дозволени." msgid "and" msgstr "и" @@ -463,7 +485,7 @@ msgstr "Поле од тип: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Вредноста '%(value)s' мора да биде точно или неточно." #, python-format msgid "“%(value)s” value must be either True, False, or None." @@ -548,6 +570,9 @@ msgstr "Цел број" msgid "Big (8 byte) integer" msgstr "Голем (8 бајти) цел број" +msgid "Small integer" +msgstr "Мал цел број" + msgid "IPv4 address" msgstr "IPv4 адреса" @@ -561,6 +586,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Логичка вредност (точно,неточно или ништо)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Позитивен цел број" @@ -571,9 +599,6 @@ msgstr "Позитивен мал цел број" msgid "Slug (up to %(max_length)s)" msgstr "Скратено име (до %(max_length)s знаци)" -msgid "Small integer" -msgstr "Мал цел број" - msgid "Text" msgstr "Текст" @@ -611,6 +636,12 @@ msgstr "Датотека" msgid "Image" msgstr "Слика" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s инстанца со %(field)s %(value)r не постои." @@ -705,6 +736,9 @@ msgstr "Внесете целосна вредност." msgid "Enter a valid UUID." msgstr "Внесете валиден UUID (единствен идентификатор)." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -713,20 +747,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Скриено поле %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Недостасуваат податоци од ManagementForm или некој ги менувал" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Ве молиме поднесете %d или помалку форми." -msgstr[1] "Ве молиме поднесете %d или помалку форми." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Ве молиме поднесете %d или повеќе форми." -msgstr[1] "Ве молиме поднесете %d или повеќе форми." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Редослед" @@ -789,17 +826,9 @@ msgstr "Да" msgid "No" msgstr "Не" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "да, не, можеби" +msgstr "да,не,можеби" #, python-format msgid "%(size)d byte" @@ -1106,9 +1135,6 @@ msgid_plural "%d minutes" msgstr[0] "%d минута" msgstr[1] "%d минути" -msgid "0 minutes" -msgstr "0 минути" - msgid "Forbidden" msgstr "Забрането" @@ -1211,7 +1237,7 @@ msgstr "" msgid "Index of %(directory)s" msgstr "Индекс на %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." +msgid "The install worked successfully! Congratulations!" msgstr "" #, python-format @@ -1220,9 +1246,6 @@ msgid "" "target=\"_blank\" rel=\"noopener\">release notes for Django %(version)s" msgstr "" -msgid "The install worked successfully! Congratulations!" -msgstr "" - #, python-format msgid "" "You are seeing this page because , 2019 +# Claude Paroz , 2020 +# Hrishikesh , 2019-2020 # Jannis Leidel , 2011 # Jaseem KM , 2019 # Jeffy , 2012 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Malayalam (http://www.transifex.com/django/django/language/" "ml/)\n" "MIME-Version: 1.0\n" @@ -28,7 +29,10 @@ msgid "Afrikaans" msgstr "ആഫ്രിക്കാന്‍സ്" msgid "Arabic" -msgstr "അറബിക്" +msgstr "അറബിൿ" + +msgid "Algerian Arabic" +msgstr "അൾഗേരിയൻ അറബിൿ" msgid "Asturian" msgstr "ആസ്ടൂറിയൻ" @@ -153,6 +157,9 @@ msgstr "ഇന്റര്‍ലിംഗ്വാ" msgid "Indonesian" msgstr "ഇന്തൊനേഷ്യന്‍" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "ഈടോ" @@ -183,6 +190,9 @@ msgstr "കന്നഡ" msgid "Korean" msgstr "കൊറിയന്‍" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "ലക്സംബര്‍ഗിഷ് " @@ -267,9 +277,15 @@ msgstr "തമിഴ്" msgid "Telugu" msgstr "തെലുങ്ക്" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "തായ്" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "ടര്‍ക്കിഷ്" @@ -286,7 +302,7 @@ msgid "Urdu" msgstr "ഉര്‍ദു" msgid "Uzbek" -msgstr "" +msgstr "ഉസ്ബെൿ" msgid "Vietnamese" msgstr "വിയറ്റ്നാമീസ്" @@ -334,11 +350,14 @@ msgstr "ശരിയായ ഇമെയില്‍ വിലാസം നല് msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, അണ്ടര്‍സ്കോര്‍, ഹൈഫന്‍ എന്നിവ മാത്രം അടങ്ങിയ ശരിയായ ഒരു 'സ്ലഗ്ഗ്' നൽകുക. " msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"യൂണികോഡ് അക്ഷരങ്ങൾ, അക്കങ്ങൾ, ഹൈഫണുകൾ, അണ്ടർസ്കോറുക‌‌ൾ എന്നിവമാത്രം അടങ്ങിയ ശെരിയായ ‌ഒരു " +"“സ്ലഗ്” എഴുതുക ." msgid "Enter a valid IPv4 address." msgstr "ശരിയായ IPv4 വിലാസം നൽകുക." @@ -420,6 +439,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"“%(extension)s” എന്ന ഫയൽ എക്സ്റ്റൻഷൻ അനുവദനീയമല്ല. അനുവദനീയമായ എക്സ്റ്റൻഷനുകൾ ഇവയാണ്: " +"%(allowed_extensions)s" msgid "Null characters are not allowed." msgstr "Null ക്യാരക്ടറുകൾ അനുവദനീയമല്ല." @@ -459,11 +480,13 @@ msgstr "%(field_type)s എന്ന തരത്തിലുള്ള കളം #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "“%(value)s” മൂല്യം ഒന്നുകിൽ True, False എന്നിവയിലേതെങ്കിലുമേ ആവാൻ പാടുള്ളൂ." #, python-format msgid "“%(value)s” value must be either True, False, or None." msgstr "" +"“%(value)s” മൂല്യം ഒന്നുകിൽ True, False അല്ലെങ്കിൽ None എന്നിവയിലേതെങ്കിലുമേ ആവാൻ " +"പാടുള്ളൂ." msgid "Boolean (Either True or False)" msgstr "ശരിയോ തെറ്റോ (True അഥവാ False)" @@ -557,6 +580,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം (True, False, None എന്നിവയില്‍ ഏതെങ്കിലും ഒന്ന്)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "ധന പൂര്‍ണസംഖ്യ" @@ -607,6 +633,12 @@ msgstr "ഫയല്‍" msgid "Image" msgstr "ചിത്രം" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s%(value)r ഉള്ള%(model)s ഇൻസ്റ്റൻസ് നിലവിൽ ഇല്ല." @@ -699,6 +731,9 @@ msgstr "പൂർണ്ണമായ വാല്യൂ നല്കുക." msgid "Enter a valid UUID." msgstr "സാധുവായ യു യു ഐ ഡി നല്കുക." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -781,17 +816,9 @@ msgstr "അതെ" msgid "No" msgstr "അല്ല" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "ഉണ്ട്, ഇല്ല, ഉണ്ടായേക്കാം" +msgstr "ഉണ്ട്,ഇല്ല,ഉണ്ടായേക്കാം" #, python-format msgid "%(size)d byte" @@ -1098,9 +1125,6 @@ msgid_plural "%d minutes" msgstr[0] "%d മിനിറ്റ്" msgstr[1] "%d മിനിറ്റുകൾ" -msgid "0 minutes" -msgstr "0 മിനിറ്റ്" - msgid "Forbidden" msgstr "വിലക്കപ്പെട്ടത്" diff --git a/django/conf/locale/nb/LC_MESSAGES/django.mo b/django/conf/locale/nb/LC_MESSAGES/django.mo index 7f721bcefa77..46a9be66aa52 100644 Binary files a/django/conf/locale/nb/LC_MESSAGES/django.mo and b/django/conf/locale/nb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nb/LC_MESSAGES/django.po b/django/conf/locale/nb/LC_MESSAGES/django.po index 0010309bc634..a75f20e5ea09 100644 --- a/django/conf/locale/nb/LC_MESSAGES/django.po +++ b/django/conf/locale/nb/LC_MESSAGES/django.po @@ -5,20 +5,20 @@ # Eirik Krogstad , 2014 # Jannis Leidel , 2011 # jensadne , 2014-2015 -# Jon , 2015-2016 -# Jon , 2014 -# Jon , 2017-2020 -# Jon , 2013 -# Jon , 2011 +# Jon, 2015-2016 +# Jon, 2014 +# Jon, 2017-2021 +# Jon, 2013 +# Jon, 2011 # Sigurd Gartmann , 2012 # Tommy Strand , 2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-21 12:28+0000\n" -"Last-Translator: Jon \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 14:23+0000\n" +"Last-Translator: Jon\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -33,6 +33,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabisk" +msgid "Algerian Arabic" +msgstr "Algerisk arabisk" + msgid "Asturian" msgstr "Asturiansk" @@ -156,6 +159,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesisk" +msgid "Igbo" +msgstr "Ibo" + msgid "Ido" msgstr "Ido" @@ -186,6 +192,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreansk" +msgid "Kyrgyz" +msgstr "Kirgisisk" + msgid "Luxembourgish" msgstr "Luxembourgsk" @@ -270,9 +279,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tadsjikisk" + msgid "Thai" msgstr "Thai" +msgid "Turkmen" +msgstr "Turkmensk" + msgid "Turkish" msgstr "Tyrkisk" @@ -312,6 +327,11 @@ msgstr "Statiske filer" msgid "Syndication" msgstr "Syndikering" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Sidenummeret er ikke et heltall" @@ -561,6 +581,9 @@ msgstr "Heltall" msgid "Big (8 byte) integer" msgstr "Stort (8 byte) heltall" +msgid "Small integer" +msgstr "Lite heltall" + msgid "IPv4 address" msgstr "IPv4-adresse" @@ -574,6 +597,9 @@ msgstr "Verdien \"%(value)s\" må være enten None, True eller False." msgid "Boolean (Either True, False or None)" msgstr "Boolsk (True, False eller None)" +msgid "Positive big integer" +msgstr "Positivt stort heltall" + msgid "Positive integer" msgstr "Positivt heltall" @@ -584,9 +610,6 @@ msgstr "Positivt lite heltall" msgid "Slug (up to %(max_length)s)" msgstr "Slug (opp til %(max_length)s)" -msgid "Small integer" -msgstr "Lite heltall" - msgid "Text" msgstr "Tekst" @@ -628,6 +651,12 @@ msgstr "Fil" msgid "Image" msgstr "Bilde" +msgid "A JSON object" +msgstr "Et JSON-objekt" + +msgid "Value must be valid JSON." +msgstr "Verdi må være gyldig JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s-instansen med %(field)s %(value)r finnes ikke." @@ -717,6 +746,9 @@ msgstr "Skriv inn en fullstendig verdi." msgid "Enter a valid UUID." msgstr "Oppgi en gyldig UUID." +msgid "Enter a valid JSON." +msgstr "Oppgi gyldig JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -725,20 +757,25 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Skjult felt %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm-data mangler eller har blitt endret." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm-data mangler eller har blitt tuklet med. Felt som mangler: " +"%(field_names)s. Du må muligens rapportere en bug hvis problemet vedvarer." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Vennligst oppgi %d skjema." -msgstr[1] "Vennligst oppgi %d eller færre skjema." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Vennligst send inn maks %d skjema." +msgstr[1] "Vennligst send inn maks %d skjemaer." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Vennligst send inn %d eller flere skjemaer." -msgstr[1] "Vennligst send inn %d eller flere skjemaer." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Vennligst send inn minst %d skjema." +msgstr[1] "Vennligst send inn minst %d skjemaer." msgid "Order" msgstr "Rekkefølge" @@ -801,15 +838,7 @@ msgstr "Ja" msgid "No" msgstr "Nei" -msgid "Year" -msgstr "År" - -msgid "Month" -msgstr "Måned" - -msgid "Day" -msgstr "Dag" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ja,nei,kanskje" @@ -1118,9 +1147,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -msgid "0 minutes" -msgstr "0 minutter" - msgid "Forbidden" msgstr "Forbudt" @@ -1238,8 +1264,8 @@ msgstr "\"%(path)s\" finnes ikke" msgid "Index of %(directory)s" msgstr "Innhold i %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: web-rammeverket for perfeksjonister med tidsfrister." +msgid "The install worked successfully! Congratulations!" +msgstr "Installasjonen var vellykket! Gratulerer!" #, python-format msgid "" @@ -1250,9 +1276,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">produktmerknader for Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Installasjonen var vellykket! Gratulerer!" - #, python-format msgid "" "You are seeing this page because , 2020 # Jannis Leidel , 2014 # Paras Nath Chaudhary , 2012 # Sagar Chalise , 2011-2012,2015,2018 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-12-07 12:11+0000\n" -"Last-Translator: Sagar Chalise \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Nepali (http://www.transifex.com/django/django/language/ne/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,6 +26,9 @@ msgstr "अफ्रिकन" msgid "Arabic" msgstr "अरबिक" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "अस्टुरियन" @@ -148,6 +152,9 @@ msgstr "ईन्टरलिन्गुवा" msgid "Indonesian" msgstr "इन्डोनेसियाली" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "आइडु" @@ -178,6 +185,9 @@ msgstr "कन्नड" msgid "Korean" msgstr "कोरियाली" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "लक्जेमबर्गेली" @@ -262,9 +272,15 @@ msgstr "तामिल" msgid "Telugu" msgstr "तेलुगु" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "थाई" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "टर्किस" @@ -552,6 +568,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "बुलियन (True, False अथवा None)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "सकारात्मक पूर्णांक" @@ -602,6 +621,12 @@ msgstr "फाइल" msgid "Image" msgstr "चित्र" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -694,6 +719,9 @@ msgstr "पुरा मान राख्नु होस ।" msgid "Enter a valid UUID." msgstr "उपयुक्त UUID राख्नु होस ।" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -776,17 +804,9 @@ msgstr "हुन्छ" msgid "No" msgstr "होइन" -msgid "Year" -msgstr "वर्ष" - -msgid "Month" -msgstr "महिना" - -msgid "Day" -msgstr "दिन" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "हो, होइन, सायद" +msgstr "हो,होइन,सायद" #, python-format msgid "%(size)d byte" @@ -1093,9 +1113,6 @@ msgid_plural "%d minutes" msgstr[0] "%d मिनट" msgstr[1] "%d मिनटहरु" -msgid "0 minutes" -msgstr "० मिनट" - msgid "Forbidden" msgstr "निषेधित" diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index 29e363b48ee2..ea4b8d6c9323 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index 6bc7ab5f2a23..e8ccbca080dc 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -12,16 +12,16 @@ # Jannis Leidel , 2011 # Jeffrey Gelens , 2011-2012,2014 # Michiel Overtoom , 2014 -# Meteor 0id, 2019 -# Sander Steffann , 2014-2015 +# Meteor0id, 2019-2020 +# 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2014-2015 # Tino de Bruijn , 2013 -# Tonnes , 2017,2019 +# Tonnes , 2017,2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 11:26+0000\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-15 08:30+0000\n" "Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" @@ -36,6 +36,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabisch" +msgid "Algerian Arabic" +msgstr "Algerijns Arabisch" + msgid "Asturian" msgstr "Asturisch" @@ -159,6 +162,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesisch" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -189,6 +195,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreaans" +msgid "Kyrgyz" +msgstr "Kirgizisch" + msgid "Luxembourgish" msgstr "Luxemburgs" @@ -273,9 +282,15 @@ msgstr "Tamil" msgid "Telugu" msgstr "Telegu" +msgid "Tajik" +msgstr "Tadzjieks" + msgid "Thai" msgstr "Thai" +msgid "Turkmen" +msgstr "Turkmeens" + msgid "Turkish" msgstr "Turks" @@ -581,6 +596,9 @@ msgstr "Waarde van ‘%(value)s’ moet None, True of False zijn." msgid "Boolean (Either True, False or None)" msgstr "Boolean (True, False of None)" +msgid "Positive big integer" +msgstr "Positief groot geheel getal" + msgid "Positive integer" msgstr "Positief geheel getal" @@ -635,6 +653,12 @@ msgstr "Bestand" msgid "Image" msgstr "Afbeelding" +msgid "A JSON object" +msgstr "Een JSON-object" + +msgid "Value must be valid JSON." +msgstr "Waarde moet geldige JSON zijn." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s-instantie met %(field)s %(value)r bestaat niet." @@ -728,6 +752,9 @@ msgstr "Voer een volledige waarde in." msgid "Enter a valid UUID." msgstr "Voer een geldige UUID in." +msgid "Enter a valid JSON." +msgstr "Voer een geldige JSON in." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -812,15 +839,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -msgid "Year" -msgstr "Jaar" - -msgid "Month" -msgstr "Maand" - -msgid "Day" -msgstr "Dag" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ja,nee,misschien" @@ -1129,9 +1148,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -msgid "0 minutes" -msgstr "0 minuten" - msgid "Forbidden" msgstr "Verboden" diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo index 502ffb84d649..790751bc4e76 100644 Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po index bd13e2c6ce57..67c660950ea4 100644 --- a/django/conf/locale/pl/LC_MESSAGES/django.po +++ b/django/conf/locale/pl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # sidewinder , 2014 -# Saibamen , 2015 +# Adam Stachowicz , 2015 # angularcircle, 2011,2013 # angularcircle, 2011,2013 # angularcircle, 2014 @@ -11,15 +11,16 @@ # Janusz Harkot , 2014-2015 # Kacper Krupa , 2013 # Karol , 2012 -# konryd , 2011 -# konryd , 2011 +# 0d5641585fd67fbdb97037c19ab83e4c_18c98b0 , 2011 +# 0d5641585fd67fbdb97037c19ab83e4c_18c98b0 , 2011 # Łukasz Rekucki (lqc) , 2011 -# m_aciek , 2016-2020 +# m_aciek , 2016-2021 # m_aciek , 2015 +# Mariusz Felisiak , 2020-2021 # Michał Pasternak , 2013 -# p , 2012 +# c10516f0462e552b4c3672569f0745a7_cc5cca2 <841826256cd8f47d0e443806a8e56601_19204>, 2012 # Piotr Meuś , 2014 -# p , 2012 +# c10516f0462e552b4c3672569f0745a7_cc5cca2 <841826256cd8f47d0e443806a8e56601_19204>, 2012 # Quadric , 2014 # Radek Czajka , 2013 # Radek Czajka , 2013 @@ -30,8 +31,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-01 22:45+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-01 19:45+0000\n" "Last-Translator: m_aciek \n" "Language-Team: Polish (http://www.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" @@ -48,6 +49,9 @@ msgstr "afrykanerski" msgid "Arabic" msgstr "arabski" +msgid "Algerian Arabic" +msgstr "algierski arabski" + msgid "Asturian" msgstr "asturyjski" @@ -171,6 +175,9 @@ msgstr "interlingua" msgid "Indonesian" msgstr "indonezyjski" +msgid "Igbo" +msgstr "igbo" + msgid "Ido" msgstr "ido" @@ -201,6 +208,9 @@ msgstr "kannada" msgid "Korean" msgstr "koreański" +msgid "Kyrgyz" +msgstr "kirgiski" + msgid "Luxembourgish" msgstr "luksemburski" @@ -285,9 +295,15 @@ msgstr "tamilski" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "tadżycki" + msgid "Thai" msgstr "tajski" +msgid "Turkmen" +msgstr "turkmeński" + msgid "Turkish" msgstr "turecki" @@ -327,6 +343,11 @@ msgstr "Pliki statyczne" msgid "Syndication" msgstr "Syndykacja treści" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Ten numer strony nie jest liczbą całkowitą" @@ -602,6 +623,9 @@ msgstr "Liczba całkowita" msgid "Big (8 byte) integer" msgstr "Duża liczba całkowita (8 bajtów)" +msgid "Small integer" +msgstr "Mała liczba całkowita" + msgid "IPv4 address" msgstr "adres IPv4" @@ -615,6 +639,9 @@ msgstr "Wartością „%(value)s” musi być None, True lub False." msgid "Boolean (Either True, False or None)" msgstr "Wartość logiczna (True, False, None – prawda, fałsz lub nic)" +msgid "Positive big integer" +msgstr "Dodatnia duża liczba całkowita" + msgid "Positive integer" msgstr "Dodatnia liczba całkowita" @@ -625,9 +652,6 @@ msgstr "Dodatnia mała liczba całkowita" msgid "Slug (up to %(max_length)s)" msgstr "Slug (do %(max_length)s znaków)" -msgid "Small integer" -msgstr "Mała liczba całkowita" - msgid "Text" msgstr "Tekst" @@ -669,6 +693,12 @@ msgstr "Plik" msgid "Image" msgstr "Plik graficzny" +msgid "A JSON object" +msgstr "Obiekt JSON" + +msgid "Value must be valid JSON." +msgstr "Wartość musi być poprawnym JSON-em." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s z polem %(field)s o wartości %(value)r nie istnieje." @@ -767,6 +797,9 @@ msgstr "Wprowadź kompletną wartość." msgid "Enter a valid UUID." msgstr "Wpisz poprawny UUID." +msgid "Enter a valid JSON." +msgstr "Wpisz poprawny JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -775,24 +808,29 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Ukryte pole %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Brakuje danych ManagementForm lub zostały one zmodyfikowane." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Brakuje danych ManagementForm lub zostały one naruszone. Brakujące pola: " +"%(field_names)s. Złóż zgłoszenie błędu, jeśli problem się powtarza." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Proszę wysłać %d lub mniej formularzy." -msgstr[1] "Proszę wysłać %d lub mniej formularze." -msgstr[2] "Proszę wysłać %d lub mniej formularzy." -msgstr[3] "Proszę wysłać %d lub mniej formularzy." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Proszę wysłać co najwyżej %d formularz." +msgstr[1] "Proszę wysłać co najwyżej %d formularze." +msgstr[2] "Proszę wysłać co najwyżej %d formularzy." +msgstr[3] "Proszę wysłać co najwyżej %d formularzy." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Proszę wysłać %d lub więcej formularzy." -msgstr[1] "Proszę wysłać %d lub więcej formularze." -msgstr[2] "Proszę wysłać %d lub więcej formularzy." -msgstr[3] "Proszę wysłać %d lub więcej formularzy." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Proszę wysłać co najmniej %d formularz." +msgstr[1] "Proszę wysłać co najmniej %d formularze." +msgstr[2] "Proszę wysłać co najmniej %d formularzy." +msgstr[3] "Proszę wysłać co najmniej %d formularzy." msgid "Order" msgstr "Kolejność" @@ -855,15 +893,7 @@ msgstr "Tak" msgid "No" msgstr "Nie" -msgid "Year" -msgstr "Rok" - -msgid "Month" -msgstr "Miesiąc" - -msgid "Day" -msgstr "Dzień" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "tak,nie,może" @@ -1186,9 +1216,6 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" msgstr[3] "%d minut" -msgid "0 minutes" -msgstr "0 minut" - msgid "Forbidden" msgstr "Dostęp zabroniony" @@ -1311,8 +1338,8 @@ msgstr "„%(path)s” nie istnieje" msgid "Index of %(directory)s" msgstr "Zawartość %(directory)s " -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: framework WWW dla perfekcjonistów z deadline'ami." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalacja przebiegła pomyślnie! Gratulacje!" #, python-format msgid "" @@ -1323,9 +1350,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">informacje o wydaniu dla Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalacja przebiegła pomyślnie! Gratulacje!" - #, python-format msgid "" "You are seeing this page because , 2014 +# Amanda Savluchinske , 2019 # amcorreia , 2018 # andrewsmedina , 2014-2015 # Arthur Silva , 2017 # bruno.devpod , 2014 # Camilo B. Moreira , 2017 -# Carlos E C Leite - Cadu , 2016,2019 +# Carlos C. Leite , 2020 +# Carlos C. Leite , 2016,2019 # Filipe Cifali Stangler , 2016 +# Claudio Rogerio Carvalho Filho , 2020 # dudanogueira , 2012 # dudanogueira , 2019 # Elyézer Rezende , 2013 @@ -22,18 +25,20 @@ # Lucas Infante , 2015 # Luiz Boaretto , 2017 # Marcelo Moro Brondani , 2018 +# Rafael Fontenelle , 2021 +# Samuel Nogueira Bacelar , 2020 # Sandro , 2011 # Sergio Garcia , 2015 # Tânia Andrea , 2017 # Wiliam Souza , 2015 -# Xico Petry , 2018 +# Francisco Petry Rauber , 2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-17 05:42+0000\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -48,6 +53,9 @@ msgstr "Africânder" msgid "Arabic" msgstr "Árabe" +msgid "Algerian Arabic" +msgstr "Árabe Argelino" + msgid "Asturian" msgstr "Asturiano" @@ -171,6 +179,9 @@ msgstr "Interlíngua" msgid "Indonesian" msgstr "Indonésio" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -201,6 +212,9 @@ msgstr "Canarês" msgid "Korean" msgstr "Coreano" +msgid "Kyrgyz" +msgstr "Quirguiz" + msgid "Luxembourgish" msgstr "Luxemburguês" @@ -285,9 +299,15 @@ msgstr "Tâmil" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tadjique" + msgid "Thai" msgstr "Tailandês" +msgid "Turkmen" +msgstr "Turcomano" + msgid "Turkish" msgstr "Turco" @@ -304,7 +324,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbeque" msgid "Vietnamese" msgstr "Vietnamita" @@ -327,6 +347,11 @@ msgstr "Arquivos Estáticos" msgid "Syndication" msgstr "Syndication" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Esse número de página não é um número inteiro" @@ -505,7 +530,9 @@ msgstr "Inteiros separados por vírgula" msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "%(value)s" +msgstr "" +"O valor \"%(value)s\" tem um formato de data inválido. Deve ser no formato " +"YYY-MM-DD." #, python-format msgid "" @@ -531,7 +558,7 @@ msgid "" "[TZ]) but it is an invalid date/time." msgstr "" "O valor “%(value)s” está no formato correto. (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) mas em um date/time inválido." +"[TZ]) mas é uma data/hora inválida" msgid "Date (with time)" msgstr "Data (com hora)" @@ -548,7 +575,7 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" -"O valor “%(value)s” está em um formato inválido. IDeve ser no formato [DD] " +"O valor “%(value)s” está em um formato inválido. Deve ser no formato [DD] " "[[HH:]MM:]ss[.uuuuuu]." msgid "Duration" @@ -577,6 +604,9 @@ msgstr "Inteiro" msgid "Big (8 byte) integer" msgstr "Inteiro grande (8 byte)" +msgid "Small integer" +msgstr "Inteiro curto" + msgid "IPv4 address" msgstr "Endereço IPv4" @@ -590,6 +620,9 @@ msgstr "O valor “%(value)s” deve ser None, True ou False." msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadeiro, Falso ou Nada)" +msgid "Positive big integer" +msgstr "Inteiro grande positivo" + msgid "Positive integer" msgstr "Inteiro positivo" @@ -600,9 +633,6 @@ msgstr "Inteiro curto positivo" msgid "Slug (up to %(max_length)s)" msgstr "Slug (até %(max_length)s)" -msgid "Small integer" -msgstr "Inteiro curto" - msgid "Text" msgstr "Texto" @@ -644,6 +674,12 @@ msgstr "Arquivo" msgid "Image" msgstr "Imagem" +msgid "A JSON object" +msgstr "Um objeto JSON" + +msgid "Value must be valid JSON." +msgstr "o Valor deve ser um JSON válido" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "A instância de %(model)s com %(field)s %(value)r não existe." @@ -736,6 +772,9 @@ msgstr "Insira um valor completo." msgid "Enter a valid UUID." msgstr "Insira um UUID válido." +msgid "Enter a valid JSON." +msgstr "Insira um JSON válido" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -744,20 +783,26 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Campo oculto %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Os dados do ManagementForm não foram encontrados ou foram adulterados" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Dados de ManagementForm estão faltando ou foram adulterados. Campos " +"ausentes: %(field_names)s. Você pode precisar enviar um relatório de bug se " +"o problema persistir." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Por favor envie %d ou menos formulário." -msgstr[1] "Por favor envie %d ou menos formulários." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Por favor, envie no máximo %d formulário." +msgstr[1] "Por favor, envie no máximo %d formulários." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Por favor envie %d ou mais formulários." -msgstr[1] "Por favor envie %d ou mais formulários." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Por favor, envie no mínimo %d formulário." +msgstr[1] "Por favor, envie no mínimo %d formulários." msgid "Order" msgstr "Ordem" @@ -821,15 +866,7 @@ msgstr "Sim" msgid "No" msgstr "Não" -msgid "Year" -msgstr "Ano" - -msgid "Month" -msgstr "Mês" - -msgid "Day" -msgstr "Dia" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "sim,não,talvez" @@ -1138,9 +1175,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -msgid "0 minutes" -msgstr "0 minutos" - msgid "Forbidden" msgstr "Proibido" @@ -1164,7 +1198,7 @@ msgid "" "origin” requests." msgstr "" "Se você configurou seu browser para desabilitar os cabeçalhos “Referer”, por " -"favor remova-os, ao menos para este site, ou para conexões HTTPS, ou para " +"favor reabilite-os, ao menos para este site, ou para conexões HTTPS, ou para " "requisições “same-origin”." msgid "" @@ -1177,7 +1211,7 @@ msgstr "" "Se estiver usando a tag ou " "incluindo o cabeçalho “Referrer-Policy: no-referrer”, por favor remova-os. A " "proteção CSRF requer o cabeçalho “Referer” para fazer a checagem de " -"referência. Se estiver preocupado com privacidade, use alternatica como para links de sites de terceiros." msgid "" @@ -1193,9 +1227,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" -"Se você configurou seu browser para desabilitar os cookies, por favor " -"reabilite-os, ao menos para este site ou para requisições do tipo \"same-" -"origin\" (de mesma origem)." +"Se você configurou seu browser para desabilitar cookies, por favor reabilite-" +"os, ao menos para este site ou para requisições do tipo \"same-origin\"." msgid "More information is available with DEBUG=True." msgstr "Mais informações estão disponíveis com DEBUG=True." @@ -1245,7 +1278,7 @@ msgstr "Página inválida (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "Lista vazia e \"%(class_name)s.allow_empty está como False." +msgstr "Lista vazia e o \"%(class_name)s.allow_empty\" está como False." msgid "Directory indexes are not allowed here." msgstr "Índices de diretório não são permitidos aqui." @@ -1258,8 +1291,8 @@ msgstr "\"%(path)s\" não existe" msgid "Index of %(directory)s" msgstr "Índice de %(directory)s " -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: o framework web para perfeccionistas com prazo de entrega." +msgid "The install worked successfully! Congratulations!" +msgstr "A instalação foi com sucesso! Parabéns!" #, python-format msgid "" @@ -1270,9 +1303,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">notas de lançamento do Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "A instalação foi com sucesso! Parabéns!" - #, python-format msgid "" "You are seeing this page because , 2012 # Eugene , 2013 # eXtractor , 2015 +# crazyzubr , 2020 # Igor Melnyk, 2014 # Ivan Khomutov , 2017 # Jannis Leidel , 2011 # lilo.panic, 2016 # Mikhail Zholobov , 2013 # Nikolay Korotkiy , 2018 +# Panasoft, 2021 # Вася Аникин , 2017 -# Алексей Борискин , 2013-2017,2019 +# SeryiMysh , 2020 +# Алексей Борискин , 2013-2017,2019-2020 # Дмитрий Шатера , 2016,2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-16 22:50+0000\n" +"Last-Translator: Panasoft\n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -40,6 +43,9 @@ msgstr "Бурский" msgid "Arabic" msgstr "Арабский" +msgid "Algerian Arabic" +msgstr "Алжирский арабский" + msgid "Asturian" msgstr "Астурийский" @@ -163,6 +169,9 @@ msgstr "Интерлингва" msgid "Indonesian" msgstr "Индонезийский" +msgid "Igbo" +msgstr "Игбо" + msgid "Ido" msgstr "Идо" @@ -193,6 +202,9 @@ msgstr "Каннада" msgid "Korean" msgstr "Корейский" +msgid "Kyrgyz" +msgstr "Киргизский" + msgid "Luxembourgish" msgstr "Люксембургский" @@ -277,9 +289,15 @@ msgstr "Тамильский" msgid "Telugu" msgstr "Телугу" +msgid "Tajik" +msgstr "Таджикский" + msgid "Thai" msgstr "Тайский" +msgid "Turkmen" +msgstr "Туркменский" + msgid "Turkish" msgstr "Турецкий" @@ -296,7 +314,7 @@ msgid "Urdu" msgstr "Урду" msgid "Uzbek" -msgstr "" +msgstr "Узбекский" msgid "Vietnamese" msgstr "Вьетнамский" @@ -319,6 +337,11 @@ msgstr "Статические файлы" msgid "Syndication" msgstr "Ленты новостей" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Номер страницы не является натуральным числом" @@ -344,11 +367,15 @@ msgstr "Введите правильный адрес электронной п msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Значение должно состоять только из латинских букв, цифр, знаков " +"подчеркивания или дефиса." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Значение должно состоять только из символов входящих в стандарт Юникод, " +"цифр, символов подчёркивания или дефисов." msgid "Enter a valid IPv4 address." msgstr "Введите правильный IPv4 адрес." @@ -449,6 +476,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Расширение файлов “%(extension)s” не поддерживается. Разрешенные расширения: " +"%(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "Данные содержат запрещённый символ: ноль-байт" @@ -490,11 +519,11 @@ msgstr "Поле типа %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Значение “%(value)s” должно быть True или False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Значение “%(value)s” должно быть True, False или None." msgid "Boolean (Either True or False)" msgstr "Логическое (True или False)" @@ -511,12 +540,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"Значение “%(value)s” имеет неверный формат даты. Оно должно быть в формате " +"YYYY-MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"Значение “%(value)s” имеет корректный формат (YYYY-MM-DD), но это " +"недействительная дата." msgid "Date (without time)" msgstr "Дата (без указания времени)" @@ -526,19 +559,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Значение “%(value)s” имеет неверный формат. Оно должно быть в формате YYYY-" +"MM-DD HH:MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"Значение “%(value)s” имеет корректный формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]), но это недействительные дата/время." msgid "Date (with time)" msgstr "Дата (с указанием времени)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "Значение “%(value)s” должно быть десятичным числом." msgid "Decimal number" msgstr "Число с фиксированной запятой" @@ -548,6 +585,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"Значение “%(value)s” имеет неверный формат. Оно должно быть в формате [DD] " +"[HH:[MM:]]ss[.uuuuuu]." msgid "Duration" msgstr "Продолжительность" @@ -560,14 +599,14 @@ msgstr "Путь к файлу" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Значение “%(value)s” должно быть числом с плавающей точкой." msgid "Floating point number" msgstr "Число с плавающей запятой" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Значение “%(value)s” должно быть целым числом." msgid "Integer" msgstr "Целое" @@ -575,6 +614,9 @@ msgstr "Целое" msgid "Big (8 byte) integer" msgstr "Длинное целое (8 байт)" +msgid "Small integer" +msgstr "Малое целое число" + msgid "IPv4 address" msgstr "IPv4 адрес" @@ -583,11 +625,14 @@ msgstr "IP-адрес" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Значение “%(value)s” должно быть None, True или False." msgid "Boolean (Either True, False or None)" msgstr "Логическое (True, False или None)" +msgid "Positive big integer" +msgstr "Положительное большое целое число" + msgid "Positive integer" msgstr "Положительное целое число" @@ -598,9 +643,6 @@ msgstr "Положительное малое целое число" msgid "Slug (up to %(max_length)s)" msgstr "Слаг (до %(max_length)s)" -msgid "Small integer" -msgstr "Малое целое число" - msgid "Text" msgstr "Текст" @@ -609,12 +651,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Значение “%(value)s” имеет неверный формат. Оно должно быть в формате HH:MM[:" +"ss[.uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Значение “%(value)s” имеет корректный формат (HH:MM[:ss[.uuuuuu]]), но это " +"недействительное время." msgid "Time" msgstr "Время" @@ -627,7 +673,7 @@ msgstr "Необработанные двоичные данные" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "Значение “%(value)s” не является верным UUID-ом." msgid "Universally unique identifier" msgstr "Поле для UUID, универсального уникального идентификатора" @@ -638,6 +684,12 @@ msgstr "Файл" msgid "Image" msgstr "Изображение" +msgid "A JSON object" +msgstr "JSON-объект" + +msgid "Value must be valid JSON." +msgstr "Значение должно быть корректным JSON-ом." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -740,6 +792,9 @@ msgstr "Введите весь список значений." msgid "Enter a valid UUID." msgstr "Введите правильный UUID." +msgid "Enter a valid JSON." +msgstr "Введите корректный JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -748,24 +803,30 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Скрытое поле %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Данные управляющей формы отсутствуют или были повреждены" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Данные ManagementForm отсутствуют или были подделаны. Отсутствующие поля: " +"%(field_names)s. Если проблема не исчезнет, вам может потребоваться " +"отправить отчет об ошибке." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Пожалуйста, заполните не более %d формы." -msgstr[1] "Пожалуйста, заполните не более %d форм." -msgstr[2] "Пожалуйста, заполните не более %d форм." -msgstr[3] "Пожалуйста, заполните не более %d форм." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Пожалуйста, отправляйте не больше %d формы." +msgstr[1] "Пожалуйста, отправляйте не больше %d форм." +msgstr[2] "Пожалуйста, отправляйте не больше %d форм." +msgstr[3] "Пожалуйста, отправляйте не больше %d форм." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Пожалуйста, отправьте как минимум %d форму." -msgstr[1] "Пожалуйста, отправьте как минимум %d формы." -msgstr[2] "Пожалуйста, отправьте как минимум %d форм." -msgstr[3] "Пожалуйста, отправьте как минимум %d форм." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Пожалуйста, отправьте хотя бы %d форму." +msgstr[1] "Пожалуйста, отправьте хотя бы %d форм." +msgstr[2] "Пожалуйста, отправьте хотя бы %d форм." +msgstr[3] "Пожалуйста, отправьте хотя бы %d форм." msgid "Order" msgstr "Порядок" @@ -802,13 +863,16 @@ msgstr "" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s” является неверным значением." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s не может быть интерпретирована в часовом поясе " +"%(current_timezone)s; дата может быть неоднозначной или оказаться " +"несуществующей." msgid "Clear" msgstr "Очистить" @@ -828,15 +892,7 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "да,нет,может быть" @@ -1159,9 +1215,6 @@ msgstr[1] "%d минуты" msgstr[2] "%d минут" msgstr[3] "%d минут" -msgid "0 minutes" -msgstr "0 минут" - msgid "Forbidden" msgstr "Ошибка доступа" @@ -1174,12 +1227,22 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Вы видите это сообщение, потому что данный сайт использует защищённое " +"соединение и требует, чтобы заголовок “Referer” был передан вашим браузером, " +"но он не был им передан. Данный заголовок необходим по соображениям " +"безопасности, чтобы убедиться, что ваш браузер не был взломан, а запрос к " +"серверу не был перехвачен или подменён." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Если вы настроили свой браузер таким образом, чтобы запретить ему передавать " +"заголовок “Referer”, пожалуйста, разрешите ему отсылать данный заголовок по " +"крайней мере для данного сайта, или для всех HTTPS-соединений, или для " +"запросов, домен и порт назначения совпадают с доменом и портом текущей " +"страницы." msgid "" "If you are using the tag or " @@ -1188,6 +1251,12 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Если Вы используете HTML-тэг или добавили HTTP-заголовок “Referrer-Policy: no-referrer”, пожалуйста " +"удалите их. CSRF защите необходим заголовок “Referer” для строгой проверки " +"адреса ссылающейся страницы. Если Вы беспокоитесь о приватности, используйте " +"альтернативы, например , для ссылок на сайты третьих " +"лиц." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1203,6 +1272,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Если в вашем браузере отключены cookie, пожалуйста, включите эту функцию " +"вновь, по крайней мере для этого сайта, или для \"same-orign\" запросов." msgid "More information is available with DEBUG=True." msgstr "" @@ -1239,6 +1310,8 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" +"Не удалось распознать строку с датой “%(datestr)s”, в заданном формате " +"“%(format)s”" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1246,6 +1319,8 @@ msgstr "Не найден ни один %(verbose_name)s, соответству msgid "Page is not “last”, nor can it be converted to an int." msgstr "" +"Номер страницы не содержит особое значение “last” и его не удалось " +"преобразовать к целому числу." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1254,20 +1329,22 @@ msgstr "Неправильная страница (%(page_number)s): %(message)s #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." msgstr "" +"Список пуст, но “%(class_name)s.allow_empty” выставлено в значение \"Ложь\", " +"что запрещает показывать пустые списки." msgid "Directory indexes are not allowed here." msgstr "Просмотр списка файлов директории здесь не разрешен." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” не существует" #, python-format msgid "Index of %(directory)s" msgstr "Список файлов директории %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: веб-фреймворк для перфекционистов с дедлайнами." +msgid "The install worked successfully! Congratulations!" +msgstr "Установка прошла успешно! Поздравляем!" #, python-format msgid "" @@ -1275,12 +1352,9 @@ msgid "" "target=\"_blank\" rel=\"noopener\">release notes for Django %(version)s" msgstr "" "Посмотреть замечания к выпуску для Django " +"\" target=\"_blank\" rel=\"noopener\">примечания к выпуску для Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Установка прошла успешно! Поздравляем!" - #, python-format msgid "" "You are seeing this page because , 2011 -# Juraj Bubniak , 2012-2013 +# 18f25ad6fa9930fc67cb11aca9d16a27, 2012-2013 # Marian Andre , 2013,2015,2017-2018 # Martin Kosír, 2011 # Martin Tóth , 2017 +# Peter Stríž , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 12:25+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Slovak (http://www.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,6 +28,9 @@ msgstr "afrikánsky" msgid "Arabic" msgstr "arabský" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "astúrsky" @@ -142,7 +146,7 @@ msgid "Hungarian" msgstr "maďarsky" msgid "Armenian" -msgstr "" +msgstr "Arménsky" msgid "Interlingua" msgstr "interlinguánsky" @@ -150,6 +154,9 @@ msgstr "interlinguánsky" msgid "Indonesian" msgstr "indonézsky" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "ido" @@ -180,6 +187,9 @@ msgstr "kannadsky" msgid "Korean" msgstr "kórejsky" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "luxembursky" @@ -264,9 +274,15 @@ msgstr "tamilsky" msgid "Telugu" msgstr "telugsky" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "thajsky" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "turecky" @@ -306,6 +322,11 @@ msgstr "Statické Súbory" msgid "Syndication" msgstr "Syndikácia" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Číslo stránky nie je celé číslo" @@ -443,6 +464,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Prípona súboru '%(extension)s' nie je povolená. Povolené prípony sú: " +"'%(allowed_extensions)s'." msgid "Null characters are not allowed." msgstr "Znaky NULL nie sú povolené." @@ -482,11 +505,11 @@ msgstr "Pole typu: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "'%(value)s' value musí byť True alebo False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "'%(value)s' musí byť True, False alebo None." msgid "Boolean (Either True or False)" msgstr "Logická hodnota (buď True alebo False)" @@ -502,13 +525,14 @@ msgstr "Celé čísla oddelené čiarkou" msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "" +msgstr "'%(value)s' má neplatný tvar dátumu. Musí byť v tvare YYYY-MM-DD." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"'%(value)s' je v správnom tvare (YYYY-MM-DD), ale je to neplatný dátum." msgid "Date (without time)" msgstr "Dátum (bez času)" @@ -530,7 +554,7 @@ msgstr "Dátum (a čas)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "'%(value)s' musí byť desatinné číslo." msgid "Decimal number" msgstr "Desatinné číslo" @@ -559,7 +583,7 @@ msgstr "Číslo s plávajúcou desatinnou čiarkou" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "'%(value)s' musí byť celé číslo." msgid "Integer" msgstr "Celé číslo" @@ -567,6 +591,9 @@ msgstr "Celé číslo" msgid "Big (8 byte) integer" msgstr "Veľké celé číslo (8 bajtov)" +msgid "Small integer" +msgstr "Malé celé číslo" + msgid "IPv4 address" msgstr "IPv4 adresa" @@ -580,6 +607,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Logická hodnota (buď True, False alebo None)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Kladné celé číslo" @@ -590,9 +620,6 @@ msgstr "Malé kladné celé číslo" msgid "Slug (up to %(max_length)s)" msgstr "Identifikátor (najviac %(max_length)s)" -msgid "Small integer" -msgstr "Malé celé číslo" - msgid "Text" msgstr "Text" @@ -622,7 +649,7 @@ msgid "“%(value)s” is not a valid UUID." msgstr "" msgid "Universally unique identifier" -msgstr "" +msgstr "Úplne všade jedinečný identifikátor" msgid "File" msgstr "Súbor" @@ -630,6 +657,12 @@ msgstr "Súbor" msgid "Image" msgstr "Obrázok" +msgid "A JSON object" +msgstr "Objekt typu JSON" + +msgid "Value must be valid JSON." +msgstr "Hodnota musí byť v platnom formáte JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Inštancia modelu %(model)s s %(field)s %(value)r neexistuje." @@ -726,6 +759,9 @@ msgstr "Zadajte úplnú hodnotu." msgid "Enter a valid UUID." msgstr "Zadajte platné UUID." +msgid "Enter a valid JSON." +msgstr "Zadajte platný JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -734,24 +770,27 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Skryté pole %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Údaje ManagementForm chýbajú alebo boli sfalšované" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Prosím odošlite %d alebo menej formulárov." -msgstr[1] "Prosím odošlite %d alebo menej formulárov." -msgstr[2] "Prosím odošlite %d alebo menej formulárov." -msgstr[3] "Prosím odošlite %d alebo menej formulárov." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Prosím odošlite %d alebo viac formulárov." -msgstr[1] "Prosím odošlite %d alebo viac formulárov." -msgstr[2] "Prosím odošlite %d alebo viac formulárov." -msgstr[3] "Prosím odošlite %d alebo viac formulárov." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" msgid "Order" msgstr "Poradie" @@ -813,15 +852,7 @@ msgstr "Áno" msgid "No" msgstr "Nie" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "áno,nie,možno" @@ -1144,9 +1175,6 @@ msgstr[1] "%d minúty" msgstr[2] "%d minút" msgstr[3] "%d minút" -msgid "0 minutes" -msgstr "0 minút" - msgid "Forbidden" msgstr "Zakázané (Forbidden)" @@ -1249,8 +1277,8 @@ msgstr "" msgid "Index of %(directory)s" msgstr "Výpis %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: Webový framework pre pedantov s termínmi" +msgid "The install worked successfully! Congratulations!" +msgstr "Inštalácia prebehla úspešne! Gratulujeme!" #, python-format msgid "" @@ -1261,9 +1289,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">poznámky k vydaniu pre Django " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Inštalácia prebehla úspešne! Gratulujeme!" - #, python-format msgid "" "You are seeing this page because , 2011-2014 -# Besnik , 2015-2019 +# Besnik Bleta , 2011-2014 +# Besnik Bleta , 2020-2021 +# Besnik Bleta , 2015-2019 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 07:39+0000\n" -"Last-Translator: Besnik \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 13:59+0000\n" +"Last-Translator: Besnik Bleta \n" "Language-Team: Albanian (http://www.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -25,6 +26,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabe" +msgid "Algerian Arabic" +msgstr "Arabishte Algjeriane" + msgid "Asturian" msgstr "Asturiase" @@ -148,6 +152,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indoneziane" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -178,6 +185,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreane" +msgid "Kyrgyz" +msgstr "Kirgize" + msgid "Luxembourgish" msgstr "Luksemburgase" @@ -262,9 +272,15 @@ msgstr "Tamileze" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Taxhike" + msgid "Thai" msgstr "Tajlandeze" +msgid "Turkmen" +msgstr "Turkmene" + msgid "Turkish" msgstr "Turke" @@ -304,6 +320,11 @@ msgstr "Kartela Statike" msgid "Syndication" msgstr "" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Ai numër faqeje s’është numër i plotë" @@ -557,6 +578,9 @@ msgstr "Numër i plotë" msgid "Big (8 byte) integer" msgstr "Numër i plotë i madh (8 bajte)" +msgid "Small integer" +msgstr "Numër i plotë i vogël" + msgid "IPv4 address" msgstr "Adresë IPv4" @@ -570,6 +594,9 @@ msgstr "Vlera “%(value)s” duhet të jetë ose None, ose True, ose False." msgid "Boolean (Either True, False or None)" msgstr "Buleane (Ose True, ose False, ose None)" +msgid "Positive big integer" +msgstr "Numër i plotë pozitiv i madh" + msgid "Positive integer" msgstr "Numër i plotë pozitiv" @@ -580,9 +607,6 @@ msgstr "Numër i plotë pozitiv i vogël" msgid "Slug (up to %(max_length)s)" msgstr "Identifikues (deri në %(max_length)s)" -msgid "Small integer" -msgstr "Numër i plotë i vogël" - msgid "Text" msgstr "Tekst" @@ -624,6 +648,12 @@ msgstr "Kartelë" msgid "Image" msgstr "Figurë" +msgid "A JSON object" +msgstr "Objekt JSON" + +msgid "Value must be valid JSON." +msgstr "Vlera duhet të jetë JSON i vlefshëm." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Instanca %(model)s me %(field)s %(value)r s’ekziston." @@ -697,7 +727,7 @@ msgstr[1] "" msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Ju lutemi, ose parashtroni një kartelë, ose i vini shenjë kutizës për " -"pastrim, jo që të dyja." +"spastrim, jo që të dyja." msgid "" "Upload a valid image. The file you uploaded was either not an image or a " @@ -721,6 +751,9 @@ msgstr "Jepni një vlerë të plotë." msgid "Enter a valid UUID." msgstr "Jepni një UUID të vlefshëm." +msgid "Enter a valid JSON." +msgstr "Jepni një JSON të vlefshëm." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -729,20 +762,26 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Fushë e fshehur %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Të dhënat ManagementForm mungojnë ose është vënë dorë mbi to" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Mungojnë të dhëna ManagementForm, ose në to janë futur hundët. Fusha që " +"mungojnë: %(field_names)s. Nëse problemi vazhdon, mund të duhet të " +"parashtroni një raport të mete." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Ju lutemi, parashtroni %d ose më pak formularë." -msgstr[1] "Ju lutemi, parashtroni %d ose më pak formularë." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Ju lutemi, parashtroni e shumta 1%d formular." +msgstr[1] "Ju lutemi, parashtroni e shumta %d formularë." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Ju lutemi, parashtroni %d ose më shumë formularë." -msgstr[1] "Ju lutemi, parashtroni %d ose më shumë formularë." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Ju lutemi, parashtroni të paktën 1%d formular." +msgstr[1] "Ju lutemi, parashtroni të paktën 1%d formularë." msgid "Order" msgstr "Renditi" @@ -792,7 +831,7 @@ msgstr "" "mund të jetë e dykuptimtë, ose mund të mos ekzistojë." msgid "Clear" -msgstr "Pastroje" +msgstr "Spastroje" msgid "Currently" msgstr "Tani" @@ -809,15 +848,7 @@ msgstr "Po" msgid "No" msgstr "Jo" -msgid "Year" -msgstr "Vit" - -msgid "Month" -msgstr "Muaj" - -msgid "Day" -msgstr "Ditë" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "po,jo,ndoshta" @@ -1126,9 +1157,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minutë" msgstr[1] "%d minuta" -msgid "0 minutes" -msgstr "0 minuta" - msgid "Forbidden" msgstr "E ndaluar" @@ -1244,8 +1272,8 @@ msgstr "“%(path)s” s’ekziston" msgid "Index of %(directory)s" msgstr "Tregues i %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: platforma Web për perfeksionistë me afate." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalimi funksionoi me sukses! Përgëzime!" #, python-format msgid "" @@ -1256,9 +1284,6 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">shënimet për hedhjen në qarkullim të " "Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalimi funksionoi me sukses! Përgëzime!" - #, python-format msgid "" "You are seeing this page because , 2018-2019 -# Igor Jerosimić, 2019-2020 +# Igor Jerosimić, 2019-2021 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-21 20:36+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 17:16+0000\n" "Last-Translator: Igor Jerosimić\n" "Language-Team: Serbian (http://www.transifex.com/django/django/language/" "sr/)\n" @@ -27,6 +27,9 @@ msgstr "африкански" msgid "Arabic" msgstr "арапски" +msgid "Algerian Arabic" +msgstr "Алжирски арапски" + msgid "Asturian" msgstr "астуријски" @@ -150,6 +153,9 @@ msgstr "интерлингва" msgid "Indonesian" msgstr "индонежански" +msgid "Igbo" +msgstr "Игбо" + msgid "Ido" msgstr "идо" @@ -180,6 +186,9 @@ msgstr "канада" msgid "Korean" msgstr "корејски" +msgid "Kyrgyz" +msgstr "Киргиски" + msgid "Luxembourgish" msgstr "луксембуршки" @@ -264,9 +273,15 @@ msgstr "тамилски" msgid "Telugu" msgstr "телугу" +msgid "Tajik" +msgstr "Таџики" + msgid "Thai" msgstr "тајландски" +msgid "Turkmen" +msgstr "Туркменски" + msgid "Turkish" msgstr "турски" @@ -306,6 +321,11 @@ msgstr "Статички фајлови" msgid "Syndication" msgstr "Удруживање садржаја" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Задати број стране није цео број" @@ -567,6 +587,9 @@ msgstr "Цео број" msgid "Big (8 byte) integer" msgstr "Велики (8 бајтова) цео број" +msgid "Small integer" +msgstr "Мали цео број" + msgid "IPv4 address" msgstr "IPv4 адреса" @@ -580,6 +603,9 @@ msgstr "Вредност \"%(value)s\" мора бити None, True или False msgid "Boolean (Either True, False or None)" msgstr "Булова вредност (True, False или None)" +msgid "Positive big integer" +msgstr "Велик позитиван цео број" + msgid "Positive integer" msgstr "Позитиван цео број" @@ -590,9 +616,6 @@ msgstr "Позитиван мали цео број" msgid "Slug (up to %(max_length)s)" msgstr "Слаг са макс. дужином %(max_length)s" -msgid "Small integer" -msgstr "Мали цео број" - msgid "Text" msgstr "Текст" @@ -634,6 +657,12 @@ msgstr "Фајл" msgid "Image" msgstr "Слика" +msgid "A JSON object" +msgstr "JSON објекат" + +msgid "Value must be valid JSON." +msgstr "Вредност мора бити исправан JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(model)s инстанца са вредношћу %(value)r у пољу %(field)s не постоји." @@ -727,6 +756,9 @@ msgstr "Унесите комплетну вредност." msgid "Enter a valid UUID." msgstr "Унесите исправан UUID." +msgid "Enter a valid JSON." +msgstr "Унесите исправан JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -735,22 +767,28 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Скривено поље %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm недостаје или је измењена на погрешан начин." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Подаци од ManagementForm недостају или су покварени. Поља која недостају: " +"%(field_names)s. Можда ће бити потребно да пријавите грешку ако се проблем " +"настави." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Попуните и проследите највише %d форму." -msgstr[1] "Попуните и проследите највише %d форме." -msgstr[2] "Попуните и проследите највише %d форми." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Молим проследите највише %d форму." +msgstr[1] "Молим проследите највише %d форме." +msgstr[2] "Молим проследите највише %d форми." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Попуните и проследите најмање %d форму." -msgstr[1] "Попуните и проследите највише %d форме." -msgstr[2] "Попуните и проследите највише %d форми." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Молим проследите најмање %d форму." +msgstr[1] "Молим проследите најмање %d форме." +msgstr[2] "Молим проследите најмање %d форми." msgid "Order" msgstr "Редослед" @@ -815,15 +853,7 @@ msgstr "Да" msgid "No" msgstr "Не" -msgid "Year" -msgstr "Година" - -msgid "Month" -msgstr "Месец" - -msgid "Day" -msgstr "Дан" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "да,не,можда" @@ -1139,9 +1169,6 @@ msgstr[0] "%d минут" msgstr[1] "%d минута" msgstr[2] "%d минута" -msgid "0 minutes" -msgstr "0 минута" - msgid "Forbidden" msgstr "Забрањено" @@ -1257,8 +1284,8 @@ msgstr "„%(path)s“ не постоји" msgid "Index of %(directory)s" msgstr "Индекс директоријума %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Ђанго: веб окружење за перфекционисте са строгим роковима." +msgid "The install worked successfully! Congratulations!" +msgstr "Инсталација је прошла успешно. Честитке!" #, python-format msgid "" @@ -1269,9 +1296,6 @@ msgstr "" "\" target=\"_blank\" rel=\"noopener\">напомене уз издање за Ђанго " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Инсталација је прошла успешно. Честитке!" - #, python-format msgid "" "You are seeing this page because , 2020 +# Igor Jerosimić, 2019-2021 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2020-01-23 22:15+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 17:37+0000\n" "Last-Translator: Igor Jerosimić\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/django/django/" "language/sr@latin/)\n" @@ -26,6 +27,9 @@ msgstr "afrikanski" msgid "Arabic" msgstr "arapski" +msgid "Algerian Arabic" +msgstr "Alžirski arapski" + msgid "Asturian" msgstr "asturijski" @@ -149,6 +153,9 @@ msgstr "interlingva" msgid "Indonesian" msgstr "indonežanski" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "ido" @@ -179,6 +186,9 @@ msgstr "kanada" msgid "Korean" msgstr "korejski" +msgid "Kyrgyz" +msgstr "Kirgiski" + msgid "Luxembourgish" msgstr "luksemburški" @@ -263,9 +273,15 @@ msgstr "tamilski" msgid "Telugu" msgstr "telugu" +msgid "Tajik" +msgstr "Tadžiki" + msgid "Thai" msgstr "tajlandski" +msgid "Turkmen" +msgstr "Turkmenski" + msgid "Turkish" msgstr "turski" @@ -305,6 +321,11 @@ msgstr "Statičke datoteke" msgid "Syndication" msgstr "Udruživanje sadržaja" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Zadati broj strane nije ceo broj" @@ -389,8 +410,14 @@ msgid_plural "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " +"%(show_value)d)." msgstr[1] "" +"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " +"%(show_value)d)." msgstr[2] "" +"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " +"%(show_value)d)." msgid "Enter a number." msgstr "Unesite broj." @@ -398,16 +425,16 @@ msgstr "Unesite broj." #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Ukupno ne može biti više od %(max)s cifre." +msgstr[1] "Ukupno ne može biti više od %(max)s cifre." +msgstr[2] "Ukupno ne može biti više od %(max)s cifara." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Ne može biti više od %(max)s decimale." +msgstr[1] "Ne može biti više od %(max)s decimale." +msgstr[2] "Ne može biti više od %(max)s decimala." #, python-format msgid "" @@ -432,7 +459,7 @@ msgstr "i" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "%(model_name)ssa poljem %(field_labels)sveć postoji." +msgstr "%(model_name)s sa poljem %(field_labels)s već postoji." #, python-format msgid "Value %(value)r is not a valid choice." @@ -457,7 +484,7 @@ msgstr "" #, python-format msgid "Field of type: %(field_type)s" -msgstr "Ponje tipa: %(field_type)s" +msgstr "Polje tipa: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." @@ -546,6 +573,9 @@ msgstr "Ceo broj" msgid "Big (8 byte) integer" msgstr "Veliki ceo broj" +msgid "Small integer" +msgstr "Mali ceo broj" + msgid "IPv4 address" msgstr "IPv4 adresa" @@ -559,6 +589,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Bulova vrednost (True, False ili None)" +msgid "Positive big integer" +msgstr "Velik pozitivan celi broj" + msgid "Positive integer" msgstr "Pozitivan ceo broj" @@ -569,9 +602,6 @@ msgstr "Pozitivan mali ceo broj" msgid "Slug (up to %(max_length)s)" msgstr "Slag (ne duži od %(max_length)s)" -msgid "Small integer" -msgstr "Mali ceo broj" - msgid "Text" msgstr "Tekst" @@ -601,7 +631,7 @@ msgid "“%(value)s” is not a valid UUID." msgstr "" msgid "Universally unique identifier" -msgstr "" +msgstr "Univerzalno jedinstveni identifikator" msgid "File" msgstr "Fajl" @@ -609,6 +639,12 @@ msgstr "Fajl" msgid "Image" msgstr "Slika" +msgid "A JSON object" +msgstr "JSON objekat" + +msgid "Value must be valid JSON." +msgstr "Vrednost mora biti ispravni JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -652,11 +688,11 @@ msgid "Enter a valid date/time." msgstr "Unesite ispravan datum/vreme." msgid "Enter a valid duration." -msgstr "" +msgstr "Unesite ispravno trajanje." #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." -msgstr "" +msgstr "Broj dana mora biti između {min_days} i {max_days}." msgid "No file was submitted. Check the encoding type on the form." msgstr "Fajl nije prebačen. Proverite tip enkodiranja formulara." @@ -699,6 +735,9 @@ msgstr "Unesite kompletnu vrednost." msgid "Enter a valid UUID." msgstr "Unesite ispravan UUID." +msgid "Enter a valid JSON." +msgstr "Unesite ispravan JSON." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -707,19 +746,25 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm nedostaje ili je izmenjena na pogrešan način." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Podaci od ManagementForm nedostaju ili su pokvareni. Polja koja nedostaju: " +"%(field_names)s. Možda će biti potrebno da prijavite grešku ako se problem " +"nastavi." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." msgstr[0] "" msgstr[1] "" msgstr[2] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -784,15 +829,7 @@ msgstr "Da" msgid "No" msgstr "Ne" -msgid "Year" -msgstr "Godina" - -msgid "Month" -msgstr "Mesec" - -msgid "Day" -msgstr "Dan" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "da,ne,možda" @@ -1069,47 +1106,44 @@ msgstr "," #, python-format msgid "%d year" msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d godina" +msgstr[1] "%d godine" +msgstr[2] "%d godina" #, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d mesec" +msgstr[1] "%d meseca" +msgstr[2] "%d meseci" #, python-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d nedelja" +msgstr[1] "%d nedelje" +msgstr[2] "%d nedelja" #, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d dan" +msgstr[1] "%d dana" +msgstr[2] "%d dana" #, python-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d čas" +msgstr[1] "%d časa" +msgstr[2] "%d časova" #, python-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -msgid "0 minutes" -msgstr "0 minuta" +msgstr[0] "%d minut" +msgstr[1] "%d minute" +msgstr[2] "%d minuta" msgid "Forbidden" msgstr "Zabranjeno" @@ -1200,7 +1234,7 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Nijedan objekat klase %(verbose_name)s nije nađen datim upitom." msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "Stranica nije poslednja, niti može biti konvertovana u tip \"int\"." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1221,8 +1255,8 @@ msgstr "„%(path)s“ ne postoji" msgid "Index of %(directory)s" msgstr "Indeks direktorijuma %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Đango: veb okruženje za perfekcioniste sa strogim rokovima." +msgid "The install worked successfully! Congratulations!" +msgstr "Instalacija je prošla uspešno. Čestitke!" #, python-format msgid "" @@ -1233,9 +1267,6 @@ msgstr "" "\" target=\"_blank\" rel=\"noopener\">napomene uz izdanje za Đango " "%(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Instalacija je prošla uspešno. Čestitke!" - #, python-format msgid "" "You are seeing this page because , 2012 -# Andreas Pelme , 2014 +# Andreas Pelme , 2014,2021 # Gustaf Hansen , 2015 # Jannis Leidel , 2011 # Jonathan Lindén, 2015 @@ -13,13 +13,14 @@ # Rasmus Précenth , 2014 # Samuel Linde , 2011 # Thomas Lundqvist, 2013,2016 +# Tomas Lööw , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-05-06 06:05+0000\n" +"Last-Translator: Tomas Lööw \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -34,6 +35,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Arabiska" +msgid "Algerian Arabic" +msgstr "Algerisk arabiska" + msgid "Asturian" msgstr "Asturiska" @@ -157,6 +161,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Indonesiska" +msgid "Igbo" +msgstr "Igbo" + msgid "Ido" msgstr "Ido" @@ -187,6 +194,9 @@ msgstr "Kannada" msgid "Korean" msgstr "Koreanska" +msgid "Kyrgyz" +msgstr "Kirgiziska" + msgid "Luxembourgish" msgstr "Luxemburgiska" @@ -271,9 +281,15 @@ msgstr "Tamilska" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "Tadzjikiska" + msgid "Thai" msgstr "Thailändska" +msgid "Turkmen" +msgstr "Turkmeniska" + msgid "Turkish" msgstr "Turkiska" @@ -290,7 +306,7 @@ msgid "Urdu" msgstr "Urdu" msgid "Uzbek" -msgstr "" +msgstr "Uzbekiska" msgid "Vietnamese" msgstr "Vietnamesiska" @@ -313,6 +329,11 @@ msgstr "Statiska filer" msgid "Syndication" msgstr "Syndikering" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "" + msgid "That page number is not an integer" msgstr "Sidnumret är inte ett heltal" @@ -338,11 +359,15 @@ msgstr "Fyll i en giltig e-postadress." msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Fyll i en giltig 'slug', beståendes av bokstäver, siffror, understreck eller " +"bindestreck i Unicode." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Fyll i en giltig 'slug', beståendes av bokstäver, siffror, understreck eller " +"bindestreck i Unicode." msgid "Enter a valid IPv4 address." msgstr "Fyll i en giltig IPv4 adress." @@ -429,6 +454,8 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Filändelsen “%(extension)s” är inte giltig. Giltiga filändelser är: " +"%(allowed_extensions)s." msgid "Null characters are not allowed." msgstr "Null-tecken är inte tillåtna." @@ -468,11 +495,11 @@ msgstr "Fält av typ: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Värdet \"%(value)s\" måste vara antingen True eller False." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Värdet ”%(value)s” måste vara antingen True, False eller None." msgid "Boolean (Either True or False)" msgstr "Boolesk (antingen True eller False)" @@ -538,14 +565,14 @@ msgstr "Sökväg till fil" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Värdet \"%(value)s\" måste vara ett flyttal." msgid "Floating point number" msgstr "Flyttal" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Värdet \"%(value)s\" måste vara ett heltal." msgid "Integer" msgstr "Heltal" @@ -553,6 +580,9 @@ msgstr "Heltal" msgid "Big (8 byte) integer" msgstr "Stort (8 byte) heltal" +msgid "Small integer" +msgstr "Litet heltal" + msgid "IPv4 address" msgstr "IPv4-adress" @@ -561,11 +591,14 @@ msgstr "IP-adress" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Värdet ”%(value)s” måste vara antingen None, True eller False." msgid "Boolean (Either True, False or None)" msgstr "Boolesk (antingen True, False eller None)" +msgid "Positive big integer" +msgstr "Positivt stort heltal" + msgid "Positive integer" msgstr "Positivt heltal" @@ -576,9 +609,6 @@ msgstr "Positivt litet heltal" msgid "Slug (up to %(max_length)s)" msgstr "Slug (upp till %(max_length)s)" -msgid "Small integer" -msgstr "Litet heltal" - msgid "Text" msgstr "Text" @@ -616,6 +646,12 @@ msgstr "Fil" msgid "Image" msgstr "Bild" +msgid "A JSON object" +msgstr "Ett JSON-objekt" + +msgid "Value must be valid JSON." +msgstr "Värdet måste vara giltig JSON." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Modell %(model)s med %(field)s %(value)r finns inte." @@ -710,6 +746,9 @@ msgstr "Fyll i ett fullständigt värde." msgid "Enter a valid UUID." msgstr "Fyll i ett giltigt UUID." +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -718,20 +757,23 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Gömt fält %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm data saknas eller har manipulerats" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Vänligen lämna %d eller färre formulär." -msgstr[1] "Vänligen lämna %d eller färre formulär." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Vänligen skicka %d eller fler formulär." -msgstr[1] "Vänligen skicka %d eller fler formulär." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" msgid "Order" msgstr "Sortering" @@ -794,15 +836,7 @@ msgstr "Ja" msgid "No" msgstr "Nej" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "ja,nej,kanske" @@ -1111,9 +1145,6 @@ msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -msgid "0 minutes" -msgstr "0 minuter" - msgid "Forbidden" msgstr "Ottillåtet" @@ -1215,8 +1246,8 @@ msgstr "" msgid "Index of %(directory)s" msgstr "Innehåll i %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: webb-ramverket för perfektionister med deadlines." +msgid "The install worked successfully! Congratulations!" +msgstr "Installationen lyckades! Grattis!" #, python-format msgid "" @@ -1226,9 +1257,6 @@ msgstr "" "Visa release notes för Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Installationen lyckades! Grattis!" - #, python-format msgid "" "You are seeing this page because , 2020 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Tamil (http://www.transifex.com/django/django/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,6 +23,9 @@ msgstr "" msgid "Arabic" msgstr "அரபிக்" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "" @@ -145,6 +149,9 @@ msgstr "" msgid "Indonesian" msgstr "" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "" @@ -175,6 +182,9 @@ msgstr "" msgid "Korean" msgstr "" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "" @@ -259,9 +269,15 @@ msgstr "தமிழ்" msgid "Telugu" msgstr "" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "துருக்கிஷ்" @@ -540,6 +556,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "இலக்கு முறை (சரி, தவறு அல்லது ஒன்றும் இல்லை)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "" @@ -590,6 +609,12 @@ msgstr "" msgid "Image" msgstr "" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -678,6 +703,9 @@ msgstr "" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr "" @@ -758,17 +786,9 @@ msgstr "ஆம்" msgid "No" msgstr "இல்லை" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "ஆம், இல்லை, இருக்கலாம்" +msgstr "ஆம்,இல்லை,இருக்கலாம்" #, python-format msgid "%(size)d byte" @@ -1075,9 +1095,6 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -msgid "0 minutes" -msgstr "" - msgid "Forbidden" msgstr "" diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo index fec1b9200b6e..1366ff278543 100644 Binary files a/django/conf/locale/te/LC_MESSAGES/django.mo and b/django/conf/locale/te/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po index 73f1b9a691e7..168ffa4d42aa 100644 --- a/django/conf/locale/te/LC_MESSAGES/django.po +++ b/django/conf/locale/te/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # bhaskar teja yerneni , 2011 +# Claude Paroz , 2020 # Jannis Leidel , 2011 # ప్రవీణ్ ఇళ్ళ , 2013 # వీవెన్ , 2011 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Telugu (http://www.transifex.com/django/django/language/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,6 +26,9 @@ msgstr "ఆఫ్రికాన్స్" msgid "Arabic" msgstr "ఆరబిక్" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "" @@ -148,6 +152,9 @@ msgstr "ఇంటర్లింగ్వా" msgid "Indonesian" msgstr "ఇండోనేషియన్" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "" @@ -178,6 +185,9 @@ msgstr "కన్నడ" msgid "Korean" msgstr "కొరియన్" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "లగ్జెంబర్గిష్" @@ -262,9 +272,15 @@ msgstr "తమిళం" msgid "Telugu" msgstr "తెలుగు" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "థాయి" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "టర్కిష్" @@ -545,6 +561,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "" @@ -595,6 +614,12 @@ msgstr "దస్త్రం" msgid "Image" msgstr "బొమ్మ" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -681,6 +706,9 @@ msgstr "" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr "" @@ -761,17 +789,9 @@ msgstr "అవును" msgid "No" msgstr "కాదు" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "అవును, కాదు , ఏమొ" +msgstr "అవును,కాదు,ఏమొ" #, python-format msgid "%(size)d byte" @@ -1078,9 +1098,6 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -msgid "0 minutes" -msgstr "" - msgid "Forbidden" msgstr "" diff --git a/django/conf/locale/tg/LC_MESSAGES/django.mo b/django/conf/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..e93dc87f2299 Binary files /dev/null and b/django/conf/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tg/LC_MESSAGES/django.po b/django/conf/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..05a4ca96b098 --- /dev/null +++ b/django/conf/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,1299 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Mariusz Felisiak , 2020 +# Surush Sufiew , 2020 +# Siroj Sufiew , 2020 +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-30 18:50+0000\n" +"Last-Translator: Mariusz Felisiak \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Afrikaans" +msgstr "Ҳолландӣ" + +msgid "Arabic" +msgstr "Арабӣ" + +msgid "Algerian Arabic" +msgstr "Арабӣ" + +msgid "Asturian" +msgstr "Астурӣ" + +msgid "Azerbaijani" +msgstr "Озарбойҷонӣ" + +msgid "Bulgarian" +msgstr "Булғорӣ" + +msgid "Belarusian" +msgstr "Белорусӣ" + +msgid "Bengali" +msgstr "Бенгалӣ" + +msgid "Breton" +msgstr "Бретонӣ" + +msgid "Bosnian" +msgstr "Боснӣ" + +msgid "Catalan" +msgstr "Каталанӣ" + +msgid "Czech" +msgstr "Чехӣ" + +msgid "Welsh" +msgstr "Уэлсӣ" + +msgid "Danish" +msgstr "Даниягӣ" + +msgid "German" +msgstr "Олмонӣ" + +msgid "Lower Sorbian" +msgstr "Сербиягӣ" + +msgid "Greek" +msgstr "Юнонӣ" + +msgid "English" +msgstr "Англисӣ" + +msgid "Australian English" +msgstr "Англисии австралиёӣ" + +msgid "British English" +msgstr "Ангилисии бритониёӣ" + +msgid "Esperanto" +msgstr "Эсперантоӣ" + +msgid "Spanish" +msgstr "Испанӣ" + +msgid "Argentinian Spanish" +msgstr "Испании аргентиноӣ" + +msgid "Colombian Spanish" +msgstr "Испании колумбигӣ" + +msgid "Mexican Spanish" +msgstr "Испании мексикоӣ" + +msgid "Nicaraguan Spanish" +msgstr "Никарагуанский испанский" + +msgid "Venezuelan Spanish" +msgstr "Испании венесуэлӣ" + +msgid "Estonian" +msgstr "Эстонӣ" + +msgid "Basque" +msgstr "Баскувӣ" + +msgid "Persian" +msgstr "Форсӣ" + +msgid "Finnish" +msgstr "Финикӣ" + +msgid "French" +msgstr "Фаронсавӣ" + +msgid "Frisian" +msgstr "Фризӣ" + +msgid "Irish" +msgstr "Ирландӣ" + +msgid "Scottish Gaelic" +msgstr "Шотландӣ" + +msgid "Galician" +msgstr "" + +msgid "Hebrew" +msgstr "Ивритӣ" + +msgid "Hindi" +msgstr "Ҳиндӣ" + +msgid "Croatian" +msgstr "Хорватӣ" + +msgid "Upper Sorbian" +msgstr "Себриягӣ" + +msgid "Hungarian" +msgstr "" + +msgid "Armenian" +msgstr "Арманӣ" + +msgid "Interlingua" +msgstr "" + +msgid "Indonesian" +msgstr "Индонезӣ" + +msgid "Igbo" +msgstr "" + +msgid "Ido" +msgstr "" + +msgid "Icelandic" +msgstr "Исландӣ" + +msgid "Italian" +msgstr "Итолиёвӣ" + +msgid "Japanese" +msgstr "Японӣ" + +msgid "Georgian" +msgstr "Грузӣ" + +msgid "Kabyle" +msgstr "Кабилӣ" + +msgid "Kazakh" +msgstr "Қазоқӣ" + +msgid "Khmer" +msgstr "" + +msgid "Kannada" +msgstr "" + +msgid "Korean" +msgstr "Кореӣ" + +msgid "Kyrgyz" +msgstr "" + +msgid "Luxembourgish" +msgstr "Люксембургӣ" + +msgid "Lithuanian" +msgstr "Литвигӣ" + +msgid "Latvian" +msgstr "Латвигӣ" + +msgid "Macedonian" +msgstr "Македонӣ" + +msgid "Malayalam" +msgstr "" + +msgid "Mongolian" +msgstr "Монголӣ" + +msgid "Marathi" +msgstr "" + +msgid "Burmese" +msgstr "" + +msgid "Norwegian Bokmål" +msgstr "Норвежский (Букмол)" + +msgid "Nepali" +msgstr "Непалӣ" + +msgid "Dutch" +msgstr "Голландӣ" + +msgid "Norwegian Nynorsk" +msgstr "Норвегӣ" + +msgid "Ossetic" +msgstr "Осетинӣ" + +msgid "Punjabi" +msgstr "Панҷобӣ" + +msgid "Polish" +msgstr "Полякӣ" + +msgid "Portuguese" +msgstr "Португалӣ" + +msgid "Brazilian Portuguese" +msgstr "Португалии бразилиёгӣ" + +msgid "Romanian" +msgstr "Руминӣ" + +msgid "Russian" +msgstr "Руссӣ" + +msgid "Slovak" +msgstr "Словакӣ" + +msgid "Slovenian" +msgstr "Словенӣ" + +msgid "Albanian" +msgstr "Албанӣ" + +msgid "Serbian" +msgstr "Сербӣ" + +msgid "Serbian Latin" +msgstr "Сербӣ" + +msgid "Swedish" +msgstr "Шведӣ" + +msgid "Swahili" +msgstr "Суахили" + +msgid "Tamil" +msgstr "Тамилӣ" + +msgid "Telugu" +msgstr "Телугу" + +msgid "Tajik" +msgstr "" + +msgid "Thai" +msgstr "Тайский" + +msgid "Turkmen" +msgstr "" + +msgid "Turkish" +msgstr "Туркӣ" + +msgid "Tatar" +msgstr "Тоторӣ" + +msgid "Udmurt" +msgstr "Удмуртӣ" + +msgid "Ukrainian" +msgstr "Украинӣ" + +msgid "Urdu" +msgstr "Урдуӣ" + +msgid "Uzbek" +msgstr "Узбекӣ" + +msgid "Vietnamese" +msgstr "Вэтнамӣ" + +msgid "Simplified Chinese" +msgstr "Хитоӣ" + +msgid "Traditional Chinese" +msgstr "Хитоӣ" + +msgid "Messages" +msgstr "Маълумот" + +msgid "Site Maps" +msgstr "Харитаи сайт" + +msgid "Static Files" +msgstr "Файлҳои статикӣ" + +msgid "Syndication" +msgstr "Тасмаи хабарҳо" + +msgid "That page number is not an integer" +msgstr "Рақами саҳифа бояд адади натуралӣ бошад" + +msgid "That page number is less than 1" +msgstr "Рақами саҳифа камтар аз 1" + +msgid "That page contains no results" +msgstr "Саҳифа холӣ аст" + +msgid "Enter a valid value." +msgstr "Қимматро дуруст ворид созед." + +msgid "Enter a valid URL." +msgstr "Суроға(URL)-ро дуруст ворид созед." + +msgid "Enter a valid integer." +msgstr "Ададро дуруст ворид созед." + +msgid "Enter a valid email address." +msgstr "Суроғаи почтаи электрониро дуруст ворид созед." + +#. Translators: "letters" means latin letters: a-z and A-Z. +msgid "" +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." +msgstr "" +"Қимати “slug”-ро дуруст ворид созед, бояд аз ҳарфҳо (“a-z ва A-Z”), рақамҳо, " +"зердефисҳо(_) ва дефисҳо иборат бошад." + +msgid "" +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " +"hyphens." +msgstr "" +"Қимати “slug”-ро дуруст ворид созед, бояд аз Unicode-ҳарфҳо (“a-z ва A-Z”), " +"рақамҳо, зердефисҳо(_) ва дефисҳо иборат бошад." + +msgid "Enter a valid IPv4 address." +msgstr "Шакли дурусти IPv4-суроғаро ворид созед." + +msgid "Enter a valid IPv6 address." +msgstr "Шакли ҳақиқии IPv4-суроғаро ворид кунед." + +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Шакли ҳақиқии IPv4 ё IPv6 -суроғаро ворид кунед." + +msgid "Enter only digits separated by commas." +msgstr "Рақамҳои бо вергул шудокардашударо ворид созед." + +#, python-format +msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." +msgstr "" +"Боварӣ ҳосил кунед, ки қиммати — %(limit_value)s (ҳоло шакли — " +"%(show_value)s -ро дорад)." + +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "" +"Боварӣ ҳосил кунед, ки ин қиммат хурд ё баробар аст ба %(limit_value)s." + +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "" +"Боварӣ ҳосил кунед, ки ин қиммат калон ё баробар аст ба %(limit_value)s." + +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +msgstr[1] "" + +msgid "Enter a number." +msgstr "Ададро ворид созед." + +#, python-format +msgid "Ensure that there are no more than %(max)s digit in total." +msgid_plural "Ensure that there are no more than %(max)s digits in total." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Ensure that there are no more than %(max)s decimal place." +msgid_plural "Ensure that there are no more than %(max)s decimal places." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"Ensure that there are no more than %(max)s digit before the decimal point." +msgid_plural "" +"Ensure that there are no more than %(max)s digits before the decimal point." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." +msgstr "" + +msgid "Null characters are not allowed." +msgstr "Маълумот символӣ мамнӯъро дар бар мегирад: 0-байт" + +msgid "and" +msgstr "ва" + +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "" +"%(model_name)s бо ин гуна майдонӣ қиматдор %(field_labels)s алакай вуҷуд " +"дорад." + +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "Қимати %(value)r дар байни вариантҳои омадашуда вуҷуд надорад." + +msgid "This field cannot be null." +msgstr "Ин майдон наметавонад қимати NULL дошта бошад." + +msgid "This field cannot be blank." +msgstr "Ин майдон наметавонад холӣ бошад." + +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(model_name)s бо ин гуна %(field_label)s алакай вуҷуд дорад." + +#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. +#. Eg: "Title must be unique for pub_date year" +#, python-format +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." +msgstr "" +"Қимат дар майдони «%(field_label)s» бояд барои фрагменти«%(lookup_type)s» " +"ягона бошад, санаҳо барои майдон %(date_field_label)s." + +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "Майдони намуди %(field_type)s" + +#, python-format +msgid "“%(value)s” value must be either True or False." +msgstr "Қимати “%(value)s” бояд True ё False бошад." + +#, python-format +msgid "“%(value)s” value must be either True, False, or None." +msgstr "Қимати “%(value)s” бояд True, False ё None бошад." + +msgid "Boolean (Either True or False)" +msgstr "Мантиқан (True ё False)" + +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "Сатр (то %(max_length)s)" + +msgid "Comma-separated integers" +msgstr "Яклухт, бо вергул ҷудокардашуда" + +#, python-format +msgid "" +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " +"format." +msgstr "“%(value)s” шакли нодуруст дорад. Шакли дуруст: сол.моҳ.рӯз, аст" + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "“%(value)s” шакли дуруст (сол.моҳ.рӯз) дорад, аммо сана нодуруст аст" + +msgid "Date (without time)" +msgstr "Сана (бе ишораи вақт)" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"“%(value)s” шакли нодуруст дорад. Шакли дуруст: сол.моҳ.рӯз соат.дақ[:сония[." +"uuuuuu]][TZ] аст" + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." +msgstr "" +"“%(value)s” шакли дуруст дорад (сол.моҳ.рӯз соат.дақ[:сония[.uuuuuu]][TZ]), " +"аммо 'сана/вақт'' нодуруст аст" + +msgid "Date (with time)" +msgstr "Сана (бо ишораи вақт)" + +#, python-format +msgid "“%(value)s” value must be a decimal number." +msgstr "“%(value)s” бояд адади даҳӣ бошад" + +msgid "Decimal number" +msgstr "Адади 'даҳӣ' ." + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." +"uuuuuu] format." +msgstr "" +"“%(value)s” шакли нодуруст дорад. Шакли дуруст [рӯз] [[соат:]дақ:]сония[." +"uuuuuu]" + +msgid "Duration" +msgstr "Давомнокӣ" + +msgid "Email address" +msgstr "Суроғаи почтаи электронӣ" + +msgid "File path" +msgstr "Суроғаи файл" + +#, python-format +msgid "“%(value)s” value must be a float." +msgstr "Қимати “%(value)s” бояд бутун бошад" + +msgid "Floating point number" +msgstr "Адади бутун." + +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "Қимати “%(value)s” бояд яклухт бошад" + +msgid "Integer" +msgstr "Яклухт" + +msgid "Big (8 byte) integer" +msgstr "Адади калони яклухт (8 байт)" + +msgid "IPv4 address" +msgstr "IPv4 - суроға" + +msgid "IP address" +msgstr "IP-суроға" + +#, python-format +msgid "“%(value)s” value must be either None, True or False." +msgstr "Қимати “%(value)s” бояд 'None', 'True' ё 'False' бошад" + +msgid "Boolean (Either True, False or None)" +msgstr "Мантиқӣ (True, False ё None)" + +msgid "Positive big integer" +msgstr "" + +msgid "Positive integer" +msgstr "Адади яклухти мусбат" + +msgid "Positive small integer" +msgstr "дади яклухти мусбати хурд" + +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "Слаг (то %(max_length)s)" + +msgid "Small integer" +msgstr "Адади яклухти хурд" + +msgid "Text" +msgstr "Матн" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." +msgstr "" +"“%(value)s” шакли нодуруст дорад. Шакли дуруст соат:дақ[:сония[.uuuuuu]" + +#, python-format +msgid "" +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." +msgstr "" +"“%(value)s” шакли дуруст дорад (соат:моҳ[:сония[.uuuuuu, аммо 'вақт' " +"нодуруст қайд шудааст " + +msgid "Time" +msgstr "Вақт" + +msgid "URL" +msgstr "URL" + +msgid "Raw binary data" +msgstr "Маълумоти бинари(дуи)-и коркарднашуда" + +#, python-format +msgid "“%(value)s” is not a valid UUID." +msgstr "Қимати “%(value)s” барои UUID номувофиқ аст." + +msgid "Universally unique identifier" +msgstr "Майдони UUID, идентификатори универсалии ягона" + +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "Тасвир" + +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + +#, python-format +msgid "%(model)s instance with %(field)s %(value)r does not exist." +msgstr "" +"Объекти модели %(model)s бо майдони %(field)s, -и дорои қимати %(value)r, " +"вуҷқд надорад." + +msgid "Foreign Key (type determined by related field)" +msgstr "" +"Калиди беруна(Foreign Key) (Шакл муайян шудаст аз рӯи майдони алоқамандшуда.)" + +msgid "One-to-one relationship" +msgstr "Алоқаи \"як ба як\"" + +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "Алоқаи %(from)s-%(to)s" + +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "Алоқаи %(from)s-%(to)s" + +msgid "Many-to-many relationship" +msgstr "Алоқаи \\'бисёр ба бисёр\\'" + +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the +#. label +msgid ":?.!" +msgstr ":?.!" + +msgid "This field is required." +msgstr "Майдони ҳатмӣ." + +msgid "Enter a whole number." +msgstr "Адади яклухтро ворид кунед." + +msgid "Enter a valid date." +msgstr "Санаи дурстро ворид кунед." + +msgid "Enter a valid time." +msgstr "Вақтро дуруст ворид кунед.." + +msgid "Enter a valid date/time." +msgstr "Сана ва вақтро дуруст ворид кунед." + +msgid "Enter a valid duration." +msgstr "авомнокии дурустро ворид кунед." + +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "" +"Миқдори рӯзҳо бояд доираи аз {min_days} то {max_days} -ро дарбар гирад." + +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Файл равон карда нашуд. Шакли кодировкаи формаро тафтиш кунед." + +msgid "No file was submitted." +msgstr "Ягон файл равон карда нашуд" + +msgid "The submitted file is empty." +msgstr "Файли равонкардашуда холӣ аст." + +#, python-format +msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid_plural "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr[0] "" +msgstr[1] "" + +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "" +"Хоҳиш мекунем файлро бор кунед ё байрақчаи ишоратӣ гузоред \"Тоза кардан\", " +"вале ҳарду амалро дар якҷоягӣ иҷро накунед." + +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Тасвири дурустро бор кунед. Файли боркардаи шумо нуқсон дорад ва ё 'тасвира' " +"нест" + +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "" +"Варианти дурустро интихоб кунед. %(value)s дар байни варианҳои дастрас вуҷуд " +"надорад." + +msgid "Enter a list of values." +msgstr "Рӯйхати қиматҳоро ворид кунед." + +msgid "Enter a complete value." +msgstr "Рӯйхати ҳамаи қиматҳоро ворид кунед." + +msgid "Enter a valid UUID." +msgstr "Шакли дурусти UUID -ро ворид кунед." + +msgid "Enter a valid JSON." +msgstr "" + +#. Translators: This is the default suffix added to form field labels +msgid ":" +msgstr ":" + +#, python-format +msgid "(Hidden field %(name)s) %(error)s" +msgstr "(Майдони махфии %(name)s) %(error)s" + +msgid "ManagementForm data is missing or has been tampered with" +msgstr "Маълумоти идоракунандаи форма вуҷуд надорад ё ин ки осеб дидааст." + +#, python-format +msgid "Please submit %d or fewer forms." +msgid_plural "Please submit %d or fewer forms." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "" +msgstr[1] "" + +msgid "Order" +msgstr "Тартиб" + +msgid "Delete" +msgstr "Нест кардан" + +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "" +"Илтимос қимати такроршудаистодаи майдони \"%(field)s\" ро тағйир диҳед." + +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "" +"Илтимос, қимати майдони %(field)s ро тағйир диҳед, вай бояд 'ягона' бошад." + +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"Илтимос, қимати майдони %(field_name)s ро тағйир диҳед, вай бояд барои " +"%(lookup)s дар майдони %(date_field)s ягона бошад (Ягона будан маънои " +"такрорнашавандагиро дорад)." + +msgid "Please correct the duplicate values below." +msgstr "Хоҳиш мекунам, қимати такроршудаистодаи зеринро иваз кунед." + +msgid "The inline value did not match the parent instance." +msgstr "" +"Қимати дар форма воридкардашуда бо қимати формаи база мутобиқат намекунад." + +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "" +"Варианти дурустро интихоб кунед. Варианти шумо дар қатори қиматҳои " +"овардашуда вуҷуд надорад." + +#, python-format +msgid "“%(pk)s” is not a valid value." +msgstr "" + +#, python-format +msgid "" +"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " +"may be ambiguous or it may not exist." +msgstr "" + +msgid "Clear" +msgstr "Тоза кардан" + +msgid "Currently" +msgstr "Дар айни замон" + +msgid "Change" +msgstr "Тағйир додан" + +msgid "Unknown" +msgstr "Номаълум" + +msgid "Yes" +msgstr "Ҳа" + +msgid "No" +msgstr "Не" + +#. Translators: Please do not add spaces around commas. +msgid "yes,no,maybe" +msgstr "ҳа,не,шояд" + +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%s KB" +msgstr "%s КБ" + +#, python-format +msgid "%s MB" +msgstr "%s МБ" + +#, python-format +msgid "%s GB" +msgstr "%s ГБ" + +#, python-format +msgid "%s TB" +msgstr "%s ТБ" + +#, python-format +msgid "%s PB" +msgstr "%s ПБ" + +msgid "p.m." +msgstr "н.ш." + +msgid "a.m." +msgstr "н.р." + +msgid "PM" +msgstr "НШ" + +msgid "AM" +msgstr "НР" + +msgid "midnight" +msgstr "нимашабӣ" + +msgid "noon" +msgstr "нисфирузӣ" + +msgid "Monday" +msgstr "Душанбе" + +msgid "Tuesday" +msgstr "Сешанбе" + +msgid "Wednesday" +msgstr "Чоршанбе" + +msgid "Thursday" +msgstr "Панҷшанбе" + +msgid "Friday" +msgstr "Ҷумъа" + +msgid "Saturday" +msgstr "Шанбе" + +msgid "Sunday" +msgstr "Якшанбе" + +msgid "Mon" +msgstr "Дш" + +msgid "Tue" +msgstr "Яш" + +msgid "Wed" +msgstr "Чш" + +msgid "Thu" +msgstr "Пш" + +msgid "Fri" +msgstr "Ҷ" + +msgid "Sat" +msgstr "Ш" + +msgid "Sun" +msgstr "Яш" + +msgid "January" +msgstr "Январ" + +msgid "February" +msgstr "Феврал" + +msgid "March" +msgstr "Март" + +msgid "April" +msgstr "Апрел" + +msgid "May" +msgstr "Май" + +msgid "June" +msgstr "Июн" + +msgid "July" +msgstr "Июл" + +msgid "August" +msgstr "Август" + +msgid "September" +msgstr "Сентябр" + +msgid "October" +msgstr "Октябр" + +msgid "November" +msgstr "Ноябр" + +msgid "December" +msgstr "Декабр" + +msgid "jan" +msgstr "янв" + +msgid "feb" +msgstr "фев" + +msgid "mar" +msgstr "мар" + +msgid "apr" +msgstr "апр" + +msgid "may" +msgstr "май" + +msgid "jun" +msgstr "июн" + +msgid "jul" +msgstr "июл" + +msgid "aug" +msgstr "авг" + +msgid "sep" +msgstr "сен" + +msgid "oct" +msgstr "окт" + +msgid "nov" +msgstr "ноя" + +msgid "dec" +msgstr "дек" + +msgctxt "abbrev. month" +msgid "Jan." +msgstr "Янв." + +msgctxt "abbrev. month" +msgid "Feb." +msgstr "Фев." + +msgctxt "abbrev. month" +msgid "March" +msgstr "Март" + +msgctxt "abbrev. month" +msgid "April" +msgstr "Апрел" + +msgctxt "abbrev. month" +msgid "May" +msgstr "Май" + +msgctxt "abbrev. month" +msgid "June" +msgstr "Июн" + +msgctxt "abbrev. month" +msgid "July" +msgstr "Июл" + +msgctxt "abbrev. month" +msgid "Aug." +msgstr "Авг." + +msgctxt "abbrev. month" +msgid "Sept." +msgstr "Сен." + +msgctxt "abbrev. month" +msgid "Oct." +msgstr "Окт." + +msgctxt "abbrev. month" +msgid "Nov." +msgstr "Ноя." + +msgctxt "abbrev. month" +msgid "Dec." +msgstr "Дек." + +msgctxt "alt. month" +msgid "January" +msgstr "январ" + +msgctxt "alt. month" +msgid "February" +msgstr "феврал" + +msgctxt "alt. month" +msgid "March" +msgstr "март" + +msgctxt "alt. month" +msgid "April" +msgstr "апрел" + +msgctxt "alt. month" +msgid "May" +msgstr "май" + +msgctxt "alt. month" +msgid "June" +msgstr "июн" + +msgctxt "alt. month" +msgid "July" +msgstr "июл" + +msgctxt "alt. month" +msgid "August" +msgstr "август" + +msgctxt "alt. month" +msgid "September" +msgstr "сентябр" + +msgctxt "alt. month" +msgid "October" +msgstr "октябр" + +msgctxt "alt. month" +msgid "November" +msgstr "ноябр" + +msgctxt "alt. month" +msgid "December" +msgstr "декабр" + +msgid "This is not a valid IPv6 address." +msgstr "Қиммат суроғаи дурусти IPv6 нест." + +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s…" +msgstr "%(truncated_text)s…" + +msgid "or" +msgstr "ё" + +#. Translators: This string is used as a separator between list elements +msgid ", " +msgstr ", " + +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +msgid "Forbidden" +msgstr "Мушкилӣ дар воридшавӣ" + +msgid "CSRF verification failed. Request aborted." +msgstr "Мушкили дар тафтиши CSRF. Дархост рад шуд." + +msgid "" +"You are seeing this message because this HTTPS site requires a “Referer " +"header” to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." +msgstr "" +"Шумо ин хабарро барои он мебинед, ки ин HTTPS -сомона, тавассути браузери " +"шумо дархости равон кардани 'Referer' 'header' -ро дорад. Вале ягон дархост " +"равон нашудааст.Иҷрои ин амал аз ҷиҳати бехатарӣ барои мутмаин шудани он, ки " +"браузери шумо аз тарафи шахси сеюм 'шикаста'' (взлом)нашудааст, ҳатмӣ " +"мебошад." + +msgid "" +"If you have configured your browser to disable “Referer” headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for “same-" +"origin” requests." +msgstr "" +"Агар шумо браузери худро ба таври 'Referer'-сархатҳояшон дастнорас ба танзим " +"даровада бошед,хоҳиш мекунем, ки ҳадди ақал барои сомонаи мазкур ё барои " +"пайсшавии таввассути HTTPS ё ин ки бароидархостҳои манбаашон якхела, амали " +"азнавбатанзимдарориро иҷро намоед." + +msgid "" +"If you are using the tag or " +"including the “Referrer-Policy: no-referrer” header, please remove them. The " +"CSRF protection requires the “Referer” header to do strict referer checking. " +"If you’re concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" + +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" +"Шумо ин хабарро барои он мебинед, ки сомонаи мазкур талаб менамояд, то амали " +"равонкунииформа ва CSRF cookie дар якҷоягӣ сурат гирад. Ин намуди 'cookie' " +"аз ҷиҳати бехатарӣбарои мутмаин шудани он, ки браузери шумо аз тарафи шахси " +"сеюм 'шикаста'' (взлом)нашудааст, ҳатмӣ мебошад." + +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for “same-origin” requests." +msgstr "" +"Агар шумо браузери худро ба таври дастнораси ба cookies' ба танзим даровада " +"бошед,хоҳиш мекунем, ки ҳадди ақал барои сомонаи мазкур ё барои пайсшавии " +"таввассути HTTPS ё ин ки бароидархостҳои манбаашон якхела, амали " +"азнавбатанзимдарориро иҷро намоед." + +msgid "More information is available with DEBUG=True." +msgstr "" +"Маълумоти бештар дар режими 'танзимдарорӣ'(отладчика), бо фаъолсозии " +"DEBUG=True." + +msgid "No year specified" +msgstr "Сол ишора нашудааст" + +msgid "Date out of range" +msgstr "сана аз доираи муайян берун аст" + +msgid "No month specified" +msgstr "Моҳ ишора нашудааст" + +msgid "No day specified" +msgstr "Рӯз ишора нашудааст" + +msgid "No week specified" +msgstr "Ҳафта ишора нашудааст" + +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "%(verbose_name_plural)s дастнорас аст" + +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"%(verbose_name_plural)s навбатӣ дастнорасанд барои он ки %(class_name)s." +"allow_future бо қимати \" False\" гузошта шудааст." + +#, python-format +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" +msgstr "Санаи нодурусти “%(datestr)s” шакли “%(format)s” гирифтааст" + +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "Ягон %(verbose_name)s, мувофиқ бо дархости шумо ёфт нашуд" + +msgid "Page is not “last”, nor can it be converted to an int." +msgstr "Саҳифа 'охирин' нест ва ё ки бо адади яклухт(int) ишора нашудааст" + +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "Саҳифаи нодуруст (%(page_number)s): %(message)s" + +#, python-format +msgid "Empty list and “%(class_name)s.allow_empty” is False." +msgstr "" + +msgid "Directory indexes are not allowed here." +msgstr "Азназаргузаронии рӯёхати файлҳо дар директорияи зерин номумкин аст." + +#, python-format +msgid "“%(path)s” does not exist" +msgstr "“%(path)s” вуҷуд надорад" + +#, python-format +msgid "Index of %(directory)s" +msgstr "Рӯёхати файлҳои директорияи %(directory)s" + +msgid "Django: the Web framework for perfectionists with deadlines." +msgstr "" +"Django: веб-фреймворк барои перфектсионистҳо бо дедлайнҳо. Бисёр фреймворки " +"табъи дилва хастанакунанда ҳангоми кор." + +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" +"Инҷо андешаҳо оиди баромади Django " +"%(version)s" + +msgid "The install worked successfully! Congratulations!" +msgstr "Ҷобаҷогузорӣ муваффақона анҷом ёфт! Табрик!" + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " +"URLs." +msgstr "" +"Шумо ин хабарро барои он мебинед, ки дар ишора намудед: DEBUG=True ва дар файли " +"ҷобаҷогузорӣ(settings)ягонто танзимгари URL-суроғаҳоро ишора нанамудед." + +msgid "Django Documentation" +msgstr "Ҳуҷҷатгузории Django" + +msgid "Topics, references, & how-to’s" +msgstr "" + +msgid "Tutorial: A Polling App" +msgstr "Роҳбарият: Барнома барои овоздиҳӣ" + +msgid "Get started with Django" +msgstr "оғози кор бо Django" + +msgid "Django Community" +msgstr "Иттиҳоди Django" + +msgid "Connect, get help, or contribute" +msgstr "Бо мо ҳамкорӣ намуда имкониятҳои навро пайдо намоед." diff --git a/django/conf/locale/tg/__init__.py b/django/conf/locale/tg/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/conf/locale/tg/formats.py b/django/conf/locale/tg/formats.py new file mode 100644 index 000000000000..3e7651d7552f --- /dev/null +++ b/django/conf/locale/tg/formats.py @@ -0,0 +1,32 @@ +# This file is distributed under the same license as the Django package. +# +# The *_FORMAT strings use the Django date format syntax, +# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +DATE_FORMAT = 'j E Y г.' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j E Y г. G:i' +YEAR_MONTH_FORMAT = 'F Y г.' +MONTH_DAY_FORMAT = 'j F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' +FIRST_DAY_OF_WEEK = 1 # Monday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = [ + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y', # '25.10.06' +] +DATETIME_INPUT_FORMATS = [ + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200' + '%d.%m.%y %H:%M', # '25.10.06 14:30' + '%d.%m.%y', # '25.10.06' +] +DECIMAL_SEPARATOR = ',' +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 diff --git a/django/conf/locale/tk/LC_MESSAGES/django.mo b/django/conf/locale/tk/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..2c98ebf11e4b Binary files /dev/null and b/django/conf/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tk/LC_MESSAGES/django.po b/django/conf/locale/tk/LC_MESSAGES/django.po new file mode 100644 index 000000000000..9992a7451d4f --- /dev/null +++ b/django/conf/locale/tk/LC_MESSAGES/django.po @@ -0,0 +1,1297 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Mariusz Felisiak , 2020 +# Resulkary , 2020 +# Welbeck Garli , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-08-24 20:32+0000\n" +"Last-Translator: Resulkary \n" +"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"tk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tk\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Afrikaans" +msgstr "Afrikaans" + +msgid "Arabic" +msgstr "Arapça" + +msgid "Algerian Arabic" +msgstr "Alžir Arapçasy" + +msgid "Asturian" +msgstr "Asturian" + +msgid "Azerbaijani" +msgstr "Azeri Türkçesi" + +msgid "Bulgarian" +msgstr "Bolgar" + +msgid "Belarusian" +msgstr "Belarusça" + +msgid "Bengali" +msgstr "Bengali" + +msgid "Breton" +msgstr "Breton" + +msgid "Bosnian" +msgstr "Bosniýaça" + +msgid "Catalan" +msgstr "Katalan" + +msgid "Czech" +msgstr "Çehçe" + +msgid "Welsh" +msgstr "Uelsçe" + +msgid "Danish" +msgstr "Daniýaça" + +msgid "German" +msgstr "Nemesçe" + +msgid "Lower Sorbian" +msgstr "Aşaky Sorbian" + +msgid "Greek" +msgstr "Grekçe" + +msgid "English" +msgstr "Iňlisçe" + +msgid "Australian English" +msgstr "Awstraliýa Iňlisçesi" + +msgid "British English" +msgstr "Britan Iňlisçesi" + +msgid "Esperanto" +msgstr "Esperanto" + +msgid "Spanish" +msgstr "Ispança" + +msgid "Argentinian Spanish" +msgstr "Argentina Ispançasy" + +msgid "Colombian Spanish" +msgstr "Kolumbiýa Ispançasy" + +msgid "Mexican Spanish" +msgstr "Meksika Ispançasy" + +msgid "Nicaraguan Spanish" +msgstr "Nikaragua Ispançasy" + +msgid "Venezuelan Spanish" +msgstr "Wenezuela Ispançasy" + +msgid "Estonian" +msgstr "Estonça" + +msgid "Basque" +msgstr "Baskça" + +msgid "Persian" +msgstr "Parsça" + +msgid "Finnish" +msgstr "Finçe" + +msgid "French" +msgstr "Fransuzça" + +msgid "Frisian" +msgstr "Frisça" + +msgid "Irish" +msgstr "Irlandça" + +msgid "Scottish Gaelic" +msgstr "Şotlandiýa Gaelçasy" + +msgid "Galician" +msgstr "Galisiýaça" + +msgid "Hebrew" +msgstr "Ýewreýçe" + +msgid "Hindi" +msgstr "Hindi" + +msgid "Croatian" +msgstr "Horwatça" + +msgid "Upper Sorbian" +msgstr "Ýokarky Sorbian" + +msgid "Hungarian" +msgstr "Wengerçe" + +msgid "Armenian" +msgstr "Ermeniçe" + +msgid "Interlingua" +msgstr "Interlingua" + +msgid "Indonesian" +msgstr "Indonezça" + +msgid "Igbo" +msgstr "Igbo" + +msgid "Ido" +msgstr "Ido" + +msgid "Icelandic" +msgstr "Islandça" + +msgid "Italian" +msgstr "Italýança" + +msgid "Japanese" +msgstr "Ýaponça" + +msgid "Georgian" +msgstr "Gruzinçe" + +msgid "Kabyle" +msgstr "Kabyle" + +msgid "Kazakh" +msgstr "Gazakça" + +msgid "Khmer" +msgstr "Hmerçe" + +msgid "Kannada" +msgstr "Kannada" + +msgid "Korean" +msgstr "Koreýçe" + +msgid "Kyrgyz" +msgstr "Gyrgyzça" + +msgid "Luxembourgish" +msgstr "Lýuksemburgça" + +msgid "Lithuanian" +msgstr "Litwança" + +msgid "Latvian" +msgstr "Latwiýaça" + +msgid "Macedonian" +msgstr "Makedonça" + +msgid "Malayalam" +msgstr "Malaýalam" + +msgid "Mongolian" +msgstr "Mongolça" + +msgid "Marathi" +msgstr "Marasi" + +msgid "Burmese" +msgstr "Birma" + +msgid "Norwegian Bokmål" +msgstr "Norwegiýa Bokmaly" + +msgid "Nepali" +msgstr "Nepali" + +msgid "Dutch" +msgstr "Gollandça" + +msgid "Norwegian Nynorsk" +msgstr "Norwegiýa Nynorskçasy" + +msgid "Ossetic" +msgstr "Osetikçe" + +msgid "Punjabi" +msgstr "Penjebiçe" + +msgid "Polish" +msgstr "Polýakça" + +msgid "Portuguese" +msgstr "Portugalça" + +msgid "Brazilian Portuguese" +msgstr "Braziliýa Portugalçasy" + +msgid "Romanian" +msgstr "Rumynça" + +msgid "Russian" +msgstr "Rusça" + +msgid "Slovak" +msgstr "Slowakça" + +msgid "Slovenian" +msgstr "Slowençe" + +msgid "Albanian" +msgstr "Albança" + +msgid "Serbian" +msgstr "Serbçe" + +msgid "Serbian Latin" +msgstr "Serb Latynçasy" + +msgid "Swedish" +msgstr "Şwedçe" + +msgid "Swahili" +msgstr "Swahili" + +msgid "Tamil" +msgstr "Tamil" + +msgid "Telugu" +msgstr "Telugu" + +msgid "Tajik" +msgstr "Täjik" + +msgid "Thai" +msgstr "Taýça" + +msgid "Turkmen" +msgstr "Türkmençe" + +msgid "Turkish" +msgstr "Türkçe" + +msgid "Tatar" +msgstr "Tatarça" + +msgid "Udmurt" +msgstr "Udmurt" + +msgid "Ukrainian" +msgstr "Ukrainçe" + +msgid "Urdu" +msgstr "Urduça" + +msgid "Uzbek" +msgstr "Özbekçe" + +msgid "Vietnamese" +msgstr "Wýetnamça" + +msgid "Simplified Chinese" +msgstr "Ýönekeýleşdirilen Hytaýça" + +msgid "Traditional Chinese" +msgstr "Adaty Hytaýça" + +msgid "Messages" +msgstr "Habarlar" + +msgid "Site Maps" +msgstr "Saýt Kartalary" + +msgid "Static Files" +msgstr "Statik Faýllar" + +msgid "Syndication" +msgstr "Syndikasiýa" + +msgid "That page number is not an integer" +msgstr "Ol sahypanyň sany bitewi san däl" + +msgid "That page number is less than 1" +msgstr "Ol sahypanyň belgisi 1-den az" + +msgid "That page contains no results" +msgstr "Ol sahypada hiç hili netije ýok" + +msgid "Enter a valid value." +msgstr "Dogry baha giriziň." + +msgid "Enter a valid URL." +msgstr "Dogry URL giriziň." + +msgid "Enter a valid integer." +msgstr "Dogry bitewi san giriziň." + +msgid "Enter a valid email address." +msgstr "Dogry e-poçta salgysyny giriziň." + +#. Translators: "letters" means latin letters: a-z and A-Z. +msgid "" +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." +msgstr "" +"Harplardan, sanlardan, aşaky çyzyklardan ýa-da defislerden ybarat dogry " +"“slug” giriziň." + +msgid "" +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " +"hyphens." +msgstr "" +"Unikod harplaryndan, sanlardan, aşaky çyzyklardan ýa-da defislerden ybarat " +"dogry “slug” giriziň." + +msgid "Enter a valid IPv4 address." +msgstr "Dogry IPv4 salgysyny giriziň." + +msgid "Enter a valid IPv6 address." +msgstr "Dogry IPv6 salgysyny giriziň." + +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Dogry IPv4 ýa-da IPv6 adresi giriziň." + +msgid "Enter only digits separated by commas." +msgstr "Diňe otur bilen aýrylan sanlary giriziň." + +#, python-format +msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." +msgstr "" +"%(limit_value)s bahasynyň dogry bolmagyny üpjün ediň (şuwagt %(show_value)s)." + +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "" +"Maglumatyň %(limit_value)s bahasyndan az ýa-da deň bolmagyny üpjün ediň." + +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "" +"Maglumatyň %(limit_value)s bahasyndan köp ýa-da deň bolmagyny üpjün ediň." + +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Bu maglumatda iň az %(limit_value)d harp bardygyna göz ýetiriň (munda " +"%(show_value)d bar)." +msgstr[1] "" +"Bu maglumatda azyndan %(limit_value)d nyşanyň bolmagyny üpjün ediň (şuwagt " +"%(show_value)d sany bar)." + +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d character (it has " +"%(show_value)d)." +msgid_plural "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr[0] "" +"Bu maglumatda köpünden %(limit_value)d harp bardygyna göz ýetiriň (bunda " +"%(show_value)d bar)" +msgstr[1] "" +"Bu maglumatda iň köp %(limit_value)d nyşanyň bolmagyny üpjün ediň (şuwagt " +"%(show_value)d sany bar)" + +msgid "Enter a number." +msgstr "San giriziň" + +#, python-format +msgid "Ensure that there are no more than %(max)s digit in total." +msgid_plural "Ensure that there are no more than %(max)s digits in total." +msgstr[0] "Bu ýerde jemi %(max)s'dan köp san ýokduguna göz ýetiriň." +msgstr[1] "Bu ýerde jemi %(max)s sanydan köp sifriň bolmazlygyny üpjün ediň." + +#, python-format +msgid "Ensure that there are no more than %(max)s decimal place." +msgid_plural "Ensure that there are no more than %(max)s decimal places." +msgstr[0] "Bu ýerde %(max)s'dan köp nokatly san ýokdugyna göz ýetiriň" +msgstr[1] "Bu ýerde %(max)s sanydan köp nokatly san ýoklugyny üpjün ediň." + +#, python-format +msgid "" +"Ensure that there are no more than %(max)s digit before the decimal point." +msgid_plural "" +"Ensure that there are no more than %(max)s digits before the decimal point." +msgstr[0] "Nokatdan öň %(max)s'dan köp san ýokdugyna göz ýetiriň" +msgstr[1] "Nokatdan öň %(max)s sanydan köp sifriň ýoklugyny üpjün ediň." + +#, python-format +msgid "" +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." +msgstr "" +"\"%(extension)s\" faýl görnüşine rugsat edilmeýär. Rugsat berilýän faýl " +"görnüşleri şulardan ybarat: %(allowed_extensions)s" + +msgid "Null characters are not allowed." +msgstr "Null nyşanlara rugsat berilmeýär." + +msgid "and" +msgstr "we" + +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(field_labels)s bilen baglanyşykly %(model_name)s eýýäm bar." + +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "%(value)r dogry saýlaw däl." + +msgid "This field cannot be null." +msgstr "Bu meýdan null bilmez." + +msgid "This field cannot be blank." +msgstr "Bu meýdan boş bolup bilmez." + +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(field_label)s bilen baglanyşykly %(model_name)s eýýäm bar." + +#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. +#. Eg: "Title must be unique for pub_date year" +#, python-format +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." +msgstr "" +"%(lookup_type)s %(date_field_label)s üçin %(field_label)s özboluşly " +"bolmalydyr." + +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "Meýdan görnüşi: %(field_type)s" + +#, python-format +msgid "“%(value)s” value must be either True or False." +msgstr "\"%(value)s\" hökman True ýa-da False bolmalydyr." + +#, python-format +msgid "“%(value)s” value must be either True, False, or None." +msgstr "\"%(value)s\" hökman True, False ýa-da None bolmalydyr." + +msgid "Boolean (Either True or False)" +msgstr "Boolean (True ýa-da False)" + +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "Setir (iň köp %(max_length)s)" + +msgid "Comma-separated integers" +msgstr "Otur bilen bölünen bitewi sanlar" + +#, python-format +msgid "" +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " +"format." +msgstr "" +"\"%(value)s\" bahasynyň nädogry sene formaty bar. ÝÝÝÝ-AA-GG görnüşinde " +"bolmaly." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "" +"\"%(value)s\" dogry yazylyş usuluna (ÝÝÝÝ-AA-GG) eýe, ýöne, sene nädogry." + +msgid "Date (without time)" +msgstr "Sene (wagtsyz)" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"\"%(value)s\" ýalňyş görnüşde ýazylan. Bu baha hökmany suratda ÝÝÝÝ-AA-GG SS:" +"MM[:ss[.uuuuuu]][TZ] görnüşde bolmalydyr." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." +msgstr "" +"\"%(value)s\" dogry sene görnüşine eýe (ÝÝÝÝ-AA-GG SS:MM[:ss[.uuuuuu]][TZ]). " +"Ýöne bu nädogry sene/wagt." + +msgid "Date (with time)" +msgstr "Sene (wagty bilen)" + +#, python-format +msgid "“%(value)s” value must be a decimal number." +msgstr "\"%(value)s\" hökman nokatly san bolmalydyr." + +msgid "Decimal number" +msgstr "Onluk san" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." +"uuuuuu] format." +msgstr "" +"\"%(value)s\" ýalňyş sene görnüşine eýe. Bu hökman [GG] [[SS:]AA:]ss[." +"uuuuuu] görnüşinde bolmalydyr." + +msgid "Duration" +msgstr "Dowamlylyk" + +msgid "Email address" +msgstr "Email adres" + +msgid "File path" +msgstr "Faýl ýoly" + +#, python-format +msgid "“%(value)s” value must be a float." +msgstr "\"%(value)s float san bolmaly." + +msgid "Floating point number" +msgstr "Float san" + +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "\"%(value)s\" bitewi san bolmaly." + +msgid "Integer" +msgstr "Bitewi san" + +msgid "Big (8 byte) integer" +msgstr "Uly (8 baýt) bitewi san" + +msgid "IPv4 address" +msgstr "IPv4 salgy" + +msgid "IP address" +msgstr "IP salgy" + +#, python-format +msgid "“%(value)s” value must be either None, True or False." +msgstr "\"%(value)s\" None, True ýa-da False bolmaly." + +msgid "Boolean (Either True, False or None)" +msgstr "Boolean (True, False ýa-da None)" + +msgid "Positive big integer" +msgstr "Pozitiw uly bitewi san" + +msgid "Positive integer" +msgstr "Pozitiw bitewi san" + +msgid "Positive small integer" +msgstr "Pozitiw kiçi bitewi san" + +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "Slug (iň köp %(max_length)s)" + +msgid "Small integer" +msgstr "Kiçi bitewi san" + +msgid "Text" +msgstr "Tekst" + +#, python-format +msgid "" +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." +msgstr "" +"\"%(value)s\" bahasy nädogry formata eýe. SS:MM[:ss[.uuuuuu]] formatda " +"bolmaly." + +#, python-format +msgid "" +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." +msgstr "" +"\"%(value)s\" bahasy dogry formata eýe (SS:MM[:ss[.uuuuuu]]) ýöne bu nädogry " +"wagt." + +msgid "Time" +msgstr "Wagt" + +msgid "URL" +msgstr "URL" + +msgid "Raw binary data" +msgstr "Çig ikilik maglumat" + +#, python-format +msgid "“%(value)s” is not a valid UUID." +msgstr "\"%(value)s\" dogry UUID däl." + +msgid "Universally unique identifier" +msgstr "Ähliumumy özboluşly kesgitleýji" + +msgid "File" +msgstr "Faýl" + +msgid "Image" +msgstr "Surat" + +msgid "A JSON object" +msgstr "JSON obýekti" + +msgid "Value must be valid JSON." +msgstr "Bahasy JSON bolmaly." + +#, python-format +msgid "%(model)s instance with %(field)s %(value)r does not exist." +msgstr "%(field)s%(value)r bolan %(model)s ýok." + +msgid "Foreign Key (type determined by related field)" +msgstr "Daşary açary (baglanyşykly meýdança bilen kesgitlenýär)" + +msgid "One-to-one relationship" +msgstr "Bire-bir gatnaşyk" + +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "%(from)s-%(to)s gatnaşyk" + +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "%(from)s-%(to)s gatnaşyklar" + +msgid "Many-to-many relationship" +msgstr "Köp-köp gatnaşyk" + +#. Translators: If found as last label character, these punctuation +#. characters will prevent the default label_suffix to be appended to the +#. label +msgid ":?.!" +msgstr ":?.!" + +msgid "This field is required." +msgstr "Bu meýdança hökman gerekli." + +msgid "Enter a whole number." +msgstr "Bitin san giriziň." + +msgid "Enter a valid date." +msgstr "Dogry senäni giriziň." + +msgid "Enter a valid time." +msgstr "Dogry wagt giriziň." + +msgid "Enter a valid date/time." +msgstr "Dogry senäni/wagty giriziň." + +msgid "Enter a valid duration." +msgstr "Dogry dowamlylygy giriziň." + +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "Günleriň sany {min_days} bilen {max_days} arasynda bolmaly." + +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Hiç hili faýl tabşyrylmady. Formadaky enkodiň görnüşini barlaň." + +msgid "No file was submitted." +msgstr "Hiç hili faýl tabşyrylmady." + +msgid "The submitted file is empty." +msgstr "Tabşyrylan faýl boş." + +#, python-format +msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid_plural "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr[0] "" +"Bu faýl adynyň iň köp %(max)d nyşanynyň bolmagyny üpjin ediň (şuwagt " +"%(length)d sany bar)." +msgstr[1] "" +"Bu faýl adynyň iň köp %(max)d nyşanynyň bolmagyny üpjin ediň (şuwagt " +"%(length)d sany bar)." + +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "Bir faýl iberiň ýa-da arassala gutyjygyny belläň, ikisini bile däl." + +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Dogry surat ýükläň. Ýüklän faýlyňyz ýa surat däldi ýa-da zaýalanan suratdy." + +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "Dogry saýlawy saýlaň. %(value)s elýeterli saýlawlaryň biri däl." + +msgid "Enter a list of values." +msgstr "Bahalaryň sanawyny giriziň." + +msgid "Enter a complete value." +msgstr "Doly bahany giriziň." + +msgid "Enter a valid UUID." +msgstr "Dogry UUID giriziň." + +msgid "Enter a valid JSON." +msgstr "Dogry JSON giriziň." + +#. Translators: This is the default suffix added to form field labels +msgid ":" +msgstr ":" + +#, python-format +msgid "(Hidden field %(name)s) %(error)s" +msgstr "(Gizlin meýdan %(name)s) %(error)s" + +msgid "ManagementForm data is missing or has been tampered with" +msgstr "ManagementForm maglumatlary ýok ýa-da bozulandyr" + +#, python-format +msgid "Please submit %d or fewer forms." +msgid_plural "Please submit %d or fewer forms." +msgstr[0] "%dýa-da ondan azyrak forma tabşyryň" +msgstr[1] "%d ýa-da ondan azyrak forma tabşyryň." + +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "%d ýa-da ondan köp forma tabşyryň." +msgstr[1] "%d ýa-da ondan köp forma tabşyryň." + +msgid "Order" +msgstr "Tertip" + +msgid "Delete" +msgstr "Poz" + +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "%(field)s üçin dublikat maglumatlary düzediň." + +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "Özboluşly bolmaly %(field)s üçin dublikat maglumatlary düzediň." + +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"%(date_field)s meýdanynda %(lookup)süçin özboluşly bolmaly %(field_name)s " +"üçin dublikat maglumatlary düzediň." + +msgid "Please correct the duplicate values below." +msgstr "Aşakdaky dublikat bahalary düzediň." + +msgid "The inline value did not match the parent instance." +msgstr "Giriş bahasy esasy mysal bilen gabat gelmedi." + +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "Dogry saýlawy saýlaň. Bu saýlaw, elýeterli saýlawlaryň biri däl." + +#, python-format +msgid "“%(pk)s” is not a valid value." +msgstr "\"%(pk)s\" dogry baha däl." + +#, python-format +msgid "" +"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " +"may be ambiguous or it may not exist." +msgstr "" +"%(datetime)s wagty %(current_timezone)s wagt zolagy bilen düşündirip " +"bolmady; garyşyk bolup biler ýa-da ýok bolmagy mümkin." + +msgid "Clear" +msgstr "Arassala" + +msgid "Currently" +msgstr "Häzirki wagtda" + +msgid "Change" +msgstr "Üýtget" + +msgid "Unknown" +msgstr "Näbelli" + +msgid "Yes" +msgstr "Hawa" + +msgid "No" +msgstr "Ýok" + +#. Translators: Please do not add spaces around commas. +msgid "yes,no,maybe" +msgstr "hawa,ýok,belki" + +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d baýt" +msgstr[1] "%(size)d baýt" + +#, python-format +msgid "%s KB" +msgstr "%s KB" + +#, python-format +msgid "%s MB" +msgstr "%s MB" + +#, python-format +msgid "%s GB" +msgstr "%s GB" + +#, python-format +msgid "%s TB" +msgstr "%s TB" + +#, python-format +msgid "%s PB" +msgstr "%s PB" + +msgid "p.m." +msgstr "p.m" + +msgid "a.m." +msgstr "a.m" + +msgid "PM" +msgstr "PM" + +msgid "AM" +msgstr "AM" + +msgid "midnight" +msgstr "ýary gije" + +msgid "noon" +msgstr "günortan" + +msgid "Monday" +msgstr "Duşenbe" + +msgid "Tuesday" +msgstr "Sişenbe" + +msgid "Wednesday" +msgstr "Çarşenbe" + +msgid "Thursday" +msgstr "Penşenbe" + +msgid "Friday" +msgstr "Anna" + +msgid "Saturday" +msgstr "Şenbe" + +msgid "Sunday" +msgstr "Ýekşenbe" + +msgid "Mon" +msgstr "Duş" + +msgid "Tue" +msgstr "Siş" + +msgid "Wed" +msgstr "Çarş" + +msgid "Thu" +msgstr "Pen" + +msgid "Fri" +msgstr "Anna" + +msgid "Sat" +msgstr "Şen" + +msgid "Sun" +msgstr "Ýek" + +msgid "January" +msgstr "Ýanwar" + +msgid "February" +msgstr "Fewral" + +msgid "March" +msgstr "Mart" + +msgid "April" +msgstr "Aprel" + +msgid "May" +msgstr "Maý" + +msgid "June" +msgstr "Iýun" + +msgid "July" +msgstr "Iýul" + +msgid "August" +msgstr "Awgust" + +msgid "September" +msgstr "Sentýabr" + +msgid "October" +msgstr "Oktýabr" + +msgid "November" +msgstr "Noýabr" + +msgid "December" +msgstr "Dekabr" + +msgid "jan" +msgstr "ýan" + +msgid "feb" +msgstr "few" + +msgid "mar" +msgstr "mart" + +msgid "apr" +msgstr "apr" + +msgid "may" +msgstr "maý" + +msgid "jun" +msgstr "iýun" + +msgid "jul" +msgstr "iýul" + +msgid "aug" +msgstr "awg" + +msgid "sep" +msgstr "sent" + +msgid "oct" +msgstr "okt" + +msgid "nov" +msgstr "noý" + +msgid "dec" +msgstr "dek" + +msgctxt "abbrev. month" +msgid "Jan." +msgstr "Ýan." + +msgctxt "abbrev. month" +msgid "Feb." +msgstr "Few." + +msgctxt "abbrev. month" +msgid "March" +msgstr "Mart" + +msgctxt "abbrev. month" +msgid "April" +msgstr "Aprel" + +msgctxt "abbrev. month" +msgid "May" +msgstr "Maý" + +msgctxt "abbrev. month" +msgid "June" +msgstr "Iýun" + +msgctxt "abbrev. month" +msgid "July" +msgstr "Iýul" + +msgctxt "abbrev. month" +msgid "Aug." +msgstr "Awg." + +msgctxt "abbrev. month" +msgid "Sept." +msgstr "Sent." + +msgctxt "abbrev. month" +msgid "Oct." +msgstr "Okt." + +msgctxt "abbrev. month" +msgid "Nov." +msgstr "Noý." + +msgctxt "abbrev. month" +msgid "Dec." +msgstr "Dek." + +msgctxt "alt. month" +msgid "January" +msgstr "Ýanwar" + +msgctxt "alt. month" +msgid "February" +msgstr "Fewral" + +msgctxt "alt. month" +msgid "March" +msgstr "Mart" + +msgctxt "alt. month" +msgid "April" +msgstr "Aprel" + +msgctxt "alt. month" +msgid "May" +msgstr "Maý" + +msgctxt "alt. month" +msgid "June" +msgstr "Iýun" + +msgctxt "alt. month" +msgid "July" +msgstr "Iýul" + +msgctxt "alt. month" +msgid "August" +msgstr "Awgust" + +msgctxt "alt. month" +msgid "September" +msgstr "Sentýabr" + +msgctxt "alt. month" +msgid "October" +msgstr "Oktýabr" + +msgctxt "alt. month" +msgid "November" +msgstr "Noýabr" + +msgctxt "alt. month" +msgid "December" +msgstr "Dekabr" + +msgid "This is not a valid IPv6 address." +msgstr "Bu dogry IPv6 salgy däl." + +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s…" +msgstr "%(truncated_text)s..." + +msgid "or" +msgstr "ýa" + +#. Translators: This string is used as a separator between list elements +msgid ", " +msgstr "\"" + +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%d ýyl" +msgstr[1] "%d ýyl" + +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%d aý" +msgstr[1] "%d aý" + +#, python-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d hepde" +msgstr[1] "%d hepde" + +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d gün" +msgstr[1] "%d gün" + +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d sagat" +msgstr[1] "%d sagat" + +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minut" + +msgid "Forbidden" +msgstr "Gadagan " + +msgid "CSRF verification failed. Request aborted." +msgstr "CSRF dogrylamak şowsuz. Talap ýatyryldy." + +msgid "" +"You are seeing this message because this HTTPS site requires a “Referer " +"header” to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." +msgstr "" +"Bu habary görýärsiňiz, sebäbi bu HTTPS sahypasy web brauzeriňiz tarapyndan " +"iberilmegi üçin \"Referer sözbaşy\" talap edýär, ýöne hiç biri iberilmedi. " +"Bu sözbaşy, brauzeriňiziň üçünji taraplar tarapyndan ogurlanmazlygy üçin " +"howpsuzlyk sebäpli talap edilýär." + +msgid "" +"If you have configured your browser to disable “Referer” headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for “same-" +"origin” requests." +msgstr "" +"Brauzeriňizde \"Referer\" sözbaşylaryny öçüren bolsaňyz, iň bolmanda bu " +"sahypa ýa-da HTTPS birikmeleri ýa-da \"meňzeş\" talaplar üçin täzeden açyň." + +msgid "" +"If you are using the tag or " +"including the “Referrer-Policy: no-referrer” header, please remove them. The " +"CSRF protection requires the “Referer” header to do strict referer checking. " +"If you’re concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" +"Egerde siz diýen bellik " +"ýada \"Referrer-Policy: no-referrer\" header ulanýan bolsaňyz, olary " +"aýyrmagyňyzy haýyş edýäris. CSRF goragy üçin \"Referer\" header-i dogry " +"salgylanma üçin gereklidir. Eger siz gizlinlik üçin alada etseňiz, üçinji " +"şahs sahypalara baglanyşyklar üçin ýaly " +"alternatiwalary ulanyp bilersiňiz." + +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" +"Bu sahypa formalary tabşyranda CSRF kukisini talap edýäligi sebäpli bu " +"habary görýärsiňiz. Bu kuki, brauzeriňiziň üçünji taraplar tarapyndan " +"ogurlanmazlygy üçin howpsuzlyk sebäpli talap edilýär." + +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for “same-origin” requests." +msgstr "" +"Brauzeriňizde kukileri öçüren bolsaňyz, iň bolmanda şu sahypa ýa-da \"meňzeş" +"\" talaplar üçin olary täzeden açyň." + +msgid "More information is available with DEBUG=True." +msgstr "Has giňişleýin maglumat DEBUG=True bilen elýeterlidir." + +msgid "No year specified" +msgstr "Ýyl görkezilmedi" + +msgid "Date out of range" +msgstr "Sene çägiň daşynda" + +msgid "No month specified" +msgstr "Aý görkezilmedi" + +msgid "No day specified" +msgstr "Gün görkezilmedi" + +msgid "No week specified" +msgstr "Hepde görkezilmedi" + +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "Elýeterli %(verbose_name_plural)s ýok" + +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"Gelejek %(verbose_name_plural)s elýeterli däl sebäbi %(class_name)s." +"allow_future bahasy False" + +#, python-format +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" +msgstr "Nädogry sene setiri \"%(datestr)s\" berlen format \"%(format)s\"" + +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "Talap bilen gabat gelýän %(verbose_name)s tapylmady" + +msgid "Page is not “last”, nor can it be converted to an int." +msgstr "Sahypa “iň soňky” däl, ony int-ede öwrüp bolmaz." + +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "Nädogry sahypa (%(page_number)s ): %(message)s" + +#, python-format +msgid "Empty list and “%(class_name)s.allow_empty” is False." +msgstr "Boş list we \"%(class_name)s.allow_empty\" bahasy False" + +msgid "Directory indexes are not allowed here." +msgstr "Bu ýerde katalog indekslerine rugsat berilmeýär." + +#, python-format +msgid "“%(path)s” does not exist" +msgstr "\"%(path)s\" beýle ýol ýok" + +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s indeksi" + +msgid "Django: the Web framework for perfectionists with deadlines." +msgstr "" +"Django: möhletleri bolan we kämillik talap edýänler üçin web freýmworky." + +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" +"Django %(version)s üçin goýberiş " +"belliklerini görüň" + +msgid "The install worked successfully! Congratulations!" +msgstr "Üstünlikli guruldy! Gutlaýarys!" + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " +"URLs." +msgstr "" +"Bu sahypany görýärsiňiz, sebäbi sazlamalar faýlyňyzda DEBUG=True we hiç hili URL düzmediňiz." + +msgid "Django Documentation" +msgstr "Django resminamalary" + +msgid "Topics, references, & how-to’s" +msgstr "Mowzuklar, salgylanmalar, & how-to-lar" + +msgid "Tutorial: A Polling App" +msgstr "Gollanma: Ses beriş programmasy" + +msgid "Get started with Django" +msgstr "Django bilen başlaň" + +msgid "Django Community" +msgstr "Django jemgyýeti" + +msgid "Connect, get help, or contribute" +msgstr "Birikiň, kömek alyň ýa-da goşant goşuň" diff --git a/django/conf/locale/tk/__init__.py b/django/conf/locale/tk/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/conf/locale/tk/formats.py b/django/conf/locale/tk/formats.py new file mode 100644 index 000000000000..3e7651d7552f --- /dev/null +++ b/django/conf/locale/tk/formats.py @@ -0,0 +1,32 @@ +# This file is distributed under the same license as the Django package. +# +# The *_FORMAT strings use the Django date format syntax, +# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +DATE_FORMAT = 'j E Y г.' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j E Y г. G:i' +YEAR_MONTH_FORMAT = 'F Y г.' +MONTH_DAY_FORMAT = 'j F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' +FIRST_DAY_OF_WEEK = 1 # Monday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = [ + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y', # '25.10.06' +] +DATETIME_INPUT_FORMATS = [ + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200' + '%d.%m.%y %H:%M', # '25.10.06 14:30' + '%d.%m.%y', # '25.10.06' +] +DECIMAL_SEPARATOR = ',' +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo index 1a7bdf118b6b..001ec731e570 100644 Binary files a/django/conf/locale/tr/LC_MESSAGES/django.mo and b/django/conf/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tr/LC_MESSAGES/django.po b/django/conf/locale/tr/LC_MESSAGES/django.po index 66f12b0237c9..6f426f2a0bc3 100644 --- a/django/conf/locale/tr/LC_MESSAGES/django.po +++ b/django/conf/locale/tr/LC_MESSAGES/django.po @@ -2,23 +2,23 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2019 +# BouRock, 2015-2021 # BouRock, 2014-2015 -# Caner Başaran , 2013 +# Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2012 # Cihad GÜNDOĞDU , 2013-2014 # Gökmen Görgen , 2013 # Jannis Leidel , 2011 # Mesut Can Gürle , 2013 -# Murat Çorlu , 2012 +# Murat Çorlu , 2012 # Murat Sahin , 2011-2012 # Türker Sezer , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 17:42+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-16 19:28+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -34,6 +34,9 @@ msgstr "Afrikanca" msgid "Arabic" msgstr "Arapça" +msgid "Algerian Arabic" +msgstr "Cezayir Arapçası" + msgid "Asturian" msgstr "Asturyaca" @@ -157,6 +160,9 @@ msgstr "Interlingua" msgid "Indonesian" msgstr "Endonezce" +msgid "Igbo" +msgstr "Igbo dili" + msgid "Ido" msgstr "Ido dili" @@ -187,6 +193,9 @@ msgstr "Kannada dili" msgid "Korean" msgstr "Korece" +msgid "Kyrgyz" +msgstr "Kırgızca" + msgid "Luxembourgish" msgstr "Lüksemburgca" @@ -271,9 +280,15 @@ msgstr "Tamilce" msgid "Telugu" msgstr "Telugu dili" +msgid "Tajik" +msgstr "Tacikçe" + msgid "Thai" msgstr "Tayca" +msgid "Turkmen" +msgstr "Türkmence" + msgid "Turkish" msgstr "Türkçe" @@ -313,6 +328,11 @@ msgstr "Sabit Dosyalar" msgid "Syndication" msgstr "Dağıtım" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Bu sayfa numarası bir tamsayı değil" @@ -568,6 +588,9 @@ msgstr "Tamsayı" msgid "Big (8 byte) integer" msgstr "Büyük (8 bayt) tamsayı" +msgid "Small integer" +msgstr "Küçük tamsayı" + msgid "IPv4 address" msgstr "IPv4 adresi" @@ -581,6 +604,9 @@ msgstr "“%(value)s” değeri ya None, True ya da False olmak zorundadır." msgid "Boolean (Either True, False or None)" msgstr "Booleanl (Ya True, False, ya da None)" +msgid "Positive big integer" +msgstr "Pozitif büyük tamsayı" + msgid "Positive integer" msgstr "Pozitif tamsayı" @@ -591,9 +617,6 @@ msgstr "Pozitif küçük tamsayı" msgid "Slug (up to %(max_length)s)" msgstr "Kısaltma (%(max_length)s karaktere kadar)" -msgid "Small integer" -msgstr "Küçük tamsayı" - msgid "Text" msgstr "Metin" @@ -635,6 +658,12 @@ msgstr "Dosya" msgid "Image" msgstr "Resim" +msgid "A JSON object" +msgstr "JSON nesnesi" + +msgid "Value must be valid JSON." +msgstr "Değer geçerli JSON olmak zorundadır." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s %(value)r olan %(model)s benzeri mevcut değil." @@ -729,6 +758,9 @@ msgstr "Tam bir değer girin." msgid "Enter a valid UUID." msgstr "Geçerli bir UUID girin." +msgid "Enter a valid JSON." +msgstr "Geçerli bir JSON girin." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -737,20 +769,25 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Gizli alan %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm verisi eksik ya da kurcalanmış." +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm verileri eksik veya değiştirilmiş. Eksik alanlar: " +"%(field_names)s. Sorun devam ederse bir hata raporu dosyalamanız gerekebilir." #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Lütfen %d ya da daha az form gönderin." -msgstr[1] "Lütfen %d ya da daha az form gönderin." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "Lütfen en fazla %d form gönderin." +msgstr[1] "Lütfen en fazla %d form gönderin." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Lütfen %d ya da daha fazla form gönderin." -msgstr[1] "Lütfen %d ya da daha fazla form gönderin." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "Lütfen en az %d form gönderin." +msgstr[1] "Lütfen en az %d form gönderin." msgid "Order" msgstr "Sıralama" @@ -815,15 +852,7 @@ msgstr "Evet" msgid "No" msgstr "Hayır" -msgid "Year" -msgstr "Yıl" - -msgid "Month" -msgstr "Ay" - -msgid "Day" -msgstr "Gün" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "evet,hayır,olabilir" @@ -1132,9 +1161,6 @@ msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -msgid "0 minutes" -msgstr "0 dakika" - msgid "Forbidden" msgstr "Yasak" @@ -1253,8 +1279,8 @@ msgstr "“%(path)s” mevcut değil" msgid "Index of %(directory)s" msgstr "%(directory)s indeksi" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: bitiş tarihleri olan mükemmelliyetçiler için Web yapısı." +msgid "The install worked successfully! Congratulations!" +msgstr "Yükleme başarılı olarak çalıştı! Tebrikler!" #, python-format msgid "" @@ -1265,9 +1291,6 @@ msgstr "" "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">yayım notlarını göster" -msgid "The install worked successfully! Congratulations!" -msgstr "Yükleme başarılı olarak çalıştı! Tebrikler!" - #, python-format msgid "" "You are seeing this page because , 2014 # Boryslav Larin , 2011 -# Денис Подлесный , 2016 +# Denis Podlesniy , 2016 # Igor Melnyk, 2014-2015,2017 -# Illia Volochii , 2019 +# Illia Volochii , 2019,2021 # Jannis Leidel , 2011 # Kirill Gagarski , 2014 # Max V. Stotsky , 2014 @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-12-26 20:22+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-20 00:05+0000\n" "Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" @@ -41,6 +41,9 @@ msgstr "Африканська" msgid "Arabic" msgstr "Арабська" +msgid "Algerian Arabic" +msgstr "Алжирська арабська" + msgid "Asturian" msgstr "Астурійська" @@ -164,6 +167,9 @@ msgstr "Інтерлінгва" msgid "Indonesian" msgstr "Індонезійська" +msgid "Igbo" +msgstr "Ігбо" + msgid "Ido" msgstr "Ідо" @@ -194,6 +200,9 @@ msgstr "Каннадська" msgid "Korean" msgstr "Корейська" +msgid "Kyrgyz" +msgstr "Киргизька" + msgid "Luxembourgish" msgstr "Люксембурзька" @@ -278,9 +287,15 @@ msgstr "Тамільська" msgid "Telugu" msgstr "Телугу" +msgid "Tajik" +msgstr "Таджицька" + msgid "Thai" msgstr "Тайська" +msgid "Turkmen" +msgstr "Туркменська" + msgid "Turkish" msgstr "Турецька" @@ -320,6 +335,11 @@ msgstr "Статичні файли" msgid "Syndication" msgstr "Об'єднання" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "Номер сторінки не є цілим числом" @@ -584,6 +604,9 @@ msgstr "Ціле число" msgid "Big (8 byte) integer" msgstr "Велике (8 байтів) ціле число" +msgid "Small integer" +msgstr "Мале ціле число" + msgid "IPv4 address" msgstr "IPv4 адреса" @@ -597,6 +620,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Булеве значення (включаючи True, False або None)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Додатнє ціле число" @@ -607,9 +633,6 @@ msgstr "Додатнє мале ціле число" msgid "Slug (up to %(max_length)s)" msgstr "Slug (до %(max_length)s)" -msgid "Small integer" -msgstr "Мале ціле число" - msgid "Text" msgstr "Текст" @@ -647,6 +670,12 @@ msgstr "Файл" msgid "Image" msgstr "Зображення" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Екземпляр %(model)s з %(field)s %(value)r не існує." @@ -747,6 +776,9 @@ msgstr "Введіть значення повністю." msgid "Enter a valid UUID." msgstr "Введіть коректне значення UUID," +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -755,24 +787,27 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(Приховане поле %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "Дані ManagementForm відсутні або були пошкоджені" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Будь ласка, відправте %d або менше форм." -msgstr[1] "Будь ласка, відправте %d або менше форм." -msgstr[2] "Будь ласка, відправте %d або менше форм." -msgstr[3] "Будь ласка, відправте %d або менше форм." +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "Будь ласка, відправте як мінімум %d форму." -msgstr[1] "Будь ласка, відправте як мінімум %d форми." -msgstr[2] "Будь ласка, відправте як мінімум %d форм." -msgstr[3] "Будь ласка, відправте як мінімум %d форм." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" msgid "Order" msgstr "Послідовність" @@ -835,15 +870,7 @@ msgstr "Так" msgid "No" msgstr "Ні" -msgid "Year" -msgstr "Рік" - -msgid "Month" -msgstr "Місяць" - -msgid "Day" -msgstr "День" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "так,ні,можливо" @@ -1166,9 +1193,6 @@ msgstr[1] "%d хвилини" msgstr[2] "%d хвилин" msgstr[3] "%d хвилин" -msgid "0 minutes" -msgstr "0 хвилин" - msgid "Forbidden" msgstr "Заборонено" @@ -1270,8 +1294,8 @@ msgstr "\"%(path)s\" не існує" msgid "Index of %(directory)s" msgstr "Вміст директорії %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django: веб-фреймворк для перфекціоністів з реченцями." +msgid "The install worked successfully! Congratulations!" +msgstr "Вітаємо, команда install завершилась успішно!" #, python-format msgid "" @@ -1281,9 +1305,6 @@ msgstr "" "Нотатки релізу for Django %(version)s" -msgid "The install worked successfully! Congratulations!" -msgstr "Вітаємо, команда install завершилась успішно!" - #, python-format msgid "" "You are seeing this page because , 2020 # Bedilbek Khamidov , 2019 +# Claude Paroz , 2020 # Sukhrobbek Ismatov , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-12 06:31+0000\n" -"Last-Translator: Bedilbek Khamidov \n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-25 17:08+0000\n" +"Last-Translator: Abdulaminkhon Khaydarov \n" "Language-Team: Uzbek (http://www.transifex.com/django/django/language/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,6 +25,9 @@ msgstr "Afrika tili" msgid "Arabic" msgstr "Arab tili" +msgid "Algerian Arabic" +msgstr "Jazoir arab tili" + msgid "Asturian" msgstr "Asturiya tili" @@ -146,6 +151,9 @@ msgstr "Interlingua tili" msgid "Indonesian" msgstr "Indoneziya tili" +msgid "Igbo" +msgstr "Igbo tili" + msgid "Ido" msgstr "Ido tili" @@ -176,6 +184,9 @@ msgstr "Kannada tili" msgid "Korean" msgstr "Koreys tili" +msgid "Kyrgyz" +msgstr "Qirg'iz tili" + msgid "Luxembourgish" msgstr "Lyuksemburg tili" @@ -260,9 +271,15 @@ msgstr "Tamil tili" msgid "Telugu" msgstr "Telugu tili" +msgid "Tajik" +msgstr "Tojik tili" + msgid "Thai" msgstr "Tay tili" +msgid "Turkmen" +msgstr "Turkman tili" + msgid "Turkish" msgstr "Turk tili" @@ -568,6 +585,9 @@ msgstr "\"%(value)s\" qiymati Yo‘q, To‘g‘ri yoki Noto'g'ri bo'lishi kerak. msgid "Boolean (Either True, False or None)" msgstr "Boolean (To'g'ri, Yolg'on yoki Hech biri)" +msgid "Positive big integer" +msgstr "Musbat katta butun son" + msgid "Positive integer" msgstr "Ijobiy butun son" @@ -622,6 +642,12 @@ msgstr "Fayl" msgid "Image" msgstr "Rasm" +msgid "A JSON object" +msgstr "JSON ob'ekti" + +msgid "Value must be valid JSON." +msgstr "Qiymat yaroqli JSON bo'lishi kerak." + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s %(value)r lari bilan %(model)s namunasi uchun mavjud emas." @@ -712,6 +738,9 @@ msgstr "To'liq qiymatni kiriting." msgid "Enter a valid UUID." msgstr "To'g'ri UUID kiriting." +msgid "Enter a valid JSON." +msgstr "Yaroqli JSONni kiriting." + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -796,17 +825,9 @@ msgstr "Ha" msgid "No" msgstr "Yo'q" -msgid "Year" -msgstr "Yil" - -msgid "Month" -msgstr "Oy" - -msgid "Day" -msgstr "Kun" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "ha, yo'q, ehtimol" +msgstr "ha,yo'q,ehtimol" #, python-format msgid "%(size)d byte" @@ -1106,9 +1127,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%dminut" -msgid "0 minutes" -msgstr "0 daqiqa" - msgid "Forbidden" msgstr "Taqiqlangan" diff --git a/django/conf/locale/vi/LC_MESSAGES/django.mo b/django/conf/locale/vi/LC_MESSAGES/django.mo index a849ea4446ca..43a2a61928d7 100644 Binary files a/django/conf/locale/vi/LC_MESSAGES/django.mo and b/django/conf/locale/vi/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/vi/LC_MESSAGES/django.po b/django/conf/locale/vi/LC_MESSAGES/django.po index d2a1a0fb0a52..a0e6eb43f39f 100644 --- a/django/conf/locale/vi/LC_MESSAGES/django.po +++ b/django/conf/locale/vi/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2020 # Jannis Leidel , 2011 # Anh Phan , 2013 # Thanh Le Viet , 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" +"PO-Revision-Date: 2020-07-14 21:42+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Vietnamese (http://www.transifex.com/django/django/language/" "vi/)\n" "MIME-Version: 1.0\n" @@ -29,6 +30,9 @@ msgstr "Afrikaans" msgid "Arabic" msgstr "Tiếng Ả Rập" +msgid "Algerian Arabic" +msgstr "" + msgid "Asturian" msgstr "Asturian" @@ -152,6 +156,9 @@ msgstr "Tiếng Khoa học Quốc tế" msgid "Indonesian" msgstr "Tiếng In-đô-nê-xi-a" +msgid "Igbo" +msgstr "" + msgid "Ido" msgstr "Ido" @@ -182,6 +189,9 @@ msgstr "Tiếng Kannada" msgid "Korean" msgstr "Tiếng Hàn Quốc" +msgid "Kyrgyz" +msgstr "" + msgid "Luxembourgish" msgstr "Tiếng Luxembourg" @@ -266,9 +276,15 @@ msgstr "Tiếng Ta-min" msgid "Telugu" msgstr "Telugu" +msgid "Tajik" +msgstr "" + msgid "Thai" msgstr "Tiếng Thái" +msgid "Turkmen" +msgstr "" + msgid "Turkish" msgstr "Tiếng Thổ Nhĩ Kỳ" @@ -546,6 +562,9 @@ msgstr "" msgid "Boolean (Either True, False or None)" msgstr "Luận lý (Có thể Đúng, Sai hoặc Không cái nào đúng)" +msgid "Positive big integer" +msgstr "" + msgid "Positive integer" msgstr "Số nguyên dương" @@ -596,6 +615,12 @@ msgstr "File" msgid "Image" msgstr "Image" +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" @@ -685,6 +710,9 @@ msgstr "" msgid "Enter a valid UUID." msgstr "" +msgid "Enter a valid JSON." +msgstr "" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -767,17 +795,9 @@ msgstr "Có" msgid "No" msgstr "Không" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" -msgstr "Có, Không, Có thể" +msgstr "Có,Không,Có thể" #, python-format msgid "%(size)d byte" @@ -1077,9 +1097,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d phút" -msgid "0 minutes" -msgstr "0 phút" - msgid "Forbidden" msgstr "" diff --git a/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo b/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo index 77ea0d7a94c1..9755f5fa22ad 100644 Binary files a/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_Hans/LC_MESSAGES/django.po b/django/conf/locale/zh_Hans/LC_MESSAGES/django.po index 6cfabd650535..e867840e9d9c 100644 --- a/django/conf/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_Hans/LC_MESSAGES/django.po @@ -1,14 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bai HuanCheng , 2017-2018 +# HuanCheng Bai白宦成 , 2017-2018 # Daniel Duan , 2013 # jamin M , 2019 # Jannis Leidel , 2011 # Kevin Sze , 2012 # Lele Long , 2011,2015,2017 # Le Yang , 2018 +# li beite , 2020 # Liping Wang , 2016-2017 +# matthew Yip , 2020 # mozillazg , 2016 # Ronald White , 2014 # pylemon , 2013 @@ -16,22 +18,25 @@ # slene , 2011 # Sun Liwen , 2014 # Suntravel Chris , 2019 +# Veoco , 2021 # Liping Wang , 2016 # Wentao Han , 2018 +# wolf ice , 2020 # Xiang Yu , 2014 # Jeff Yin , 2013 # Zhengyang Wang , 2017 # ced773123cfad7b4e8b79ca80f736af9, 2011-2012 # Ziya Tang , 2018 # 付峥 , 2018 +# fangjiaqi77 <370358679@qq.com>, 2020 # Kevin Sze , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-07 04:20+0000\n" +"Last-Translator: Veoco \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -46,6 +51,9 @@ msgstr "南非荷兰语" msgid "Arabic" msgstr "阿拉伯语" +msgid "Algerian Arabic" +msgstr "阿尔及利亚的阿拉伯语" + msgid "Asturian" msgstr "阿斯图里亚斯" @@ -169,6 +177,9 @@ msgstr "国际语" msgid "Indonesian" msgstr "印尼语" +msgid "Igbo" +msgstr "伊博" + msgid "Ido" msgstr "简化伊多语" @@ -199,6 +210,9 @@ msgstr "埃纳德语" msgid "Korean" msgstr "韩语" +msgid "Kyrgyz" +msgstr "吉尔吉斯坦语" + msgid "Luxembourgish" msgstr "卢森堡语" @@ -283,9 +297,15 @@ msgstr "泰米尔语" msgid "Telugu" msgstr "泰卢固语" +msgid "Tajik" +msgstr "塔吉克语" + msgid "Thai" msgstr "泰语" +msgid "Turkmen" +msgstr "土库曼人" + msgid "Turkish" msgstr "土耳其语" @@ -302,7 +322,7 @@ msgid "Urdu" msgstr "乌尔都语" msgid "Uzbek" -msgstr "" +msgstr "乌兹别克语" msgid "Vietnamese" msgstr "越南语" @@ -325,6 +345,11 @@ msgstr "静态文件" msgid "Syndication" msgstr "联合" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "页码不是整数" @@ -349,12 +374,12 @@ msgstr "输入一个有效的 Email 地址。" #. Translators: "letters" means latin letters: a-z and A-Z. msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." -msgstr "" +msgstr "输入由字母，数字，下划线或连字符号组成的有效“字段”。" msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." -msgstr "" +msgstr "输入由Unicode字母，数字，下划线或连字符号组成的有效“字段”。" msgid "Enter a valid IPv4 address." msgstr "输入一个有效的 IPv4 地址。" @@ -425,6 +450,7 @@ msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"文件扩展“%(extension)s”是不被允许。允许的扩展为：%(allowed_extensions)s。" msgid "Null characters are not allowed." msgstr "不允许是用空字符串。" @@ -465,11 +491,11 @@ msgstr "字段类型：%(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "“%(value)s”的值应该为True或False" #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "“%(value)s”的值应该为True，False或None" msgid "Boolean (Either True or False)" msgstr "布尔值( True或False )" @@ -485,13 +511,13 @@ msgstr "逗号分隔的整数" msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "" +msgstr "“%(value)s”的值有一个错误的日期格式。它的格式应该是YYYY-MM-DD" #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" +msgstr "“%(value)s”的值有正确的格式（YYYY-MM-DD）但它是一个错误的日期" msgid "Date (without time)" msgstr "日期（不带时分）" @@ -501,19 +527,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"“%(value)s”的值有一个错误的日期格式。它的格式应该是YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] " #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"“%(value)s”的值有正确的格式 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但它是一个错" +"误的日期/时间" msgid "Date (with time)" msgstr "日期（带时分）" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "“%(value)s”的值应该是一个十进制数字。" msgid "Decimal number" msgstr "小数" @@ -523,6 +553,7 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"“%(value)s”的值有一个错误的格式。它的格式应该是[DD] [[HH:]MM:]ss[.uuuuuu] " msgid "Duration" msgstr "时长" @@ -535,14 +566,14 @@ msgstr "文件路径" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "“%(value)s”的值应该是一个浮点数" msgid "Floating point number" msgstr "浮点数" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "“%(value)s”的值应该是一个整型" msgid "Integer" msgstr "整数" @@ -550,6 +581,9 @@ msgstr "整数" msgid "Big (8 byte) integer" msgstr "大整数(8字节)" +msgid "Small integer" +msgstr "小整数" + msgid "IPv4 address" msgstr "IPv4 地址" @@ -558,11 +592,14 @@ msgstr "IP 地址" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "“%(value)s”的值应该是None、True或False" msgid "Boolean (Either True, False or None)" msgstr "布尔值(True、False或None)" +msgid "Positive big integer" +msgstr "正大整数" + msgid "Positive integer" msgstr "正整数" @@ -573,9 +610,6 @@ msgstr "正小整数" msgid "Slug (up to %(max_length)s)" msgstr "Slug (多达 %(max_length)s)" -msgid "Small integer" -msgstr "小整数" - msgid "Text" msgstr "文本" @@ -583,13 +617,13 @@ msgstr "文本" msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." -msgstr "" +msgstr "“%(value)s”的值有一个错误的格式。它的格式应该是HH:MM[:ss[.uuuuuu]]" #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." -msgstr "" +msgstr "“%(value)s”的值有正确的格式(HH:MM[:ss[.uuuuuu]])，但它是一个错误的时间" msgid "Time" msgstr "时间" @@ -602,7 +636,7 @@ msgstr "原始二进制数据" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "“%(value)s”不是一个有效的UUID" msgid "Universally unique identifier" msgstr "通用唯一识别码" @@ -613,6 +647,12 @@ msgstr "文件" msgid "Image" msgstr "图像" +msgid "A JSON object" +msgstr "一个JSON对象" + +msgid "Value must be valid JSON." +msgstr "值必须是有效的JSON。" + #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "包含%(field)s %(value)r的%(model)s实例不存在。" @@ -698,6 +738,9 @@ msgstr "请输入完整的值。" msgid "Enter a valid UUID." msgstr "请输入有效UUID。" +msgid "Enter a valid JSON." +msgstr "输入一个有效的JSON。" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr ":" @@ -706,17 +749,22 @@ msgstr ":" msgid "(Hidden field %(name)s) %(error)s" msgstr "(隐藏字段 %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "管理表单的数据缺失或者已被篡改" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm 数据缺失或被篡改。缺少的字段： %(field_names)s。如果问题持续存" +"在，你可能需要提交错误报告。" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "请提交不超过 %d 个表格。" +msgid "Please submit at most %d form." +msgid_plural "Please submit at most %d forms." +msgstr[0] "请最多提交 %d 个表单。" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." +msgid "Please submit at least %d form." +msgid_plural "Please submit at least %d forms." msgstr[0] "请至少提交 %d 个表单。" msgid "Order" @@ -752,13 +800,15 @@ msgstr "选择一个有效的选项： 该选择不在可用的选项中。" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s”不是一个有效的值" #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s无法在时区%(current_timezone)s被解析；它可能是模糊的，也可能是不" +"存在的。" msgid "Clear" msgstr "清除" @@ -778,15 +828,7 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "是、否、也许" @@ -1088,9 +1130,6 @@ msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分钟" -msgid "0 minutes" -msgstr "0 分钟" - msgid "Forbidden" msgstr "禁止访问" @@ -1103,12 +1142,16 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"您看到此消息是因为此HTTPS站点要求Web浏览器发送的“Referer头”没被发送。出于安全" +"原因，此HTTP头是必需的，以确保您的浏览器不会被第三方劫持。" msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"如果您已将浏览器配置为禁用“ Referer”头，请重新启用它们，至少针对此站点，或" +"HTTPS连接或“同源”请求。" msgid "" "If you are using the tag or " @@ -1117,6 +1160,10 @@ msgid "" "If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"如果您使用的是标签或包" +"含“Referrer-Policy: no-referrer”的HTTP头，请将其删除。CSRF保护要求“Referer”头" +"执行严格的Referer检查。如果你担心隐私问题，可以使用类似这样的替代方法链接到第三方网站。" msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1130,6 +1177,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"如果您已将浏览器配置为禁用cookie，请重新启用它们，至少针对此站点或“同源”请" +"求。" msgid "More information is available with DEBUG=True." msgstr "更多可用信息请设置选项DEBUG＝True。" @@ -1163,14 +1212,14 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "日期字符串“%(datestr)s”与格式“%(format)s”不匹配" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "没有找到符合查询的 %(verbose_name)s" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "页面不是最后一页，也不能被转为整数型" #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1178,21 +1227,23 @@ msgstr "非法页面 (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "列表是空的并且“%(class_name)s.allow_empty”是False" msgid "Directory indexes are not allowed here." msgstr "这里不允许目录索引" #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "”%(path)s\"不存在" #, python-format msgid "Index of %(directory)s" msgstr "%(directory)s的索引" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django：按时交付完美主义者的 Web 框架" +msgid "The install worked successfully! Congratulations!" +msgstr "" +"安装成功！\n" +"祝贺！" #, python-format msgid "" @@ -1202,11 +1253,6 @@ msgstr "" "查看 Django %(version)s 的 release notes " -msgid "The install worked successfully! Congratulations!" -msgstr "" -"安装成功！\n" -"祝贺！" - #, python-format msgid "" "You are seeing this page because {}{}', flatatt(attrs), capfirst(label), self.form.label_suffix) + def get_admin_url(self, remote_field, remote_obj): + url_name = 'admin:%s_%s_change' % ( + remote_field.model._meta.app_label, + remote_field.model._meta.model_name, + ) + try: + url = reverse( + url_name, + args=[quote(remote_obj.pk)], + current_app=self.model_admin.admin_site.name, + ) + return format_html('{}', url, remote_obj) + except NoReverseMatch: + return str(remote_obj) + def contents(self): from django.contrib.admin.templatetags.admin_list import _boolean_icon field, obj, model_admin = self.field['field'], self.form.instance, self.model_admin @@ -214,6 +230,11 @@ def contents(self): else: if isinstance(f.remote_field, ManyToManyRel) and value is not None: result_repr = ", ".join(map(str, value.all())) + elif ( + isinstance(f.remote_field, (ForeignObjectRel, OneToOneField)) and + value is not None + ): + result_repr = self.get_admin_url(f.remote_field, value) else: result_repr = display_for_field(value, f, self.empty_value_display) result_repr = linebreaksbr(result_repr) diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/django.mo b/django/contrib/admin/locale/af/LC_MESSAGES/django.mo index 0e5afe06b21e..eb14776e9b0e 100644 Binary files a/django/contrib/admin/locale/af/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/af/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/django.po b/django/contrib/admin/locale/af/LC_MESSAGES/django.po index 1843123da5d9..f8a95ae24215 100644 --- a/django/contrib/admin/locale/af/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/af/LC_MESSAGES/django.po @@ -3,15 +3,15 @@ # Translators: # Christopher Penkin, 2012 # Christopher Penkin, 2012 -# F Wolff , 2019 +# F Wolff , 2019-2020 # Pi Delport , 2012 # Pi Delport , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-06-03 14:32+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-20 17:06+0000\n" "Last-Translator: F Wolff \n" "Language-Team: Afrikaans (http://www.transifex.com/django/django/language/" "af/)\n" @@ -72,6 +72,12 @@ msgstr "Geen datum" msgid "Has date" msgstr "Het datum" +msgid "Empty" +msgstr "Leeg" + +msgid "Not empty" +msgstr "Nie leeg nie" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -129,22 +135,22 @@ msgid "log entries" msgstr "log-inskrywingings" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "Het “%(object)s” bygevoeg." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Het “%(object)s” verander — %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Het “%(object)s” gewysig — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Het “%(object)s” verwyder." +msgid "Deleted “%(object)s.”" +msgstr "Het “%(object)s” geskrap." msgid "LogEntry Object" msgstr "LogEntry-objek" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "Het {name} “{object}” bygevoeg." msgid "Added." @@ -154,15 +160,15 @@ msgid "and" msgstr "en" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Het {fields} vir {name} “{object}” gewysig." +msgid "Changed {fields} for {name} “{object}”." +msgstr "Het {fields} vir {name} “{object}” bygevoeg." #, python-brace-format msgid "Changed {fields}." msgstr "Het {fields} verander." #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "Het {name} “{object}” geskrap." msgid "No fields changed." @@ -171,12 +177,11 @@ msgstr "Geen velde het verander nie." msgid "None" msgstr "Geen" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "Hou “Ctrl” in (of “⌘” op ’n Mac) om meer as een te kies." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "Hou “Control” in (of “Command” op ’n Mac) om meer as een te kies." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "Die {name} “{obj}” is suksesvol bygevoeg." msgid "You may edit it again below." @@ -184,35 +189,30 @@ msgstr "Dit kan weer hieronder gewysig word." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Die {name} “{obj}” is suksesvol bygevoeg. Nog ’n {name} kan onder bygevoeg " -"word." +"Die {name} “{obj}” is suksesvol bygevoeg. Voeg gerus nog ’n {name} onder by." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"Die {name} “{obj}” is suksesvol gewysig. Dit kan weer hieronder gewysig word." +"Die {name} “{obj}” is suksesvol gewysig. Redigeer dit gerus weer onder." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"Die {name} “{obj}” is suksesvol bygevoeg. Dit kan weer hieronder gewysig " -"word." +"Die {name} “{obj}” is suksesvol bygevoeg. Redigeer dit gerus weer onder." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Die {name} “{obj}” is suksesvol gewysig. Nog ’n {name} kan onder bygevoeg " -"word." +"Die {name} “{obj}” is suksesvol bygevoeg. Voeg gerus nog ’n {name} onder by." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "Die {name} “{obj}” is suksesvol gewysig." msgid "" @@ -226,12 +226,12 @@ msgid "No action selected." msgstr "Geen aksie gekies nie." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "Die %(name)s “%(obj)s” is suksesvol geskrap." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "Die %(name)s met ID “%(key)s” bestaan nie. Miskien is dit geskrap?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s met ID “%(key)s” bestaan nie. Is dit dalk geskrap?" #, python-format msgid "Add %s" @@ -301,8 +301,8 @@ msgstr "%(app)s-administrasie" msgid "Page not found" msgstr "Bladsy nie gevind nie" -msgid "We're sorry, but the requested page could not be found." -msgstr "Jammer, maar die aangevraagde bladsy kon nie gevind word nie." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Jammer! Die aangevraagde bladsy kon nie gevind word nie." msgid "Home" msgstr "Tuis" @@ -317,12 +317,11 @@ msgid "Server Error (500)" msgstr "Bedienerfout (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"’n Fout het voorgekom. Dit is per e-pos gerapporteer aan die " -"werfadministrateurs en behoort binnekort reggestel te word. Dankie vir u " -"geduld." +"’n Fout het voorgekom Dit is via e-pos aan die werfadministrateurs " +"gerapporteer en behoort binnekort reggestel te word. Dankie vir u geduld." msgid "Run the selected action" msgstr "Voer die gekose aksie uit" @@ -340,12 +339,25 @@ msgstr "Kies al %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Verwyder keuses" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelle in die %(name)s-toepassing" + +msgid "Add" +msgstr "Voeg by" + +msgid "View" +msgstr "Bekyk" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Vul eers ’n gebruikersnaam en wagwoord in. Daarna kan mens meer " -"gebruikersopsies wysig." +"Gee eerstens ’n gebruikernaam en wagwoord. Daarna kan meer gebruikervelde " +"geredigeer word." msgid "Enter a username and password." msgstr "Vul ’n gebruikersnaam en wagwoord in." @@ -388,6 +400,9 @@ msgstr "Bekyk op werf" msgid "Filter" msgstr "Filtreer" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Verwyder uit sortering" @@ -430,7 +445,7 @@ msgstr "" msgid "Objects" msgstr "Objekte" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Ja, ek is seker" msgid "No, take me back" @@ -464,9 +479,6 @@ msgstr "" "Wil u definitief die gekose %(objects_name)s skrap? Al die volgende objekte " "en hul verwante items sal geskrap word:" -msgid "View" -msgstr "Bekyk" - msgid "Delete?" msgstr "Skrap?" @@ -477,16 +489,6 @@ msgstr " Volgens %(filter_title)s " msgid "Summary" msgstr "Opsomming" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelle in die %(name)s-toepassing" - -msgid "Add" -msgstr "Voeg by" - -msgid "You don't have permission to view or edit anything." -msgstr "U het nie toestemming om enigiets te sien of te wysig nie." - msgid "Recent actions" msgstr "Onlangse aksies" @@ -500,13 +502,13 @@ msgid "Unknown content" msgstr "Onbekende inhoud" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Iets is verkeerd met die databasisinstallasie. Maak seker dat die gepaste " -"databasistabelle geskep is, en maak seker dat die databasis leesbaar is deur " -"die gepaste gebruiker." +"Iets is fout met die databasisinstallasie. Maak seker die gepaste " +"databasistabelle is geskep en maak seker die databasis is leesbaar deur die " +"gepaste gebruiker." #, python-format msgid "" @@ -519,6 +521,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Wagwoord of gebruikersnaam vergeet?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Datum/tyd" @@ -529,11 +534,11 @@ msgid "Action" msgstr "Aksie" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Hierdie item het nie ’n veranderingsgeskiedenis nie. Dit is waarskynlik nie " -"deur middel van hierdie adminwerf bygevoeg nie." +"Dié objek het nie 'n wysigingsgeskiedenis. Dit is waarskynlik nie deur dié " +"adminwerf bygevoeg nie." msgid "Show all" msgstr "Wys almal" @@ -598,11 +603,11 @@ msgid "Your password was changed." msgstr "Die wagwoord is verander." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Tik die ou wagwoord ter wille van sekuriteit, en dan die nuwe wagwoord twee " -"keer so dat ons kan seker wees dat dit korrek ingetik is." +"Gee asb. die ou wagwoord t.w.v. sekuriteit, en gee dan die nuwe wagwoord " +"twee keer sodat ons kan verifieer dat dit korrek getik is." msgid "Change my password" msgstr "Verander my wagwoord" @@ -637,19 +642,18 @@ msgstr "" "is. Vra gerus ’n nuwe een aan." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Instruksies vir die instel van u wagwoord is per e-pos gestuur as ’n " -"rekening bestaan met die e-posadres wat u gegee het. Die e-pos behoort " -"binnekort daar te wees." +"Ons het instruksies gestuur om ’n wagwoord in te stel as ’n rekening bestaan " +"met die gegewe e-posadres. Dit behoort binnekort afgelewer te word." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Indien u nie ’n e-pos ontvang nie, maak seker dat die getikte adres die een " -"is waarmee u geregistreer het, en kontroleer ook u gemorspos." +"As u geen e-pos ontvang nie, kontroleer dat die e-posadres waarmee " +"geregistreer is, gegee is, en kontroleer die gemorspos." #, python-format msgid "" @@ -662,8 +666,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Gaan asseblief na die volgende bladsy en kies ’n nuwe wagwoord:" -msgid "Your username, in case you've forgotten:" -msgstr "Jou gebruikersnaam, in geval jy vergeet het:" +msgid "Your username, in case you’ve forgotten:" +msgstr "U gebruikernaam vir ingeval u vergeet het:" msgid "Thanks for using our site!" msgstr "Dankie vir die gebruik van ons webwerf!" @@ -673,11 +677,11 @@ msgid "The %(site_name)s team" msgstr "Die %(site_name)s span" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Wagwoord vergeet? Tik u e-posadres hieronder in, en ons pos instruksies vir " -"die instel van ’n nuwe een." +"Die wagwoord vergeet? Tik u e-posadres hieronder en ons sal instruksies vir " +"die instel van ’n nuwe wagwoord stuur." msgid "Email address:" msgstr "E-posadres:" diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo index 51148aa86e7a..064ada0c78c6 100644 Binary files a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po index 80f4ce3947a5..eaa04f292af2 100644 --- a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po @@ -1,17 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bashar Al-Abdulhadi, 2015-2016,2018 +# Bashar Al-Abdulhadi, 2015-2016,2018,2020 # Bashar Al-Abdulhadi, 2014 # Eyad Toma , 2013 # Jannis Leidel , 2011 +# Muaaz Alsaied, 2020 +# Tony xD , 2020 +# صفا الفليج , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-18 00:36+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 00:40+0000\n" +"Last-Translator: Bashar Al-Abdulhadi\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,18 +25,18 @@ msgstr "" #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "تم حذف %(count)d %(items)s بنجاح." +msgstr "نجح حذف %(count)d من %(items)s." #, python-format msgid "Cannot delete %(name)s" -msgstr "لا يمكن حذف %(name)s" +msgstr "تعذّر حذف %(name)s" msgid "Are you sure?" msgstr "هل أنت متأكد؟" #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "حذف سجلات %(verbose_name_plural)s المحددة" +msgstr "احذف %(verbose_name_plural)s المحدّدة" msgid "Administration" msgstr "الإدارة" @@ -71,29 +74,35 @@ msgstr "لا يوجد أي تاريخ" msgid "Has date" msgstr "به تاريخ" +msgid "Empty" +msgstr "فارغ" + +msgid "Not empty" +msgstr "غير فارغ" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"الرجاء إدخال ال%(username)s و كلمة المرور الصحيحين لحساب الطاقم. الحقلين " -"حساسين وضعية الاحرف." +"من فضلك أدخِل قيمة %(username)s الصحيحة وكلمة السر لحساب الطاقم الإداري. " +"الحقلين حسّاسين لحالة الأحرف." msgid "Action:" -msgstr "إجراء:" +msgstr "الإجراء:" #, python-format msgid "Add another %(verbose_name)s" -msgstr "إضافة سجل %(verbose_name)s آخر" +msgstr "أضِف %(verbose_name)s آخر" msgid "Remove" -msgstr "أزل" +msgstr "أزِل" msgid "Addition" msgstr "إضافة" msgid "Change" -msgstr "عدّل" +msgstr "تعديل" msgid "Deletion" msgstr "حذف" @@ -108,134 +117,130 @@ msgid "content type" msgstr "نوع المحتوى" msgid "object id" -msgstr "معرف العنصر" +msgstr "معرّف الكائن" #. Translators: 'repr' means representation #. (https://docs.python.org/library/functions.html#repr) msgid "object repr" -msgstr "ممثل العنصر" +msgstr "التمثيل البصري للكائن" msgid "action flag" -msgstr "علامة الإجراء" +msgstr "راية الإجراء" msgid "change message" -msgstr "غيّر الرسالة" +msgstr "رسالة التغيير" msgid "log entry" -msgstr "مُدخل السجل" +msgstr "مدخلة سجلات" msgid "log entries" -msgstr "مُدخلات السجل" +msgstr "مدخلات السجلات" #, python-format -msgid "Added \"%(object)s\"." -msgstr "تم إضافة العناصر \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "أُضيف ”%(object)s“." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "تم تعديل العناصر \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "عُدّل ”%(object)s“ — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "تم حذف العناصر \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "حُذف ”%(object)s“." msgid "LogEntry Object" msgstr "كائن LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "تم إضافة {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "أُضيف {name} ‏”{object}“." msgid "Added." -msgstr "تمت الإضافة." +msgstr "أُضيف." msgid "and" msgstr "و" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "تم تغيير {fields} لـ {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "تغيّرت {fields} ‏{name} ‏”{object}“." #, python-brace-format msgid "Changed {fields}." -msgstr "تم تغيير {fields}." +msgstr "تغيّرت {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "تم حذف {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "حُذف {name} ‏”{object}“." msgid "No fields changed." -msgstr "لم يتم تغيير أية حقول." +msgstr "لم يتغيّر أي حقل." msgid "None" -msgstr "لاشيء" +msgstr "بلا" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"استمر بالضغط على مفتاح \"Control\", او \"Command\" على أجهزة الماك, لإختيار " -"أكثر من أختيار واحد." +"اضغط مفتاح ”Contrl“ (أو ”Command“ على أجهزة ماك) مطوّلًا لتحديد أكثر من عنصر." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgid "The {name} “{obj}” was added successfully." +msgstr "نجحت إضافة {name} ‏”{obj}“." msgid "You may edit it again below." -msgstr "" +msgstr "يمكنك تعديله ثانيةً أسفله." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." -msgstr "" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "نجحت إضافة {name} ‏”{obj}“. يمكنك إضافة {name} آخر أسفله." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "نجح تعديل {name} ‏”{obj}“. يمكنك تعديله ثانيةً أسفله." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "نجحت إضافة {name} ‏”{obj}“. يمكنك تعديله ثانيةً أسفله." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "" +msgstr "تمت إضافة {name} “{obj}” بنجاح، يمكنك إضافة {name} أخر بالأسفل." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgid "The {name} “{obj}” was changed successfully." +msgstr "نجحت إضافة {name} ‏”{obj}“." msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." -msgstr "يجب تحديد العناصر لتطبيق الإجراءات عليها. لم يتم تغيير أية عناصر." +msgstr "عليك تحديد العناصر لتطبيق الإجراءات عليها. لم يتغيّر أيّ عنصر." msgid "No action selected." -msgstr "لم يحدد أي إجراء." +msgstr "لا إجراء محدّد." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "نجح حذف %(name)s ‏”%(obj)s“." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "ما من %(name)s له المعرّف ”%(key)s“. لربّما حُذف أساسًا؟" #, python-format msgid "Add %s" -msgstr "أضف %s" +msgstr "إضافة %s" #, python-format msgid "Change %s" -msgstr "عدّل %s" +msgstr "تعديل %s" #, python-format msgid "View %s" -msgstr "" +msgstr "عرض %s" msgid "Database error" msgstr "خطـأ في قاعدة البيانات" @@ -301,7 +306,7 @@ msgstr "إدارة %(app)s " msgid "Page not found" msgstr "تعذر العثور على الصفحة" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "نحن آسفون، لكننا لم نعثر على الصفحة المطلوبة." msgid "Home" @@ -317,11 +322,11 @@ msgid "Server Error (500)" msgstr "خطأ في المزود (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"كان هناك خطأ. تم إعلام المسؤولين عن الموقع عبر البريد الإلكتروني وسوف يتم " -"إصلاح الخطأ قريباً. شكراً على صبركم." +"لقد حدث خطأ. تم إبلاغ مسؤولي الموقع عبر البريد الإلكتروني وسيتم إصلاحه " +"قريبًا. شكرا لصبرك." msgid "Run the selected action" msgstr "نفذ الإجراء المحدّد" @@ -339,12 +344,25 @@ msgstr "اختيار %(total_count)s %(module_name)s جميعها" msgid "Clear selection" msgstr "إزالة الاختيار" +#, python-format +msgid "Models in the %(name)s application" +msgstr "النماذج في تطبيق %(name)s" + +msgid "Add" +msgstr "أضف" + +msgid "View" +msgstr "استعراض" + +msgid "You don’t have permission to view or edit anything." +msgstr "ليست لديك الصلاحية لاستعراض أو لتعديل أي شيء." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"أولاً، أدخل اسم مستخدم وكلمة مرور. ومن ثم تستطيع تعديل المزيد من خيارات " -"المستخدم." +"أولاً ، أدخل اسم المستخدم وكلمة المرور. بعد ذلك ، ستتمكن من تعديل المزيد من " +"خيارات المستخدم." msgid "Enter a username and password." msgstr "أدخل اسم مستخدم وكلمة مرور." @@ -353,7 +371,7 @@ msgid "Change password" msgstr "غيّر كلمة المرور" msgid "Please correct the error below." -msgstr "" +msgstr "الرجاء تصحيح الأخطاء أدناه." msgid "Please correct the errors below." msgstr "الرجاء تصحيح الأخطاء أدناه." @@ -372,7 +390,7 @@ msgid "Documentation" msgstr "الوثائق" msgid "Log out" -msgstr "اخرج" +msgstr "تسجيل الخروج" #, python-format msgid "Add %(name)s" @@ -387,6 +405,9 @@ msgstr "مشاهدة على الموقع" msgid "Filter" msgstr "مرشّح" +msgid "Clear all filters" +msgstr "مسح جميع المرشحات" + msgid "Remove from sorting" msgstr "إزالة من الترتيب" @@ -428,7 +449,7 @@ msgstr "" msgid "Objects" msgstr "عناصر" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "نعم، أنا متأكد" msgid "No, take me back" @@ -462,9 +483,6 @@ msgstr "" "أأنت متأكد أنك تريد حذف عناصر %(objects_name)s المحددة؟ جميع العناصر التالية " "والعناصر المرتبطة بها سيتم حذفها:" -msgid "View" -msgstr "" - msgid "Delete?" msgstr "احذفه؟" @@ -475,16 +493,6 @@ msgstr " حسب %(filter_title)s " msgid "Summary" msgstr "ملخص" -#, python-format -msgid "Models in the %(name)s application" -msgstr "النماذج في تطبيق %(name)s" - -msgid "Add" -msgstr "أضف" - -msgid "You don't have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "آخر الإجراءات" @@ -498,7 +506,7 @@ msgid "Unknown content" msgstr "مُحتوى مجهول" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -516,6 +524,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "نسيت كلمة المرور أو اسم المستخدم الخاص بك؟" +msgid "Toggle navigation" +msgstr "تغيير التصفّح" + msgid "Date/time" msgstr "التاريخ/الوقت" @@ -526,7 +537,7 @@ msgid "Action" msgstr "إجراء" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "ليس لهذا العنصر سجلّ تغييرات، على الأغلب أنه لم يُنشأ من خلال نظام إدارة " @@ -539,7 +550,7 @@ msgid "Save" msgstr "احفظ" msgid "Popup closing…" -msgstr "" +msgstr "جاري إغلاق النافذة المنبثقة..." msgid "Search" msgstr "ابحث" @@ -568,10 +579,10 @@ msgid "Save and continue editing" msgstr "احفظ واستمر بالتعديل" msgid "Save and view" -msgstr "" +msgstr "احفظ واستعرض" msgid "Close" -msgstr "" +msgstr "إغلاق" #, python-format msgid "Change selected %(model)s" @@ -598,11 +609,11 @@ msgid "Your password was changed." msgstr "تمّ تغيير كلمة مرورك." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"رجاءً أدخل كلمة مرورك القديمة، للأمان، ثم أدخل كلمة مرور الجديدة مرتين كي " -"تتأكّد من كتابتها بشكل صحيح." +"رجاءً أدخل كلمة المرور القديمة، للأمان، ثم أدخل كلمة المرور الجديدة مرتين " +"لنتأكد بأنك قمت بإدخالها بشكل صحيح." msgid "Change my password" msgstr "غيّر كلمة مروري" @@ -635,18 +646,19 @@ msgstr "" "استعادة كلمة المرور مرة أخرى." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"تم إرسال بريد إلكتروني بالتعليمات لضبط كلمة المرور الخاصة بك, في حال تواجد " -"حساب بنفس البريد الإلكتروني الذي ادخلته. سوف تستقبل البريد الإلكتروني قريباً" +"تم إرسال بريد إلكتروني بالتعليمات لضبط كلمة المرور الخاصة بك، وذلك في حال " +"تواجد حساب بنفس البريد الإلكتروني الذي أدخلته. سوف تستقبل البريد الإلكتروني " +"قريباً" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "في حال عدم إستقبال البريد الإلكتروني، الرجاء التأكد من إدخال عنوان بريدك " -"الإلكتروني بشكل صحيح ومراجعة مجلد الرسائل غير المرغوب فيها." +"الإلكتروني الخاص بحسابك ومراجعة مجلد الرسائل غير المرغوب بها." #, python-format msgid "" @@ -659,7 +671,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "رجاءً اذهب إلى الصفحة التالية واختر كلمة مرور جديدة:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "اسم المستخدم الخاص بك، في حال كنت قد نسيته:" msgid "Thanks for using our site!" @@ -670,10 +682,10 @@ msgid "The %(site_name)s team" msgstr "فريق %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"هل فقدت كلمة المرور؟ أدخل عنوان بريدك الإلكتروني أدناه وسوف نقوم بإرسال " +"هل نسيت كلمة المرور؟ أدخل عنوان بريدك الإلكتروني أدناه وسوف نقوم بإرسال " "تعليمات للحصول على كلمة مرور جديدة." msgid "Email address:" @@ -695,7 +707,7 @@ msgstr "اختر %s لتغييره" #, python-format msgid "Select %s to view" -msgstr "" +msgstr "اختر %s للاستعراض" msgid "Date:" msgstr "التاريخ:" diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo index b6c0a802d58c..f25264b9a353 100644 Binary files a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po index 577951ff36d9..f22d6e6ef804 100644 --- a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bashar Al-Abdulhadi, 2015 +# Bashar Al-Abdulhadi, 2015,2020 # Bashar Al-Abdulhadi, 2014 # Jannis Leidel , 2011 +# Omar Lajam, 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-07-06 09:56+0000\n" +"Last-Translator: Bashar Al-Abdulhadi\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,18 +88,35 @@ msgstr "" "فسوف تخسر تعديلاتك." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"اخترت إجراءً لكن دون أن تحفظ تغييرات التي قمت بها. رجاء اضغط زر الموافقة " -"لتحفظ تعديلاتك. ستحتاج إلى إعادة تنفيذ الإجراء." +"لقد حددت إجراءً ، لكنك لم تحفظ تغييراتك في الحقول الفردية حتى الآن. يرجى " +"النقر فوق موافق للحفظ. ستحتاج إلى إعادة تشغيل الإجراء." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." -msgstr "اخترت إجراءً دون تغيير أي حقل. لعلك تريد زر التنفيذ بدلاً من زر الحفظ." +msgstr "" +"لقد حددت إجراء ، ولم تقم بإجراء أي تغييرات على الحقول الفردية. من المحتمل " +"أنك تبحث عن الزر أذهب بدلاً من الزر حفظ." + +msgid "Now" +msgstr "الآن" + +msgid "Midnight" +msgstr "منتصف الليل" + +msgid "6 a.m." +msgstr "6 ص." + +msgid "Noon" +msgstr "الظهر" + +msgid "6 p.m." +msgstr "6 مساءً" #, javascript-format msgid "Note: You are %s hour ahead of server time." @@ -120,27 +138,12 @@ msgstr[3] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخا msgstr[4] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." msgstr[5] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." -msgid "Now" -msgstr "الآن" - msgid "Choose a Time" msgstr "إختر وقت" msgid "Choose a time" msgstr "اختر وقتاً" -msgid "Midnight" -msgstr "منتصف الليل" - -msgid "6 a.m." -msgstr "6 ص." - -msgid "Noon" -msgstr "الظهر" - -msgid "6 p.m." -msgstr "6 مساءً" - msgid "Cancel" msgstr "ألغ" @@ -157,68 +160,68 @@ msgid "Tomorrow" msgstr "غداً" msgid "January" -msgstr "" +msgstr "يناير" msgid "February" -msgstr "" +msgstr "فبراير" msgid "March" -msgstr "" +msgstr "مارس" msgid "April" -msgstr "" +msgstr "أبريل" msgid "May" -msgstr "" +msgstr "مايو" msgid "June" -msgstr "" +msgstr "يونيو" msgid "July" -msgstr "" +msgstr "يوليو" msgid "August" -msgstr "" +msgstr "أغسطس" msgid "September" -msgstr "" +msgstr "سبتمبر" msgid "October" -msgstr "" +msgstr "أكتوبر" msgid "November" -msgstr "" +msgstr "نوفمبر" msgid "December" -msgstr "" +msgstr "ديسمبر" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "أحد" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "إثنين" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "ثلاثاء" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "أربعاء" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "خميس" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "جمعة" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "سبت" msgid "Show" msgstr "أظهر" diff --git a/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..af3d2aa3819a Binary files /dev/null and b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..5be946351e23 --- /dev/null +++ b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,720 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019-2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "تم حذف %(count)d %(items)s بنجاح." + +#, python-format +msgid "Cannot delete %(name)s" +msgstr "لا يمكن حذف %(name)s" + +msgid "Are you sure?" +msgstr "هل أنت متأكد؟" + +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "حذف سجلات %(verbose_name_plural)s المحددة" + +msgid "Administration" +msgstr "الإدارة" + +msgid "All" +msgstr "الكل" + +msgid "Yes" +msgstr "نعم" + +msgid "No" +msgstr "لا" + +msgid "Unknown" +msgstr "مجهول" + +msgid "Any date" +msgstr "أي تاريخ" + +msgid "Today" +msgstr "اليوم" + +msgid "Past 7 days" +msgstr "الأيام السبعة الماضية" + +msgid "This month" +msgstr "هذا الشهر" + +msgid "This year" +msgstr "هذه السنة" + +msgid "No date" +msgstr "لا يوجد أي تاريخ" + +msgid "Has date" +msgstr "به تاريخ" + +msgid "Empty" +msgstr "فارغة" + +msgid "Not empty" +msgstr "ليست فارغة" + +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" +"الرجاء إدخال ال%(username)s و كلمة المرور الصحيحين لحساب الطاقم. الحقلين " +"حساسين وضعية الاحرف." + +msgid "Action:" +msgstr "إجراء:" + +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "إضافة سجل %(verbose_name)s آخر" + +msgid "Remove" +msgstr "أزل" + +msgid "Addition" +msgstr "إضافة" + +msgid "Change" +msgstr "عدّل" + +msgid "Deletion" +msgstr "حذف" + +msgid "action time" +msgstr "وقت الإجراء" + +msgid "user" +msgstr "المستخدم" + +msgid "content type" +msgstr "نوع المحتوى" + +msgid "object id" +msgstr "معرف العنصر" + +#. Translators: 'repr' means representation +#. (https://docs.python.org/library/functions.html#repr) +msgid "object repr" +msgstr "ممثل العنصر" + +msgid "action flag" +msgstr "علامة الإجراء" + +msgid "change message" +msgstr "غيّر الرسالة" + +msgid "log entry" +msgstr "مُدخل السجل" + +msgid "log entries" +msgstr "مُدخلات السجل" + +#, python-format +msgid "Added “%(object)s”." +msgstr "تم إضافة العناصر \\\"%(object)s\\\"." + +#, python-format +msgid "Changed “%(object)s” — %(changes)s" +msgstr "تم تعديل العناصر \\\"%(object)s\\\" - %(changes)s" + +#, python-format +msgid "Deleted “%(object)s.”" +msgstr "تم حذف العناصر \\\"%(object)s.\\\"" + +msgid "LogEntry Object" +msgstr "كائن LogEntry" + +#, python-brace-format +msgid "Added {name} “{object}”." +msgstr "تم إضافة {name} \\\"{object}\\\"." + +msgid "Added." +msgstr "تمت الإضافة." + +msgid "and" +msgstr "و" + +#, python-brace-format +msgid "Changed {fields} for {name} “{object}”." +msgstr "تم تغيير {fields} لـ {name} \\\"{object}\\\"." + +#, python-brace-format +msgid "Changed {fields}." +msgstr "تم تغيير {fields}." + +#, python-brace-format +msgid "Deleted {name} “{object}”." +msgstr "تم حذف {name} \\\"{object}\\\"." + +msgid "No fields changed." +msgstr "لم يتم تغيير أية حقول." + +msgid "None" +msgstr "لاشيء" + +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "" +"استمر بالضغط على مفتاح \\\"Control\\\", او \\\"Command\\\" على أجهزة الماك, " +"لإختيار أكثر من أختيار واحد." + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully." +msgstr "تمت إضافة {name} \\\"{obj}\\\" بنجاح." + +msgid "You may edit it again below." +msgstr "يمكن تعديله مرة أخرى أدناه." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "تمت إضافة {name} \\\"{obj}\\\" بنجاح. يمكنك إضافة {name} آخر أدناه." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "تم تغيير {name} \\\"{obj}\\\" بنجاح. يمكنك تعديله مرة أخرى أدناه." + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "تمت إضافة {name} \\\"{obj}\\\" بنجاح. يمكنك تعديله مرة أخرى أدناه." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may add another {name} " +"below." +msgstr "تم تغيير {name} \\\"{obj}\\\" بنجاح. يمكنك إضافة {name} آخر أدناه." + +#, python-brace-format +msgid "The {name} “{obj}” was changed successfully." +msgstr "تم تغيير {name} \\\"{obj}\\\" بنجاح." + +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "يجب تحديد العناصر لتطبيق الإجراءات عليها. لم يتم تغيير أية عناصر." + +msgid "No action selected." +msgstr "لم يحدد أي إجراء." + +#, python-format +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "تم حذف %(name)s \\\"%(obj)s\\\" بنجاح." + +#, python-format +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s ب ID \\\"%(key)s\\\" غير موجود. ربما تم حذفه؟" + +#, python-format +msgid "Add %s" +msgstr "أضف %s" + +#, python-format +msgid "Change %s" +msgstr "عدّل %s" + +#, python-format +msgid "View %s" +msgstr "عرض %s" + +msgid "Database error" +msgstr "خطـأ في قاعدة البيانات" + +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "تم تغيير %(count)s %(name)s بنجاح." +msgstr[1] "تم تغيير %(count)s %(name)s بنجاح." +msgstr[2] "تم تغيير %(count)s %(name)s بنجاح." +msgstr[3] "تم تغيير %(count)s %(name)s بنجاح." +msgstr[4] "تم تغيير %(count)s %(name)s بنجاح." +msgstr[5] "تم تغيير %(count)s %(name)s بنجاح." + +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "تم تحديد %(total_count)s" +msgstr[1] "تم تحديد %(total_count)s" +msgstr[2] "تم تحديد %(total_count)s" +msgstr[3] "تم تحديد %(total_count)s" +msgstr[4] "تم تحديد %(total_count)s" +msgstr[5] "تم تحديد %(total_count)s" + +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "لا شيء محدد من %(cnt)s" + +#, python-format +msgid "Change history: %s" +msgstr "تاريخ التغيير: %s" + +#. Translators: Model verbose name and instance representation, +#. suitable to be an item in a list. +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" +"حذف %(class_name)s %(instance)s سيتسبب أيضاً بحذف العناصر المرتبطة التالية: " +"%(related_objects)s" + +msgid "Django site admin" +msgstr "إدارة موقع جانغو" + +msgid "Django administration" +msgstr "إدارة جانغو" + +msgid "Site administration" +msgstr "إدارة الموقع" + +msgid "Log in" +msgstr "ادخل" + +#, python-format +msgid "%(app)s administration" +msgstr "إدارة %(app)s " + +msgid "Page not found" +msgstr "تعذر العثور على الصفحة" + +msgid "We’re sorry, but the requested page could not be found." +msgstr "نحن آسفون، لكننا لم نعثر على الصفحة المطلوبة.\"" + +msgid "Home" +msgstr "الرئيسية" + +msgid "Server error" +msgstr "خطأ في المزود" + +msgid "Server error (500)" +msgstr "خطأ في المزود (500)" + +msgid "Server Error (500)" +msgstr "خطأ في المزود (500)" + +msgid "" +"There’s been an error. It’s been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"كان هناك خطأ. تم إعلام المسؤولين عن الموقع عبر البريد الإلكتروني وسوف يتم " +"إصلاح الخطأ قريباً. شكراً على صبركم." + +msgid "Run the selected action" +msgstr "نفذ الإجراء المحدّد" + +msgid "Go" +msgstr "نفّذ" + +msgid "Click here to select the objects across all pages" +msgstr "اضغط هنا لتحديد جميع العناصر في جميع الصفحات" + +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "اختيار %(total_count)s %(module_name)s جميعها" + +msgid "Clear selection" +msgstr "إزالة الاختيار" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "النماذج في تطبيق %(name)s" + +msgid "Add" +msgstr "أضف" + +msgid "View" +msgstr "عرض" + +msgid "You don’t have permission to view or edit anything." +msgstr "ليس لديك الصلاحية لعرض أو تعديل أي شيء." + +msgid "" +"First, enter a username and password. Then, you’ll be able to edit more user " +"options." +msgstr "" +"أولاً، أدخل اسم مستخدم وكلمة مرور. ومن ثم تستطيع تعديل المزيد من خيارات " +"المستخدم." + +msgid "Enter a username and password." +msgstr "أدخل اسم مستخدم وكلمة مرور." + +msgid "Change password" +msgstr "غيّر كلمة المرور" + +msgid "Please correct the error below." +msgstr "يرجى تصحيح الخطأ أدناه." + +msgid "Please correct the errors below." +msgstr "الرجاء تصحيح الأخطاء أدناه." + +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "أدخل كلمة مرور جديدة للمستخدم %(username)s." + +msgid "Welcome," +msgstr "أهلا، " + +msgid "View site" +msgstr "عرض الموقع" + +msgid "Documentation" +msgstr "الوثائق" + +msgid "Log out" +msgstr "اخرج" + +#, python-format +msgid "Add %(name)s" +msgstr "أضف %(name)s" + +msgid "History" +msgstr "تاريخ" + +msgid "View on site" +msgstr "مشاهدة على الموقع" + +msgid "Filter" +msgstr "مرشّح" + +msgid "Clear all filters" +msgstr "مسح جميع المرشحات" + +msgid "Remove from sorting" +msgstr "إزالة من الترتيب" + +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "أولوية الترتيب: %(priority_number)s" + +msgid "Toggle sorting" +msgstr "عكس الترتيب" + +msgid "Delete" +msgstr "احذف" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"حذف العنصر %(object_name)s '%(escaped_object)s' سيتسبب بحذف العناصر المرتبطة " +"به، إلا أنك لا تملك صلاحية حذف العناصر التالية:" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"حذف %(object_name)s '%(escaped_object)s' سيتسبب أيضاً بحذف العناصر المرتبطة، " +"إلا أن حسابك ليس لديه صلاحية حذف أنواع العناصر التالية:" + +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"متأكد أنك تريد حذف العنصر %(object_name)s \\\"%(escaped_object)s\\\"؟ سيتم " +"حذف جميع العناصر التالية المرتبطة به:" + +msgid "Objects" +msgstr "عناصر" + +msgid "Yes, I’m sure" +msgstr "نعم، أنا متأكد" + +msgid "No, take me back" +msgstr "لا, تراجع للخلف" + +msgid "Delete multiple objects" +msgstr "حذف عدّة عناصر" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"حذف عناصر %(objects_name)s المُحدّدة سيتسبب بحذف العناصر المرتبطة، إلا أن " +"حسابك ليس له صلاحية حذف أنواع العناصر التالية:" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"حذف عناصر %(objects_name)s المحدّدة قد يتطلب حذف العناصر المحميّة المرتبطة " +"التالية:" + +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"أأنت متأكد أنك تريد حذف عناصر %(objects_name)s المحددة؟ جميع العناصر التالية " +"والعناصر المرتبطة بها سيتم حذفها:" + +msgid "Delete?" +msgstr "احذفه؟" + +#, python-format +msgid " By %(filter_title)s " +msgstr " حسب %(filter_title)s " + +msgid "Summary" +msgstr "ملخص" + +msgid "Recent actions" +msgstr "آخر الإجراءات" + +msgid "My actions" +msgstr "إجراءاتي" + +msgid "None available" +msgstr "لا يوجد" + +msgid "Unknown content" +msgstr "مُحتوى مجهول" + +msgid "" +"Something’s wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"هنالك أمر خاطئ في تركيب قاعدة بياناتك، تأكد من أنه تم انشاء جداول قاعدة " +"البيانات الملائمة، وأن قاعدة البيانات قابلة للقراءة من قبل المستخدم الملائم." + +#, python-format +msgid "" +"You are authenticated as %(username)s, but are not authorized to access this " +"page. Would you like to login to a different account?" +msgstr "" +"أنت مسجل الدخول بإسم المستخدم %(username)s, ولكنك غير مخول للوصول لهذه " +"الصفحة. هل ترغب بتسجيل الدخول بحساب آخر؟" + +msgid "Forgotten your password or username?" +msgstr "نسيت كلمة المرور أو اسم المستخدم الخاص بك؟" + +msgid "Toggle navigation" +msgstr "" + +msgid "Date/time" +msgstr "التاريخ/الوقت" + +msgid "User" +msgstr "المستخدم" + +msgid "Action" +msgstr "إجراء" + +msgid "" +"This object doesn’t have a change history. It probably wasn’t added via this " +"admin site." +msgstr "" +"ليس لهذا العنصر سجلّ تغييرات، على الأغلب أنه لم يُنشأ من خلال نظام إدارة " +"الموقع." + +msgid "Show all" +msgstr "أظهر الكل" + +msgid "Save" +msgstr "احفظ" + +msgid "Popup closing…" +msgstr "إغلاق المنبثقة ..." + +msgid "Search" +msgstr "ابحث" + +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "%(counter)s نتيجة" +msgstr[1] "%(counter)s نتيجة" +msgstr[2] "%(counter)s نتيجة" +msgstr[3] "%(counter)s نتائج" +msgstr[4] "%(counter)s نتيجة" +msgstr[5] "%(counter)s نتيجة" + +#, python-format +msgid "%(full_result_count)s total" +msgstr "المجموع %(full_result_count)s" + +msgid "Save as new" +msgstr "احفظ كجديد" + +msgid "Save and add another" +msgstr "احفظ وأضف آخر" + +msgid "Save and continue editing" +msgstr "احفظ واستمر بالتعديل" + +msgid "Save and view" +msgstr "احفظ ثم اعرض" + +msgid "Close" +msgstr "أغلق" + +#, python-format +msgid "Change selected %(model)s" +msgstr "تغيير %(model)s المختارة" + +#, python-format +msgid "Add another %(model)s" +msgstr "أضف %(model)s آخر" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "حذف %(model)s المختارة" + +msgid "Thanks for spending some quality time with the Web site today." +msgstr "شكراً لك على قضائك بعض الوقت مع الموقع اليوم." + +msgid "Log in again" +msgstr "ادخل مجدداً" + +msgid "Password change" +msgstr "غيّر كلمة مرورك" + +msgid "Your password was changed." +msgstr "تمّ تغيير كلمة مرورك." + +msgid "" +"Please enter your old password, for security’s sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"رجاءً أدخل كلمة مرورك القديمة، للأمان، ثم أدخل كلمة مرور الجديدة مرتين كي " +"تتأكّد من كتابتها بشكل صحيح." + +msgid "Change my password" +msgstr "غيّر كلمة مروري" + +msgid "Password reset" +msgstr "استعادة كلمة المرور" + +msgid "Your password has been set. You may go ahead and log in now." +msgstr "تم تعيين كلمة مرورك. يمكن الاستمرار وتسجيل دخولك الآن." + +msgid "Password reset confirmation" +msgstr "تأكيد استعادة كلمة المرور" + +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "رجاءً أدخل كلمة مرورك الجديدة مرتين كي تتأكّد من كتابتها بشكل صحيح." + +msgid "New password:" +msgstr "كلمة المرور الجديدة:" + +msgid "Confirm password:" +msgstr "أكّد كلمة المرور:" + +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"رابط استعادة كلمة المرور غير صحيح، ربما لأنه استُخدم من قبل. رجاءً اطلب " +"استعادة كلمة المرور مرة أخرى." + +msgid "" +"We’ve emailed you instructions for setting your password, if an account " +"exists with the email you entered. You should receive them shortly." +msgstr "" +"تم إرسال بريد إلكتروني بالتعليمات لضبط كلمة المرور الخاصة بك, في حال تواجد " +"حساب بنفس البريد الإلكتروني الذي ادخلته. سوف تستقبل البريد الإلكتروني قريباً" + +msgid "" +"If you don’t receive an email, please make sure you’ve entered the address " +"you registered with, and check your spam folder." +msgstr "" +"في حال عدم إستقبال البريد الإلكتروني، الرجاء التأكد من إدخال عنوان بريدك " +"الإلكتروني بشكل صحيح ومراجعة مجلد الرسائل غير المرغوب فيها." + +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" +"لقد قمت بتلقى هذه الرسالة لطلبك بإعادة تعين كلمة المرور لحسابك الشخصي على " +"%(site_name)s." + +msgid "Please go to the following page and choose a new password:" +msgstr "رجاءً اذهب إلى الصفحة التالية واختر كلمة مرور جديدة:" + +msgid "Your username, in case you’ve forgotten:" +msgstr "اسم المستخدم الخاص بك، في حال كنت قد نسيته:" + +msgid "Thanks for using our site!" +msgstr "شكراً لاستخدامك موقعنا!" + +#, python-format +msgid "The %(site_name)s team" +msgstr "فريق %(site_name)s" + +msgid "" +"Forgotten your password? Enter your email address below, and we’ll email " +"instructions for setting a new one." +msgstr "" +"هل فقدت كلمة المرور؟ أدخل عنوان بريدك الإلكتروني أدناه وسوف نقوم بإرسال " +"تعليمات للحصول على كلمة مرور جديدة." + +msgid "Email address:" +msgstr "عنوان البريد الإلكتروني:" + +msgid "Reset my password" +msgstr "استعد كلمة مروري" + +msgid "All dates" +msgstr "كافة التواريخ" + +#, python-format +msgid "Select %s" +msgstr "اختر %s" + +#, python-format +msgid "Select %s to change" +msgstr "اختر %s لتغييره" + +#, python-format +msgid "Select %s to view" +msgstr "حدد %s للعرض" + +msgid "Date:" +msgstr "التاريخ:" + +msgid "Time:" +msgstr "الوقت:" + +msgid "Lookup" +msgstr "ابحث" + +msgid "Currently:" +msgstr "حالياً:" + +msgid "Change:" +msgstr "تغيير:" diff --git a/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.mo new file mode 100644 index 000000000000..135c8e2d1427 Binary files /dev/null and b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.po new file mode 100644 index 000000000000..3bc48c801d53 --- /dev/null +++ b/django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.po @@ -0,0 +1,226 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019-2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-06-23 12:16+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +#, javascript-format +msgid "Available %s" +msgstr "%s المتوفرة" + +#, javascript-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"هذه قائمة %s المتوفرة. يمكنك اختيار بعضها بانتقائها في الصندوق أدناه ثم " +"الضغط على سهم الـ\\\"اختيار\\\" بين الصندوقين." + +#, javascript-format +msgid "Type into this box to filter down the list of available %s." +msgstr "اكتب في هذا الصندوق لتصفية قائمة %s المتوفرة." + +msgid "Filter" +msgstr "انتقاء" + +msgid "Choose all" +msgstr "اختر الكل" + +#, javascript-format +msgid "Click to choose all %s at once." +msgstr "اضغط لاختيار جميع %s جملة واحدة." + +msgid "Choose" +msgstr "اختيار" + +msgid "Remove" +msgstr "احذف" + +#, javascript-format +msgid "Chosen %s" +msgstr "%s المختارة" + +#, javascript-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" +"هذه قائمة %s المحددة. يمكنك إزالة بعضها باختيارها في الصندوق أدناه ثم اضغط " +"على سهم الـ\\\"إزالة\\\" بين الصندوقين." + +msgid "Remove all" +msgstr "إزالة الكل" + +#, javascript-format +msgid "Click to remove all chosen %s at once." +msgstr "اضغط لإزالة جميع %s المحددة جملة واحدة." + +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "لا شي محدد" +msgstr[1] "%(sel)s من %(cnt)s محدد" +msgstr[2] "%(sel)s من %(cnt)s محدد" +msgstr[3] "%(sel)s من %(cnt)s محددة" +msgstr[4] "%(sel)s من %(cnt)s محدد" +msgstr[5] "%(sel)s من %(cnt)s محدد" + +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" +"لديك تعديلات غير محفوظة على بعض الحقول القابلة للتعديل. إن نفذت أي إجراء " +"فسوف تخسر تعديلاتك." + +msgid "" +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " +"action." +msgstr "" +"اخترت إجراءً لكن دون أن تحفظ تغييرات التي قمت بها. رجاء اضغط زر الموافقة " +"لتحفظ تعديلاتك. ستحتاج إلى إعادة تنفيذ الإجراء." + +msgid "" +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " +"button." +msgstr "اخترت إجراءً دون تغيير أي حقل. لعلك تريد زر التنفيذ بدلاً من زر الحفظ." + +msgid "Now" +msgstr "الآن" + +msgid "Midnight" +msgstr "منتصف الليل" + +msgid "6 a.m." +msgstr "6 ص." + +msgid "Noon" +msgstr "الظهر" + +msgid "6 p.m." +msgstr "6 مساء" + +#, javascript-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[1] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[2] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[3] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[4] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[5] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." + +#, javascript-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[1] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[2] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[3] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[4] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[5] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." + +msgid "Choose a Time" +msgstr "إختر وقت " + +msgid "Choose a time" +msgstr "إختر وقت " + +msgid "Cancel" +msgstr "ألغ" + +msgid "Today" +msgstr "اليوم" + +msgid "Choose a Date" +msgstr "إختر تاريخ " + +msgid "Yesterday" +msgstr "أمس" + +msgid "Tomorrow" +msgstr "غداً" + +msgid "January" +msgstr "جانفي" + +msgid "February" +msgstr "فيفري" + +msgid "March" +msgstr "مارس" + +msgid "April" +msgstr "أفريل" + +msgid "May" +msgstr "ماي" + +msgid "June" +msgstr "جوان" + +msgid "July" +msgstr "جويليه" + +msgid "August" +msgstr "أوت" + +msgid "September" +msgstr "سبتمبر" + +msgid "October" +msgstr "أكتوبر" + +msgid "November" +msgstr "نوفمبر" + +msgid "December" +msgstr "ديسمبر" + +msgctxt "one letter Sunday" +msgid "S" +msgstr "ح" + +msgctxt "one letter Monday" +msgid "M" +msgstr "ن" + +msgctxt "one letter Tuesday" +msgid "T" +msgstr "ث" + +msgctxt "one letter Wednesday" +msgid "W" +msgstr "ع" + +msgctxt "one letter Thursday" +msgid "T" +msgstr "خ" + +msgctxt "one letter Friday" +msgid "F" +msgstr "ج" + +msgctxt "one letter Saturday" +msgid "S" +msgstr "س" + +msgid "Show" +msgstr "أظهر" + +msgid "Hide" +msgstr "اخف" diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo index 557d95d4a0da..509db8d49228 100644 Binary files a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.po b/django/contrib/admin/locale/az/LC_MESSAGES/django.po index e4932f1df68a..f9644291ec7b 100644 --- a/django/contrib/admin/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/az/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-12 07:34+0000\n" -"Last-Translator: Emin Mastizada \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" @@ -71,6 +71,12 @@ msgstr "Tarixi yoxdur" msgid "Has date" msgstr "Tarixi mövcuddur" +msgid "Empty" +msgstr "Boş" + +msgid "Not empty" +msgstr "Boş deyil" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -144,7 +150,7 @@ msgstr "LogEntry obyekti" #, python-brace-format msgid "Added {name} “{object}”." -msgstr "" +msgstr "{name} “{object}” əlavə edildi." msgid "Added." msgstr "Əlavə edildi." @@ -154,7 +160,7 @@ msgstr "və" #, python-brace-format msgid "Changed {fields} for {name} “{object}”." -msgstr "" +msgstr "{name} “{object}” üçün {fields} dəyişdirildi." #, python-brace-format msgid "Changed {fields}." @@ -162,7 +168,7 @@ msgstr "{fields} dəyişdirildi." #, python-brace-format msgid "Deleted {name} “{object}”." -msgstr "" +msgstr "{name} “{object}” silindi." msgid "No fields changed." msgstr "Heç bir sahə dəyişmədi." @@ -172,10 +178,12 @@ msgstr "Heç nə" msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" +"Birdən çox seçmək üçün “Control” və ya Mac üçün “Command” düyməsini basılı " +"tutun." #, python-brace-format msgid "The {name} “{obj}” was added successfully." -msgstr "" +msgstr "{name} “{obj}” uğurla əlavə edildi." msgid "You may edit it again below." msgstr "Bunu aşağıda təkrar redaktə edə bilərsiz." @@ -184,25 +192,31 @@ msgstr "Bunu aşağıda təkrar redaktə edə bilərsiz." msgid "" "The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" +"{name} “{obj}” uğurla əlavə edildi. Aşağıdan başqa bir {name} əlavə edə " +"bilərsiz." #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" +"{name} “{obj}” uğurla dəyişdirildi. Təkrar aşağıdan dəyişdirə bilərsiz." #, python-brace-format msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" +"{name} “{obj}” uğurla əlavə edildi. Bunu təkrar aşağıdan dəyişdirə bilərsiz." #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" +"{name} “{obj}” uğurla dəyişdirildi. Aşağıdan başqa bir {name} əlavə edə " +"bilərsiz." #, python-brace-format msgid "The {name} “{obj}” was changed successfully." -msgstr "" +msgstr "{name} “{obj}” uğurla dəyişdirildi." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -216,11 +230,11 @@ msgstr "Heç bir əməliyyat seçilmədi." #, python-format msgid "The %(name)s “%(obj)s” was deleted successfully." -msgstr "" +msgstr "%(name)s “%(obj)s” uğurla silindi." #, python-format msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" -msgstr "" +msgstr "“%(key)s” ID nömrəli %(name)s mövcud deyil. Silinmiş ola bilər?" #, python-format msgid "Add %s" @@ -291,7 +305,7 @@ msgid "Page not found" msgstr "Səhifə tapılmadı" msgid "We’re sorry, but the requested page could not be found." -msgstr "" +msgstr "Üzr istəyirik, amma sorğulanan səhifə tapılmadı." msgid "Home" msgstr "Ev" @@ -326,6 +340,19 @@ msgstr "Bütün %(total_count)s sayda %(module_name)s seç" msgid "Clear selection" msgstr "Seçimi təmizlə" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s proqramındakı modellər" + +msgid "Add" +msgstr "Əlavə et" + +msgid "View" +msgstr "Gör" + +msgid "You don’t have permission to view or edit anything." +msgstr "Nəyi isə görmək və ya redaktə etmək icazəniz yoxdur." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -372,6 +399,9 @@ msgstr "Saytda göstər" msgid "Filter" msgstr "Süzgəc" +msgid "Clear all filters" +msgstr "Bütün filterləri təmizlə" + msgid "Remove from sorting" msgstr "Sıralamadan çıxar" @@ -415,7 +445,7 @@ msgid "Objects" msgstr "Obyektlər" msgid "Yes, I’m sure" -msgstr "" +msgstr "Bəli, əminəm" msgid "No, take me back" msgstr "Xeyr, məni geri götür" @@ -449,9 +479,6 @@ msgstr "" "Seçdiyiniz %(objects_name)s obyektini silməkdə əminsiniz? Aşağıdakı bütün " "obyektlər və ona bağlı digər obyektlər də silinəcək:" -msgid "View" -msgstr "Gör" - msgid "Delete?" msgstr "Silək?" @@ -462,16 +489,6 @@ msgstr " %(filter_title)s görə " msgid "Summary" msgstr "İcmal" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s proqramındakı modellər" - -msgid "Add" -msgstr "Əlavə et" - -msgid "You don’t have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "Son əməliyyatlar" @@ -501,6 +518,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Parol və ya istifadəçi adını unutmusan?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Tarix/vaxt" @@ -522,7 +542,7 @@ msgid "Save" msgstr "Yadda saxla" msgid "Popup closing…" -msgstr "" +msgstr "Qəfil pəncərə qapatılır…" msgid "Search" msgstr "Axtar" @@ -633,7 +653,7 @@ msgid "Please go to the following page and choose a new password:" msgstr "Növbəti səhifəyə keçid alın və yeni parolu seçin:" msgid "Your username, in case you’ve forgotten:" -msgstr "" +msgstr "İstifadəçi adınız, əgər unutmusunuzsa:" msgid "Thanks for using our site!" msgstr "Bizim saytdan istifadə etdiyiniz üçün təşəkkür edirik!" diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo index 32272d65ba40..b3088a5fc3dc 100644 Binary files a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po index 266153591f52..e49194db9055 100644 --- a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po @@ -2,14 +2,14 @@ # # Translators: # Ali Ismayilov , 2011-2012 -# Emin Mastizada , 2016 +# Emin Mastizada , 2016,2020 # Emin Mastizada , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-05-14 20:39+0000\n" "Last-Translator: Emin Mastizada \n" "Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" "az/)\n" @@ -83,21 +83,36 @@ msgstr "" "əməliyyatı işə salsanız, dəyişikliklər əldən gedəcək." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Əməliyyatı seçmisiniz, amma bəzi sahələrdəki dəyişiklikləri hələ yadda " -"saxlamamışıq. Bunun üçün OK seçməlisiniz. Ondan sonra əməliyyatı yenidən işə " -"salmağa cəhd edin." +"Əməliyyat seçmisiniz, amma fərdi sahələrdəki dəyişiklikləriniz hələ də yadda " +"saxlanılmayıb. Saxlamaq üçün lütfən Tamam düyməsinə klikləyin. Əməliyyatı " +"təkrar işlətməli olacaqsınız." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Siz əməliyyatı seçmisiniz və heç bir sahəyə dəyişiklik etməmisiniz. Siz " -"yəqin ki, Yadda saxla düyməsini deyil, Getdik düyməsini axtarırsınız." +"Əməliyyat seçmisiniz və fərdi sahələrdə dəyişiklər etməmisiniz. Böyük " +"ehtimal Saxla düyməsi yerinə Get düyməsinə ehtiyyacınız var." + +msgid "Now" +msgstr "İndi" + +msgid "Midnight" +msgstr "Gecə yarısı" + +msgid "6 a.m." +msgstr "6 a.m." + +msgid "Noon" +msgstr "Günorta" + +msgid "6 p.m." +msgstr "6 p.m." #, javascript-format msgid "Note: You are %s hour ahead of server time." @@ -111,27 +126,12 @@ msgid_plural "Note: You are %s hours behind server time." msgstr[0] "Diqqət: Server vaxtından %s saat geridəsiniz." msgstr[1] "Diqqət: Server vaxtından %s saat geridəsiniz." -msgid "Now" -msgstr "İndi" - msgid "Choose a Time" msgstr "Vaxt Seçin" msgid "Choose a time" msgstr "Vaxtı seçin" -msgid "Midnight" -msgstr "Gecə yarısı" - -msgid "6 a.m." -msgstr "6 a.m." - -msgid "Noon" -msgstr "Günorta" - -msgid "6 p.m." -msgstr "6 p.m." - msgid "Cancel" msgstr "Ləğv et" diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo index 2552fa0a8991..18713a0d2d9e 100644 Binary files a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.po b/django/contrib/admin/locale/be/LC_MESSAGES/django.po index 7a81c25941d2..5baf1e040f13 100644 --- a/django/contrib/admin/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/be/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Viktar Palstsiuk , 2015 -# znotdead , 2016-2017,2019 +# znotdead , 2016-2017,2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-16 19:04+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 01:22+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -71,6 +71,12 @@ msgstr "Няма даты" msgid "Has date" msgstr "Мае дату" +msgid "Empty" +msgstr "Пусты" + +msgid "Not empty" +msgstr "Не пусты" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -335,6 +341,19 @@ msgstr "Абраць усе %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Не абіраць нічога" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Мадэлі ў %(name)s праграме" + +msgid "Add" +msgstr "Дадаць" + +msgid "View" +msgstr "Праглядзець" + +msgid "You don’t have permission to view or edit anything." +msgstr "Вы ня маеце дазволу праглядаць ці нешта зьмяняць." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -383,6 +402,9 @@ msgstr "Зірнуць на пляцоўцы" msgid "Filter" msgstr "Прасеяць" +msgid "Clear all filters" +msgstr "Ачысьціць усе фільтры" + msgid "Remove from sorting" msgstr "Прыбраць з упарадкаванага" @@ -458,9 +480,6 @@ msgstr "" "Ці выдаліць абранае (%(objects_name)s)? Усе наступныя аб’екты ды зьвязаныя " "зь імі складнікі выдаляцца:" -msgid "View" -msgstr "Праглядзець" - msgid "Delete?" msgstr "Ці выдаліць?" @@ -471,16 +490,6 @@ msgstr " %(filter_title)s " msgid "Summary" msgstr "Рэзюмэ" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Мадэлі ў %(name)s праграме" - -msgid "Add" -msgstr "Дадаць" - -msgid "You don’t have permission to view or edit anything." -msgstr "Вы ня маеце дазволу праглядаць ці нешта зьмяняць." - msgid "Recent actions" msgstr "Нядаўнія дзеянні" @@ -512,6 +521,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Забыліся на імя ці пароль?" +msgid "Toggle navigation" +msgstr "Пераключыць навігацыю" + msgid "Date/time" msgstr "Час, дата" diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo index 14ff528d8aa8..d854574f7eb4 100644 Binary files a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po index 12ee1a42970d..96a4413c49d9 100644 --- a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po @@ -2,13 +2,13 @@ # # Translators: # Viktar Palstsiuk , 2015 -# znotdead , 2016 +# znotdead , 2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 18:10+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -86,16 +86,16 @@ msgstr "" "незахаванае страціцца." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Абралі дзеяньне, але не захавалі зьмены ў пэўных палях. Каб захаваць, " +"Абралі дзеяньне, але не захавалі зьмены ў пэўных палях. Каб захаваць, " "націсьніце «Добра». Дзеяньне потым трэба будзе запусьціць нанова." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Абралі дзеяньне, а ў палях нічога не зьмянялі. Мажліва, вы хацелі націснуць " @@ -189,6 +189,54 @@ msgstr "Лістапад" msgid "December" msgstr "Снежань" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Сту" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Лют" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Сак" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Кра" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Май" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Чэр" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Ліп" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Жні" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Вер" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Кас" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Ліс" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Сне" + msgctxt "one letter Sunday" msgid "S" msgstr "Н" diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo index 143965723d9f..4a04342fc20e 100644 Binary files a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po index 73bce75b06d2..767c727f2acb 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po @@ -5,15 +5,16 @@ # Claude Paroz , 2014 # Jannis Leidel , 2011 # Lyuboslav Petrov , 2014 -# Todor Lubenov , 2014-2015 +# Todor Lubenov , 2020 +# Todor Lubenov , 2014-2015 # Venelin Stoykov , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-11-17 08:33+0000\n" -"Last-Translator: Venelin Stoykov \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-06 05:54+0000\n" +"Last-Translator: Todor Lubenov \n" "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -22,6 +23,10 @@ msgstr "" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Изтриване на избраните %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно изтрити %(count)d %(items)s ." @@ -33,10 +38,6 @@ msgstr "Не можете да изтриете %(name)s" msgid "Are you sure?" msgstr "Сигурни ли сте?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Изтриване на избраните %(verbose_name_plural)s" - msgid "Administration" msgstr "Администрация" @@ -73,6 +74,12 @@ msgstr "Няма дата" msgid "Has date" msgstr "Има дата" +msgid "Empty" +msgstr "Празно" + +msgid "Not empty" +msgstr "" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -91,6 +98,15 @@ msgstr "Добави друг %(verbose_name)s" msgid "Remove" msgstr "Премахване" +msgid "Addition" +msgstr "" + +msgid "Change" +msgstr "Промени" + +msgid "Deletion" +msgstr "Изтриване" + msgid "action time" msgstr "време на действие" @@ -104,7 +120,7 @@ msgid "object id" msgstr "id на обекта" #. Translators: 'repr' means representation -#. (https://docs.python.org/3/library/functions.html#repr) +#. (https://docs.python.org/library/functions.html#repr) msgid "object repr" msgstr "repr на обекта" @@ -121,23 +137,23 @@ msgid "log entries" msgstr "записки" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Добавен \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Променени \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Изтрит \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "LogEntry обект" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Добавено {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "Добавено." @@ -146,16 +162,16 @@ msgid "and" msgstr "и" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Променени {fields} за {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "" #, python-brace-format msgid "Changed {fields}." msgstr "Променени {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Изтрит {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "Няма променени полета." @@ -163,48 +179,39 @@ msgstr "Няма променени полета." msgid "None" msgstr "Празно" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Задръжте \"Control\", или \"Command\" на Mac, за да изберете повече от един." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully." +msgstr "" + +msgid "You may edit it again below." msgstr "" -"Обектът {name} \"{obj}\" бе успешно добавен. Може да го редактирате по-" -"долу. " #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Обектът {name} \"{obj}\" бе успешно добавен. Можете да добавите още един " -"обект {name} по-долу." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "Обектът {name} \"{obj}\" бе успешно добавен. " +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"Обектът {name} \"{obj}\" бе успешно променен. Може да го редактирате по-" -"долу. " #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Обектът {name} \"{obj}\" бе успешно променен. Можете да добавите още един " -"обект {name} по-долу." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "Обектът {name} \"{obj}\" бе успешно променен." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -217,12 +224,12 @@ msgid "No action selected." msgstr "Няма избрани действия." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит. " +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s с ИД \"%(key)s\" несъществува. Може би е изтрито?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -232,6 +239,10 @@ msgstr "Добави %s" msgid "Change %s" msgstr "Промени %s" +#, python-format +msgid "View %s" +msgstr "Изглед %s" + msgid "Database error" msgstr "Грешка в базата данни" @@ -288,8 +299,8 @@ msgstr "%(app)s администрация" msgid "Page not found" msgstr "Страница не е намерена" -msgid "We're sorry, but the requested page could not be found." -msgstr "Съжалявам, но исканата страница не е намерена." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Съжаляваме, но поисканата страница не може да бъде намерена." msgid "Home" msgstr "Начало" @@ -304,11 +315,9 @@ msgid "Server Error (500)" msgstr "Сървърна грешка (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Станала е грешка. Съобщава се на администраторите на сайта по електронна " -"поща и трябва да бъде поправено скоро. Благодарим ви за търпението." msgid "Run the selected action" msgstr "Стартирай избраните действия" @@ -326,12 +335,23 @@ msgstr "Избери всички %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Изтрий избраното" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Моделите в %(name)s приложение" + +msgid "Add" +msgstr "Добави" + +msgid "View" +msgstr "Изглед" + +msgid "You don’t have permission to view or edit anything." +msgstr "Вие нямате права да разглеждате или редактирате нищо." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Първо въведете потребител и парола. След това ще можете да редактирате " -"повече детайли. " msgid "Enter a username and password." msgstr "Въведете потребителско име и парола." @@ -340,7 +360,7 @@ msgid "Change password" msgstr "Промени парола" msgid "Please correct the error below." -msgstr "Моля, поправете грешките по-долу." +msgstr "Моля коригирайте грешката долу" msgid "Please correct the errors below." msgstr "Моля поправете грешките по-долу." @@ -374,6 +394,9 @@ msgstr "Разгледай в сайта" msgid "Filter" msgstr "Филтър" +msgid "Clear all filters" +msgstr "Изчисти всички филтри" + msgid "Remove from sorting" msgstr "Премахни от подреждането" @@ -416,8 +439,8 @@ msgstr "" msgid "Objects" msgstr "Обекти" -msgid "Yes, I'm sure" -msgstr "Да, сигурен съм" +msgid "Yes, I’m sure" +msgstr "Да сигурен съм" msgid "No, take me back" msgstr "Не, върни ме обратно" @@ -450,9 +473,6 @@ msgstr "" "Наистина ли искате да изтриете избраните %(objects_name)s? Всички изброени " "обекти и свързаните с тях ще бъдат изтрити:" -msgid "Change" -msgstr "Промени" - msgid "Delete?" msgstr "Изтриване?" @@ -463,16 +483,6 @@ msgstr " По %(filter_title)s " msgid "Summary" msgstr "Резюме" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Моделите в %(name)s приложение" - -msgid "Add" -msgstr "Добави" - -msgid "You don't have permission to edit anything." -msgstr "Нямате права да редактирате каквото и да е." - msgid "Recent actions" msgstr "Последни действия" @@ -486,12 +496,10 @@ msgid "Unknown content" msgstr "Неизвестно съдържание" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Проблем с базата данни. Проверете дали необходимите таблици са създадени и " -"дали съответния потребител има необходимите права за достъп. " #, python-format msgid "" @@ -504,6 +512,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Забравена парола или потребителско име?" +msgid "Toggle navigation" +msgstr "Превключи навигацията" + msgid "Date/time" msgstr "Дата/час" @@ -514,11 +525,9 @@ msgid "Action" msgstr "Действие" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Този обект няма исторя на промените. Вероятно не е добавен чрез " -"административния панел. " msgid "Show all" msgstr "Покажи всички" @@ -526,20 +535,8 @@ msgstr "Покажи всички" msgid "Save" msgstr "Запис" -msgid "Popup closing..." -msgstr "Затваряне на изкачащ прозорец..." - -#, python-format -msgid "Change selected %(model)s" -msgstr "Променете избрания %(model)s" - -#, python-format -msgid "Add another %(model)s" -msgstr "Добавяне на друг %(model)s" - -#, python-format -msgid "Delete selected %(model)s" -msgstr "Изтриване на избрания %(model)s" +msgid "Popup closing…" +msgstr "" msgid "Search" msgstr "Търсене" @@ -563,6 +560,24 @@ msgstr "Запис и нов" msgid "Save and continue editing" msgstr "Запис и продължение" +msgid "Save and view" +msgstr "Запиши и прегледай" + +msgid "Close" +msgstr "Затвори" + +#, python-format +msgid "Change selected %(model)s" +msgstr "Променете избрания %(model)s" + +#, python-format +msgid "Add another %(model)s" +msgstr "Добавяне на друг %(model)s" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "Изтриване на избрания %(model)s" + msgid "Thanks for spending some quality time with the Web site today." msgstr "Благодарим Ви, че използвахте този сайт днес." @@ -576,11 +591,9 @@ msgid "Your password was changed." msgstr "Паролата ви е променена." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Въведете старата си парола /за сигурност/. След това въведете желаната нова " -"парола два пъти от съображения за сигурност" msgid "Change my password" msgstr "Промяна на парола" @@ -615,18 +628,14 @@ msgstr "" "използвана. Моля, поискайте нова промяна на паролата." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Ние ви пратихме мейл с инструкции за настройка на вашата парола, ако " -"съществува профил с имейла, който сте въвели. Вие трябва да ги получат скоро." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Ако не получите имейл, моля подсигурете се, че сте въвели правилно адреса с " -"който сте се регистрирал/a и/или проверете спам папката във вашата поща." #, python-format msgid "" @@ -639,8 +648,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Моля, отидете на следната страница и изберете нова парола:" -msgid "Your username, in case you've forgotten:" -msgstr "Вашето потребителско име, в случай, че сте го забравили:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Вашето потребителско име в случай че сте го забравили:" msgid "Thanks for using our site!" msgstr "Благодарим, че ползвате сайта ни!" @@ -650,11 +659,9 @@ msgid "The %(site_name)s team" msgstr "Екипът на %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Забравили сте си паролата? Въведете своя имейл адрес по-долу, а ние ще ви " -"изпратим инструкции за създаване на нова." msgid "Email address:" msgstr "E-mail адреси:" @@ -673,6 +680,10 @@ msgstr "Изберете %s" msgid "Select %s to change" msgstr "Изберете %s за промяна" +#, python-format +msgid "Select %s to view" +msgstr "Избери %s за преглед" + msgid "Date:" msgstr "Дата:" diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo index 868da26cf68b..72873a177d72 100644 Binary files a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po index 092a3d5125fc..2322313f94d3 100644 --- a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po @@ -8,14 +8,16 @@ # Gil Obradors Via , 2019 # Gil Obradors Via , 2019 # Jannis Leidel , 2011 +# Manel Clos , 2020 +# Marc Compte , 2021 # Roger Pons , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-03 20:46+0000\n" -"Last-Translator: Gil Obradors Via \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-04 21:09+0000\n" +"Last-Translator: Marc Compte \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -24,6 +26,10 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Eliminar els %(verbose_name_plural)s seleccionats" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Eliminat/s %(count)d %(items)s satisfactòriament." @@ -35,10 +41,6 @@ msgstr "No es pot esborrar %(name)s" msgid "Are you sure?" msgstr "N'esteu segur?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Eliminar els %(verbose_name_plural)s seleccionats" - msgid "Administration" msgstr "Administració" @@ -75,12 +77,18 @@ msgstr "Sense data" msgid "Has date" msgstr "Té data" +msgid "Empty" +msgstr "Buit" + +msgid "Not empty" +msgstr "No buit" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Si us plau, introduïu un %(username)s i contrasenya correcta per un compte " +"Si us plau, introduïu un %(username)s i contrasenya correctes per un compte " "de personal. Observeu que ambdós camps són sensibles a majúscules." msgid "Action:" @@ -184,34 +192,32 @@ msgid "The {name} “{obj}” was added successfully." msgstr "El {name} \"{obj}\" fou afegit amb èxit." msgid "You may edit it again below." -msgstr "Hauria d'editar de nou a sota." +msgstr "Podeu editar-lo de nou a sota." #, python-brace-format msgid "" "The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"El {name} \"{obj}\" s'ha afegit amb èxit. Pots afegir un altre {name} a " +"El {name} \"{obj}\" s'ha afegit amb èxit. Podeu afegir un altre {name} a " "sota." #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"El {name} \"{obj}\" fou canviat amb èxit. Pots editar-ho un altra vegada a " -"sota." +"El {name} \"{obj}\" fou canviat amb èxit. Podeu editar-lo de nou a sota." #, python-brace-format msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"El {name} \"{obj}\" s'ha afegit amb èxit. Pots editar-lo altra vegada a " -"sota." +"El {name} \"{obj}\" s'ha afegit amb èxit. Podeu editar-lo de nou a sota." #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"El {name} \"{obj}\" fou canviat amb èxit. Pots afegir un altre {name} a " +"El {name} \"{obj}\" fou canviat amb èxit. Podeu afegir un altre {name} a " "sota." #, python-brace-format @@ -343,6 +349,19 @@ msgstr "Seleccioneu tots %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Netejar la selecció" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Models en l'aplicació %(name)s" + +msgid "Add" +msgstr "Afegir" + +msgid "View" +msgstr "Visualitza" + +msgid "You don’t have permission to view or edit anything." +msgstr "No teniu permisos per veure o editar" + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -357,7 +376,7 @@ msgid "Change password" msgstr "Canviar contrasenya" msgid "Please correct the error below." -msgstr "Si us plau, corregeix l'error de sota" +msgstr "Si us plau, corregiu l'error de sota." msgid "Please correct the errors below." msgstr "Si us plau, corregiu els errors mostrats a sota." @@ -391,6 +410,9 @@ msgstr "Veure al lloc" msgid "Filter" msgstr "Filtre" +msgid "Clear all filters" +msgstr "Netejar tots els filtres" + msgid "Remove from sorting" msgstr "Treure de la ordenació" @@ -468,9 +490,6 @@ msgstr "" "N'esteu segur de voler esborrar els %(objects_name)s seleccionats? " "S'esborraran tots els objects següents i els seus elements relacionats:" -msgid "View" -msgstr "Visualitza" - msgid "Delete?" msgstr "Eliminar?" @@ -481,16 +500,6 @@ msgstr "Per %(filter_title)s " msgid "Summary" msgstr "Resum" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Models en l'aplicació %(name)s" - -msgid "Add" -msgstr "Afegir" - -msgid "You don’t have permission to view or edit anything." -msgstr "No teniu permisos per veure o editar" - msgid "Recent actions" msgstr "Accions recents" @@ -523,6 +532,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Heu oblidat la vostra contrasenya o nom d'usuari?" +msgid "Toggle navigation" +msgstr "Canviar mode de navegació" + msgid "Date/time" msgstr "Data/hora" @@ -578,7 +590,7 @@ msgstr "Tanca" #, python-format msgid "Change selected %(model)s" -msgstr "Canviea el %(model)s seleccionat" +msgstr "Canvieu el %(model)s seleccionat" #, python-format msgid "Add another %(model)s" @@ -702,7 +714,7 @@ msgstr "Seleccioneu %s per modificar" #, python-format msgid "Select %s to view" -msgstr "Selecciona %sper a veure" +msgstr "Selecciona %s per a veure" msgid "Date:" msgstr "Data:" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo index abaa75826ecc..3329fe2bdc8d 100644 Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po index 474d93ef25f7..be87f4a47b83 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po @@ -5,14 +5,14 @@ # Jirka Vejrazka , 2011 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2013-2014 -# Vláďa Macek , 2015-2019 +# Vláďa Macek , 2015-2020 # yedpodtrzitko , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-19 09:23+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-20 09:24+0000\n" "Last-Translator: Vláďa Macek \n" "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" @@ -73,6 +73,12 @@ msgstr "Bez data" msgid "Has date" msgstr "Má datum" +msgid "Empty" +msgstr "Prázdná hodnota" + +msgid "Not empty" +msgstr "Neprázdná hodnota" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -344,6 +350,19 @@ msgstr "Vybrat všechny položky typu %(module_name)s, celkem %(total_count)s." msgid "Clear selection" msgstr "Zrušit výběr" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modely v aplikaci %(name)s" + +msgid "Add" +msgstr "Přidat" + +msgid "View" +msgstr "Zobrazit" + +msgid "You don’t have permission to view or edit anything." +msgstr "Nemáte oprávnění k zobrazení ani úpravám." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -392,6 +411,9 @@ msgstr "Zobrazení na webu" msgid "Filter" msgstr "Filtr" +msgid "Clear all filters" +msgstr "Zrušit všechny filtry" + msgid "Remove from sorting" msgstr "Přestat řadit" @@ -469,9 +491,6 @@ msgstr "" "Opravdu má být odstraněny vybrané položky typu %(objects_name)s? Všechny " "vybrané a s nimi související položky budou odstraněny:" -msgid "View" -msgstr "Zobrazit" - msgid "Delete?" msgstr "Odstranit?" @@ -482,16 +501,6 @@ msgstr " Dle: %(filter_title)s " msgid "Summary" msgstr "Shrnutí" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modely v aplikaci %(name)s" - -msgid "Add" -msgstr "Přidat" - -msgid "You don’t have permission to view or edit anything." -msgstr "Nemáte oprávnění k zobrazení ani úpravám." - msgid "Recent actions" msgstr "Nedávné akce" @@ -524,6 +533,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Zapomněli jste heslo nebo uživatelské jméno?" +msgid "Toggle navigation" +msgstr "Přehodit navigaci" + msgid "Date/time" msgstr "Datum a čas" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo index 098d82a37126..39c441e7db9e 100644 Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po index 7785061dc26f..39d02b6136a6 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po @@ -4,13 +4,13 @@ # Jannis Leidel , 2011 # Jirka Vejrazka , 2011 # Vláďa Macek , 2012,2014 -# Vláďa Macek , 2015-2016 +# Vláďa Macek , 2015-2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 23:23+0000\n" "Last-Translator: Vláďa Macek \n" "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" @@ -88,20 +88,20 @@ msgstr "" "operaci provedete." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Byla vybrána operace, ale dosud nedošlo k uložení změn jednotlivých polí. " "Uložíte klepnutím na tlačítko OK. Pak bude třeba operaci spustit znovu." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Byla vybrána operace a jednotlivá pole nejsou změněná. Patrně hledáte " -"tlačítko Provést spíše než Uložit." +"Byla vybrána operace, ale dosud nedošlo k uložení změn jednotlivých polí. " +"Patrně využijete tlačítko Provést spíše než tlačítko Uložit." msgid "Now" msgstr "Nyní" @@ -123,7 +123,7 @@ msgid "Note: You are %s hour ahead of server time." msgid_plural "Note: You are %s hours ahead of server time." msgstr[0] "Poznámka: Váš čas o %s hodinu předstihuje čas na serveru." msgstr[1] "Poznámka: Váš čas o %s hodiny předstihuje čas na serveru." -msgstr[2] "Poznámka: Váš čas o %s hodin předstihuje čas na serveru." +msgstr[2] "Poznámka: Váš čas o %s hodiny předstihuje čas na serveru." msgstr[3] "Poznámka: Váš čas o %s hodin předstihuje čas na serveru." #, javascript-format @@ -131,7 +131,7 @@ msgid "Note: You are %s hour behind server time." msgid_plural "Note: You are %s hours behind server time." msgstr[0] "Poznámka: Váš čas se o %s hodinu zpožďuje za časem na serveru." msgstr[1] "Poznámka: Váš čas se o %s hodiny zpožďuje za časem na serveru." -msgstr[2] "Poznámka: Váš čas se o %s hodin zpožďuje za časem na serveru." +msgstr[2] "Poznámka: Váš čas se o %s hodiny zpožďuje za časem na serveru." msgstr[3] "Poznámka: Váš čas se o %s hodin zpožďuje za časem na serveru." msgid "Choose a Time" @@ -191,6 +191,54 @@ msgstr "listopad" msgid "December" msgstr "prosinec" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Led" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Úno" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Bře" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Dub" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Kvě" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Čvn" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Čvc" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Srp" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Zář" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Říj" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Lis" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Pro" + msgctxt "one letter Sunday" msgid "S" msgstr "N" diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo index ad12abba866c..985a5e5e65f1 100644 Binary files a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.po b/django/contrib/admin/locale/da/LC_MESSAGES/django.po index fecb82ed7d1a..1435a361905c 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/da/LC_MESSAGES/django.po @@ -3,7 +3,8 @@ # Translators: # Christian Joergensen , 2012 # Dimitris Glezos , 2012 -# Erik Wognsen , 2013,2015-2019 +# Erik Ramsgaard Wognsen , 2020 +# Erik Ramsgaard Wognsen , 2013,2015-2020 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 # valberg , 2014-2015 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 19:58+0000\n" -"Last-Translator: Erik Wognsen \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 08:56+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,6 +73,12 @@ msgstr "Ingen dato" msgid "Has date" msgstr "Har dato" +msgid "Empty" +msgstr "Tom" + +msgid "Not empty" +msgstr "Ikke tom" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -332,6 +339,19 @@ msgstr "Vælg alle %(total_count)s %(module_name)s " msgid "Clear selection" msgstr "Ryd valg" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeller i applikationen %(name)s" + +msgid "Add" +msgstr "Tilføj" + +msgid "View" +msgstr "Vis" + +msgid "You don’t have permission to view or edit anything." +msgstr "Du har ikke rettigheder til at se eller redigere noget." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -380,6 +400,9 @@ msgstr "Se på website" msgid "Filter" msgstr "Filtrer" +msgid "Clear all filters" +msgstr "Nulstil alle filtre" + msgid "Remove from sorting" msgstr "Fjern fra sortering" @@ -457,9 +480,6 @@ msgstr "" "Er du sikker på du vil slette de valgte %(objects_name)s? Alle de følgende " "objekter og deres relaterede emner vil blive slettet:" -msgid "View" -msgstr "Vis" - msgid "Delete?" msgstr "Slet?" @@ -470,16 +490,6 @@ msgstr " Efter %(filter_title)s " msgid "Summary" msgstr "Sammendrag" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modeller i applikationen %(name)s" - -msgid "Add" -msgstr "Tilføj" - -msgid "You don’t have permission to view or edit anything." -msgstr "Du har ikke rettigheder til at se eller redigere noget." - msgid "Recent actions" msgstr "Seneste handlinger" @@ -512,6 +522,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Har du glemt dit password eller brugernavn?" +msgid "Toggle navigation" +msgstr "Vis/skjul navigation" + msgid "Date/time" msgstr "Dato/tid" diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo index a16a583f108c..88014485495e 100644 Binary files a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po index d278b3487354..4929fd36ef30 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po @@ -2,7 +2,8 @@ # # Translators: # Christian Joergensen , 2012 -# Erik Wognsen , 2012,2015-2016 +# Erik Ramsgaard Wognsen , 2021 +# Erik Ramsgaard Wognsen , 2012,2015-2016,2020 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 # Mathias Rav , 2017 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Mathias Rav \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 18:53+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,20 +88,20 @@ msgstr "" "udfører en handling fra drop-down-menuen, vil du miste disse ændringer." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Du har valgt en handling, men du har ikke gemt dine ændringer til et eller " "flere felter. Klik venligst OK for at gemme og vælg dernæst handlingen igen." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Du har valgt en handling, og du har ikke udført nogen ændringer på felter. " -"Det, du søger er formentlig Udfør-knappen i stedet for Gem-knappen." +"Du søger formentlig Udfør-knappen i stedet for Gem-knappen." msgid "Now" msgstr "Nu" @@ -186,6 +187,54 @@ msgstr "November" msgid "December" msgstr "December" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "maj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "aug" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "dec" + msgctxt "one letter Sunday" msgid "S" msgstr "S" diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo index 270fb3a69f99..8c59438bd3fe 100644 Binary files a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.po b/django/contrib/admin/locale/de/LC_MESSAGES/django.po index 0baf5169e9f9..d62853016a83 100644 --- a/django/contrib/admin/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/de/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # André Hagenbruch, 2012 # Florian Apolloner , 2011 # Dimitris Glezos , 2012 +# Florian Apolloner , 2020 # Jannis Vajen, 2013 # Jannis Leidel , 2013-2018,2020 # Jannis Vajen, 2016 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-17 22:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-17 07:47+0000\n" +"Last-Translator: Florian Apolloner \n" "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,6 +75,12 @@ msgstr "Kein Datum" msgid "Has date" msgstr "Besitzt Datum" +msgid "Empty" +msgstr "Leer" + +msgid "Not empty" +msgstr "Nicht leer" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -252,8 +259,8 @@ msgstr "Datenbankfehler" #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s \"%(name)s\" wurde erfolgreich geändert." -msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert." +msgstr[0] "%(count)s %(name)s wurde erfolgreich geändert." +msgstr[1] "%(count)s %(name)s wurden erfolgreich geändert." #, python-format msgid "%(total_count)s selected" @@ -341,6 +348,21 @@ msgstr "Alle %(total_count)s %(module_name)s auswählen" msgid "Clear selection" msgstr "Auswahl widerrufen" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelle der %(name)s-Anwendung" + +msgid "Add" +msgstr "Hinzufügen" + +msgid "View" +msgstr "Ansehen" + +msgid "You don’t have permission to view or edit anything." +msgstr "" +"Das Benutzerkonto besitzt nicht die nötigen Rechte, um etwas anzusehen oder " +"zu ändern." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -391,6 +413,9 @@ msgstr "Auf der Website anzeigen" msgid "Filter" msgstr "Filter" +msgid "Clear all filters" +msgstr "Alle Filter zurücksetzen" + msgid "Remove from sorting" msgstr "Aus der Sortierung entfernen" @@ -410,9 +435,9 @@ msgid "" "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"Das Löschen des %(object_name)s \"%(escaped_object)s\" hätte das Löschen " -"davon abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, " -"um die folgenden davon abhängigen Daten zu löschen:" +"Das Löschen des %(object_name)s „%(escaped_object)s“ hätte das Löschen davon " +"abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, um die " +"folgenden davon abhängigen Daten zu löschen:" #, python-format msgid "" @@ -427,7 +452,7 @@ msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " +"Sind Sie sicher, dass Sie %(object_name)s „%(escaped_object)s“ löschen " "wollen? Es werden zusätzlich die folgenden davon abhängigen Daten gelöscht:" msgid "Objects" @@ -468,9 +493,6 @@ msgstr "" "Sind Sie sicher, dass Sie die ausgewählten %(objects_name)s löschen wollen? " "Alle folgenden Objekte und ihre verwandten Objekte werden gelöscht:" -msgid "View" -msgstr "Ansehen" - msgid "Delete?" msgstr "Löschen?" @@ -481,18 +503,6 @@ msgstr " Nach %(filter_title)s " msgid "Summary" msgstr "Zusammenfassung" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelle der %(name)s-Anwendung" - -msgid "Add" -msgstr "Hinzufügen" - -msgid "You don’t have permission to view or edit anything." -msgstr "" -"Das Benutzerkonto besitzt nicht die nötigen Rechte, um etwas anzusehen oder " -"zu ändern." - msgid "Recent actions" msgstr "Neueste Aktionen" @@ -525,6 +535,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Benutzername oder Passwort vergessen?" +msgid "Toggle navigation" +msgstr "Navigation ein-/ausblenden" + msgid "Date/time" msgstr "Datum/Zeit" diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo index d30346a4b338..1ae1cce48275 100644 Binary files a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po index ba4f0cb2232b..7d009f318b03 100644 --- a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po @@ -2,15 +2,17 @@ # # Translators: # André Hagenbruch, 2011-2012 +# Florian Apolloner , 2020 # Jannis Leidel , 2011,2013-2016 -# Jannis, 2016 +# Jannis Vajen, 2016 +# Markus Holtermann , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-06-16 13:07+0000\n" +"Last-Translator: Florian Apolloner \n" "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +30,7 @@ msgid "" "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" "Dies ist die Liste der verfügbaren %s. Einfach im unten stehenden Feld " -"markieren und mithilfe des \"Auswählen\"-Pfeils auswählen." +"markieren und mithilfe des „Auswählen“-Pfeils auswählen." #, javascript-format msgid "Type into this box to filter down the list of available %s." @@ -62,7 +64,7 @@ msgid "" "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" "Dies ist die Liste der ausgewählten %s. Einfach im unten stehenden Feld " -"markieren und mithilfe des \"Entfernen\"-Pfeils wieder entfernen." +"markieren und mithilfe des „Entfernen“-Pfeils wieder entfernen." msgid "Remove all" msgstr "Alle entfernen" @@ -85,22 +87,37 @@ msgstr "" "verwerfen?" msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Sie haben eine Aktion ausgewählt, aber ihre vorgenommenen Änderungen nicht " +"Sie haben eine Aktion ausgewählt, aber Ihre vorgenommenen Änderungen nicht " "gespeichert. Klicken Sie OK, um dennoch zu speichern. Danach müssen Sie die " "Aktion erneut ausführen." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Sie haben eine Aktion ausgewählt, aber keine Änderungen an bearbeitbaren " -"Feldern vorgenommen. Sie wollten wahrscheinlich auf \"Ausführen\" und nicht " -"auf \"Speichern\" klicken." +"Feldern vorgenommen. Sie wollten wahrscheinlich auf „Ausführen“ und nicht " +"auf „Speichern“ klicken." + +msgid "Now" +msgstr "Jetzt" + +msgid "Midnight" +msgstr "Mitternacht" + +msgid "6 a.m." +msgstr "6 Uhr" + +msgid "Noon" +msgstr "Mittag" + +msgid "6 p.m." +msgstr "18 Uhr" #, javascript-format msgid "Note: You are %s hour ahead of server time." @@ -114,27 +131,12 @@ msgid_plural "Note: You are %s hours behind server time." msgstr[0] "Achtung: Sie sind %s Stunde hinter der Serverzeit." msgstr[1] "Achtung: Sie sind %s Stunden hinter der Serverzeit." -msgid "Now" -msgstr "Jetzt" - msgid "Choose a Time" msgstr "Uhrzeit wählen" msgid "Choose a time" msgstr "Uhrzeit" -msgid "Midnight" -msgstr "Mitternacht" - -msgid "6 a.m." -msgstr "6 Uhr" - -msgid "Noon" -msgstr "Mittag" - -msgid "6 p.m." -msgstr "18 Uhr" - msgid "Cancel" msgstr "Abbrechen" diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo index e4a2a95501d3..03060dcdd54d 100644 Binary files a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po index af7598aa14eb..33a4adfa45d6 100644 --- a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2019 +# Michael Wolf , 2016-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 10:13+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-21 12:54+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -69,6 +69,12 @@ msgstr "Žeden datum" msgid "Has date" msgstr "Ma datum" +msgid "Empty" +msgstr "Prozny" + +msgid "Not empty" +msgstr "Njeprozny" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -126,23 +132,23 @@ msgid "log entries" msgstr "protokolowe zapiski" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "„%(object)s“ pśidane." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" msgstr "„%(object)s“ změnjone - %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" +msgid "Deleted “%(object)s.”" msgstr "„%(object)s“ wulašowane." msgid "LogEntry Object" msgstr "Objekt LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "{name} „{object} pśidany." +msgid "Added {name} “{object}”." +msgstr "{name} „{object}“ pśidany." msgid "Added." msgstr "Pśidany." @@ -151,16 +157,16 @@ msgid "and" msgstr "a" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{fields} za {name} „{object} změnjone." +msgid "Changed {fields} for {name} “{object}”." +msgstr "{fields} za {name} „{object}“ změnjone." #, python-brace-format msgid "Changed {fields}." msgstr "{fields} změnjone." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Deleted {name} „{object} wulašowane." +msgid "Deleted {name} “{object}”." +msgstr "Deleted {name} „{object}“ wulašowane." msgid "No fields changed." msgstr "Žedne póla změnjone." @@ -168,48 +174,43 @@ msgstr "Žedne póla změnjone." msgid "None" msgstr "Žeden" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "´Źaržćo „ctrl“ abo „cmd“ na Mac tłocony, aby wusej jadnogo wubrał." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" jo se wuspěšnje pśidał." +msgid "The {name} “{obj}” was added successfully." +msgstr "{name} „{obj}“ jo se wuspěšnje pśidał." msgid "You may edit it again below." msgstr "Móźośo dołojce znowego wobźěłaś." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"{name} \"{obj}\" jo se wuspěšnje pśidał. Móžośo dołojce dalšne {name} pśidaś." +"{name} „{obj}“ jo se wuspěšnje pśidał. Móžośo dołojce dalšne {name} pśidaś." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" jo se wuspěšnje změnił. Móžośo jen dołojce znowego " -"wobźěłowaś." +"{name} „{obj}“ jo se wuspěšnje změnił. Móžośo jen dołojce znowego wobźěłowaś." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" jo se wuspěšnje pśidał. Móžośo jen dołojce znowego " -"wobźěłowaś." +"{name} „{obj}“ jo se wuspěšnje pśidał. Móžośo jen dołojce znowego wobźěłowaś." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"{name} \"{obj}\" jo se wuspěšnje změnił. Móžośo dołojce dalšne {name} pśidaś." +"{name} „{obj}“ jo se wuspěšnje změnił. Móžośo dołojce dalšne {name} pśidaś." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" jo se wuspěšnje změnił." +msgid "The {name} “{obj}” was changed successfully." +msgstr "{name} „{obj}“ jo se wuspěšnje změnił." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -222,12 +223,12 @@ msgid "No action selected." msgstr "Žedna akcija wubrana." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" jo se wuspěšnje wulašował." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "%(name)s „%(obj)s“ jo se wuspěšnje wulašował." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s z ID \" %(key)s\" njeeksistěrujo. Jo se snaź wulašowało?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s z ID „%(key)s“ njeeksistěrujo. Jo se snaź wulašowało?" #, python-format msgid "Add %s" @@ -301,7 +302,7 @@ msgstr "Administracija %(app)s" msgid "Page not found" msgstr "Bok njejo se namakał" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "Jo nam luto, ale pominany bok njedajo se namakaś." msgid "Home" @@ -317,11 +318,11 @@ msgid "Server Error (500)" msgstr "Serwerowa zmólka (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "Zmólka jo nastała. Jo se sedłowym administratoram pśez e-mail k wěsći dała a " -"by dejała se skóro wótpóraś. Źěkujomse za wašu sćerpmosć." +"by dejała se skóro wótpóraś. Źěkujom se za wašu sćerpmosć." msgid "Run the selected action" msgstr "Wubranu akciju wuwjasć" @@ -339,8 +340,21 @@ msgstr "Wubjeŕśo wšykne %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Wuběrk lašowaś" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modele w nałoženju %(name)s" + +msgid "Add" +msgstr "Pśidaś" + +msgid "View" +msgstr "Pokazaś" + +msgid "You don’t have permission to view or edit anything." +msgstr "Njamaśo pšawo něco pokazaś abo wobźěłaś" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "Zapódajśo nejpjerwjej wužywarske mě a gronidło. Pótom móžośo dalšne " @@ -387,6 +401,9 @@ msgstr "Na sedle pokazaś" msgid "Filter" msgstr "Filtrowaś" +msgid "Clear all filters" +msgstr "Wšykne filtry lašowaś" + msgid "Remove from sorting" msgstr "Ze sortěrowanja wótpóraś" @@ -428,7 +445,7 @@ msgstr "" msgid "Objects" msgstr "Objekty" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Jo, som se wěsty" msgid "No, take me back" @@ -462,9 +479,6 @@ msgstr "" "Cośo napšawdu wubrany %(objects_name)s lašowaś? Wšykne slědujuce objekty a " "jich pśisłušne zapiski se wulašuju:" -msgid "View" -msgstr "Pokazaś" - msgid "Delete?" msgstr "Lašowaś?" @@ -475,16 +489,6 @@ msgstr " Pó %(filter_title)s " msgid "Summary" msgstr "Zespominanje" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modele w nałoženju %(name)s" - -msgid "Add" -msgstr "Pśidaś" - -msgid "You don't have permission to view or edit anything." -msgstr "Njamaśo pšawo něco pokazaś abo wobźěłaś" - msgid "Recent actions" msgstr "Nejnowše akcije" @@ -498,7 +502,7 @@ msgid "Unknown content" msgstr "Njeznate wopśimjeśe" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -517,6 +521,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Sćo swójo gronidło abo wužywarske mě zabył?" +msgid "Toggle navigation" +msgstr "Nawigaciju pśešaltowaś" + msgid "Date/time" msgstr "Datum/cas" @@ -527,7 +534,7 @@ msgid "Action" msgstr "Akcija" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "Toś ten objekt njama změnowu historiju. Jo se nejskerjej pśez toś to " @@ -597,7 +604,7 @@ msgid "Your password was changed." msgstr "Wašo gronidło jo se změniło." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" "Pšosym zapódajśo k swójej wěstośe swójo stare gronidło a pótom swójo nowe " @@ -636,7 +643,7 @@ msgstr "" "wužył. Pšosym pšosćo wó nowe slědkstajenje gronidła." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "Smy wam instrukcije za nastajenje wašogo gronidła pśez e-mail pósłali, jolic " @@ -644,7 +651,7 @@ msgstr "" "dostaś." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "Jolic mejlku njedostawaśo, pśeznańśo se, až sćo adresu zapódał, z kótarejuž " @@ -661,7 +668,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Pšosym źiśo k slědujucemu bokoju a wubjeŕśo nowe gronidło:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "Wašo wužywarske mě, jolic sćo jo zabył:" msgid "Thanks for using our site!" @@ -672,7 +679,7 @@ msgid "The %(site_name)s team" msgstr "Team %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" "Sćo swójo gronidło zabył? Zapódajśo dołojce swóju e-mailowu adresu a " diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.mo index 185749c4a913..c1742a695bc7 100644 Binary files a/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.po index 3dbda729bd68..bfdb386d5ddd 100644 --- a/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/dsb/LC_MESSAGES/djangojs.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016 +# Michael Wolf , 2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 00:02+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 22:10+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -86,8 +86,8 @@ msgstr "" "wuwjeźośo, se waše njeskładowane změny zgubiju." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Sćo akciju wubrał, ale njejsćo hyšći swóje změny za jadnotliwe póla " @@ -95,8 +95,8 @@ msgstr "" "wuwjasć." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Sćo akciju wubrał, ale njejsćo jadnotliwe póla změnił. Nejskerjej pytaśo " @@ -190,6 +190,54 @@ msgstr "Nowember" msgid "December" msgstr "December" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan." + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb." + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Měr." + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Apr." + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Maj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun." + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul." + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Awg." + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sep." + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Okt." + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Now." + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dec." + msgctxt "one letter Sunday" msgid "S" msgstr "Nj" diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo index 0ae1e1650972..0f888163e61a 100644 Binary files a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.po b/django/contrib/admin/locale/el/LC_MESSAGES/django.po index 1574e80751a5..ec1dc945a64f 100644 --- a/django/contrib/admin/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/el/LC_MESSAGES/django.po @@ -1,21 +1,22 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Antonis Christofides , 2021 # Dimitris Glezos , 2011 # Giannis Meletakis , 2015 # Jannis Leidel , 2011 -# Nick Mavrakis , 2017-2018 +# Nick Mavrakis , 2016-2018,2021 # Nick Mavrakis , 2016 # Pãnoș , 2014 -# Pãnoș , 2016,2019 +# Pãnoș , 2014,2016,2019-2020 # Yorgos Pagles , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-25 19:38+0000\n" -"Last-Translator: Pãnoș \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-30 03:21+0000\n" +"Last-Translator: Antonis Christofides \n" "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,6 +24,10 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "%(verbose_name_plural)s: Διαγραφή επιλεγμένων" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Επιτυχώς διεγράφησαν %(count)d %(items)s." @@ -32,11 +37,7 @@ msgid "Cannot delete %(name)s" msgstr "Αδύνατη η διαγραφή του %(name)s" msgid "Are you sure?" -msgstr "Είστε σίγουροι;" - -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Διαγραφή επιλεγμένων %(verbose_name_plural)s" +msgstr "Είστε σίγουρος;" msgid "Administration" msgstr "Διαχείριση" @@ -63,10 +64,10 @@ msgid "Past 7 days" msgstr "Τελευταίες 7 ημέρες" msgid "This month" -msgstr "Αυτόν το μήνα" +msgstr "Αυτό το μήνα" msgid "This year" -msgstr "Αυτόν το χρόνο" +msgstr "Αυτό το χρόνο" msgid "No date" msgstr "Καθόλου ημερομηνία" @@ -74,21 +75,27 @@ msgstr "Καθόλου ημερομηνία" msgid "Has date" msgstr "Έχει ημερομηνία" +msgid "Empty" +msgstr "Χωρίς τιμή" + +msgid "Not empty" +msgstr "Με τιμή" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Παρακαλώ εισάγετε το σωστό %(username)s και κωδικό για λογαριασμό " -"προσωπικού. Σημειώστε οτι και στα δύο πεδία μπορεί να έχει σημασία αν είναι " -"κεφαλαία ή μικρά. " +"Παρακαλώ δώστε το σωστό %(username)s και συνθηματικό για λογαριασμό " +"προσωπικού. Και στα δύο πεδία μπορεί να έχει σημασία η διάκριση κεφαλαίων/" +"μικρών." msgid "Action:" msgstr "Ενέργεια:" #, python-format msgid "Add another %(verbose_name)s" -msgstr "Προσθήκη και άλλου %(verbose_name)s" +msgstr "Να προστεθεί %(verbose_name)s" msgid "Remove" msgstr "Αφαίρεση" @@ -123,50 +130,50 @@ msgid "action flag" msgstr "σημαία ενέργειας" msgid "change message" -msgstr "αλλαγή μηνύματος" +msgstr "μήνυμα τροποποίησης" msgid "log entry" -msgstr "εγγραφή καταγραφής" +msgstr "καταχώριση αρχείου καταγραφής" msgid "log entries" -msgstr "εγγραφές καταγραφής" +msgstr "καταχωρίσεις αρχείου καταγραφής" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Προστέθηκαν \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "Προστέθηκε «%(object)s»." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Αλλάχθηκαν \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Τροποποιήθηκε «%(object)s» — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Διαγράφηκαν \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "Διαγράφηκε «%(object)s»." msgid "LogEntry Object" msgstr "Αντικείμενο LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Προστέθηκε {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "Προστέθηκε {name} “{object}”." msgid "Added." -msgstr "Προστέθηκε" +msgstr "Προστέθηκε." msgid "and" msgstr "και" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Αλλαγή του {fields} για {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "{name} «{object}»: Αλλαγή {fields}." #, python-brace-format msgid "Changed {fields}." -msgstr "Αλλαγή του {fields}." +msgstr "Αλλαγή {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Διαγραφή {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "Διεγράφη {name} «{object}»." msgid "No fields changed." msgstr "Δεν άλλαξε κανένα πεδίο." @@ -174,86 +181,82 @@ msgstr "Δεν άλλαξε κανένα πεδίο." msgid "None" msgstr "Κανένα" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Κρατήστε πατημένο το \"Control\", ή το \"Command\" αν έχετε Mac, για να " -"επιλέξετε παραπάνω από ένα." +"Κρατήστε πατημένο το «Control» («Command» σε Mac) για να επιλέξετε " +"περισσότερα από ένα αντικείμενα." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "Το {name} \"{obj}\" αποθηκεύτηκε με επιτυχία." +msgid "The {name} “{obj}” was added successfully." +msgstr "Προστέθηκε {name} «{obj}»." msgid "You may edit it again below." -msgstr "Μπορείτε να το επεξεργαστείτε ξανά παρακάτω." +msgstr "Μπορεί να πραγματοποιηθεί περαιτέρω επεξεργασία παρακάτω." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Το {name} \"{obj}\" προστέθηκε με επιτυχία. Μπορείτε να προσθέσετε και άλλο " -"{name} παρακάτω." +"Προστέθηκε {name} «{obj}». Μπορεί να πραγματοποιηθεί νέα πρόσθεση παρακάτω." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"Το {name} \"{obj}\" αλλάχθηκε επιτυχώς. Μπορείτε να το επεξεργαστείτε ξανά " -"παρακάτω." +"Το αντικείμενο ({name}) «{obj}» τροποποιήθηκε. Μπορεί να πραγματοποιηθεί " +"περαιτέρω επεξεργασία παρακάτω." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"Το {name} \"{obj}\" προστέθηκε με επιτυχία. Μπορείτε να το επεξεργαστείτε " -"πάλι παρακάτω." +"Προστέθηκε {name} «{obj}». Μπορεί να πραγματοποιηθεί περαιτέρω επεξεργασία " +"παρακάτω." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Το {name} \"{obj}\" αλλάχθηκε με επιτυχία. Μπορείτε να προσθέσετε και άλλο " +"Το αντικείμενο ({name}) «{obj}» τροποποιήθηκε. Μπορεί να προστεθεί επιπλέον " "{name} παρακάτω." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "Το {name} \"{obj}\" αλλάχθηκε με επιτυχία." +msgid "The {name} “{obj}” was changed successfully." +msgstr "Το αντικείμενο ({name}) «{obj}» τροποποιήθηκε." msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -"Καμμία αλλαγή δεν έχει πραγματοποιηθεί ακόμα γιατί δεν έχετε επιλέξει κανένα " -"αντικείμενο. Πρέπει να επιλέξετε ένα ή περισσότερα αντικείμενα για να " -"πραγματοποιήσετε ενέργειες σε αυτά." +"Καμία αλλαγή δεν πραγματοποιήθηκε γιατί δεν έχετε επιλέξει αντικείμενο. " +"Επιλέξτε ένα ή περισσότερα αντικείμενα για να πραγματοποιήσετε ενέργειες σ' " +"αυτά." msgid "No action selected." msgstr "Δεν έχει επιλεγεί ενέργεια." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "Διεγράφη το αντικείμενο (%(name)s) «%(obj)s»" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s με το ID \"%(key)s\" δεν υπάρχει. Μήπως διαγράφηκε;" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "Δεν υπάρχει %(name)s με ID «%(key)s». Ίσως να έχει διαγραφεί." #, python-format msgid "Add %s" -msgstr "Προσθήκη %s" +msgstr "Να προστεθεί %s" #, python-format msgid "Change %s" -msgstr "Αλλαγή του %s" +msgstr "%s: Τροποποίηση" #, python-format msgid "View %s" -msgstr "Προβολή %s" +msgstr "%s: Προβολή" msgid "Database error" -msgstr "Σφάλμα βάσεως δεδομένων" +msgstr "Σφάλμα στη βάση δεδομένων" #, python-format msgid "%(count)s %(name)s was changed successfully." @@ -269,7 +272,7 @@ msgstr[1] "Επιλέχθηκαν και τα %(total_count)s" #, python-format msgid "0 of %(cnt)s selected" -msgstr "Επιλέγησαν 0 από %(cnt)s" +msgstr "Επιλέχθηκαν 0 από %(cnt)s" #, python-format msgid "Change history: %s" @@ -286,8 +289,9 @@ msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Η διαγραφή %(class_name)s %(instance)s θα απαιτούσε την διαγραφή των " -"ακόλουθων προστατευόμενων συγγενεύων αντικειμένων: %(related_objects)s" +"Η διαγραφή του αντικειμένου (%(class_name)s) %(instance)s θα απαιτούσε τη " +"διαγραφή των παρακάτω προστατευόμενων συσχετισμένων αντικειμένων: " +"%(related_objects)s" msgid "Django site admin" msgstr "Ιστότοπος διαχείρισης Django" @@ -306,29 +310,29 @@ msgid "%(app)s administration" msgstr "Διαχείριση %(app)s" msgid "Page not found" -msgstr "Η σελίδα δε βρέθηκε" +msgstr "Η σελίδα δεν βρέθηκε" -msgid "We're sorry, but the requested page could not be found." -msgstr "Λυπόμαστε, αλλά η σελίδα που ζητήθηκε δε μπόρεσε να βρεθεί." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Λυπούμαστε, αλλά η σελίδα που ζητήθηκε δεν βρέθηκε." msgid "Home" msgstr "Αρχική" msgid "Server error" -msgstr "Σφάλμα εξυπηρετητή" +msgstr "Σφάλμα στο server" msgid "Server error (500)" -msgstr "Σφάλμα εξυπηρετητή (500)" +msgstr "Σφάλμα στο server (500)" msgid "Server Error (500)" -msgstr "Σφάλμα εξυπηρετητή (500)" +msgstr "Σφάλμα στο server (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Υπήρξε ένα σφάλμα. Έχει αναφερθεί στους διαχειριστές της σελίδας μέσω email, " -"και λογικά θα διορθωθεί αμεσα. Ευχαριστούμε για την υπομονή σας." +"Παρουσιάστηκε σφάλμα. Εστάλη στους διαχειριστές με email και πιθανότατα θα " +"διορθωθεί σύντομα. Ευχαριστούμε για την υπομονή σας." msgid "Run the selected action" msgstr "Εκτέλεση της επιλεγμένης ενέργειας" @@ -341,21 +345,33 @@ msgstr "Κάντε κλικ εδώ για να επιλέξετε τα αντι #, python-format msgid "Select all %(total_count)s %(module_name)s" -msgstr "Επιλέξτε και τα %(total_count)s %(module_name)s" +msgstr "Επιλέξτε και τα %(total_count)s αντικείμενα (%(module_name)s)" msgid "Clear selection" msgstr "Καθαρισμός επιλογής" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Μοντέλα στην εφαρμογή %(name)s" + +msgid "Add" +msgstr "Προσθήκη" + +msgid "View" +msgstr "Προβολή" + +msgid "You don’t have permission to view or edit anything." +msgstr "Δεν έχετε δικαίωμα να δείτε ή να επεξεργαστείτε κάτι." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Αρχικά εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασης. Μετά την " -"ολοκλήρωση αυτού του βήματος θα έχετε την επιλογή να προσθέσετε όλα τα " -"υπόλοιπα στοιχεία για τον χρήστη." +"Καταρχήν προσδιορίστε όνομα χρήστη και συνθηματικό. Κατόπιν θα σας δοθεί η " +"δυνατότητα να εισαγάγετε περισσότερες πληροφορίες για το χρήστη." msgid "Enter a username and password." -msgstr "Εισάγετε όνομα χρήστη και συνθηματικό." +msgstr "Προσδιορίστε όνομα χρήστη και συνθηματικό." msgid "Change password" msgstr "Αλλαγή συνθηματικού" @@ -369,14 +385,13 @@ msgstr "Παρακαλοϋμε διορθώστε τα παρακάτω λάθη #, python-format msgid "Enter a new password for the user %(username)s." msgstr "" -"Εισάγετε ένα νέο κωδικό πρόσβασης για τον χρήστη %(username)s." +"Προσδιορίστε νέο συνθηματικό για το χρήστη %(username)s." msgid "Welcome," -msgstr "Καλωσήρθατε," +msgstr "Καλώς ήρθατε," msgid "View site" -msgstr "Δες την εφαρμογή" +msgstr "Μετάβαση στην εφαρμογή" msgid "Documentation" msgstr "Τεκμηρίωση" @@ -386,7 +401,7 @@ msgstr "Αποσύνδεση" #, python-format msgid "Add %(name)s" -msgstr "Προσθήκη %(name)s" +msgstr "%(name)s: προσθήκη" msgid "History" msgstr "Ιστορικό" @@ -397,6 +412,9 @@ msgstr "Προβολή στον ιστότοπο" msgid "Filter" msgstr "Φίλτρο" +msgid "Clear all filters" +msgstr "Καθαρισμός όλων των φίλτρων" + msgid "Remove from sorting" msgstr "Αφαίρεση από την ταξινόμηση" @@ -416,36 +434,35 @@ msgid "" "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"Επιλέξατε την διαγραφή του αντικειμένου '%(escaped_object)s' είδους " -"%(object_name)s. Αυτό συνεπάγεται την διαγραφή συσχετισμένων αντικειμενων " -"για τα οποία δεν έχετε δικάιωμα διαγραφής. Τα είδη των αντικειμένων αυτών " -"είναι:" +"Επιλέξατε τη διαγραφή του αντικειμένου '%(escaped_object)s' τύπου " +"%(object_name)s. Αυτό συνεπάγεται τη διαγραφή συσχετισμένων αντικειμενων για " +"τα οποία δεν έχετε δικάιωμα διαγραφής. Οι τύποι των αντικειμένων αυτών είναι:" #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"Η διαγραφή του %(object_name)s '%(escaped_object)s' απαιτεί την διαγραφή " -"των παρακάτω προστατευμένων αντικειμένων:" +"Η διαγραφή του αντικειμένου (%(object_name)s) «%(escaped_object)s» απαιτεί " +"τη διαγραφή των παρακάτω προστατευόμενων αντικειμένων:" #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"Επιβεβαιώστε ότι επιθημείτε την διαγραφή του %(object_name)s " -"\"%(escaped_object)s\". Αν προχωρήσετε με την διαγραφή όλα τα παρακάτω " -"συσχετισμένα αντικείμενα θα διαγραφούν επίσης:" +"Επιβεβαιώστε ότι επιθυμείτε τη διαγραφή των επιλεγμένων αντικειμένων " +"(%(object_name)s \"%(escaped_object)s\"). Αν προχωρήσετε με τη διαγραφή, όλα " +"τα παρακάτω συσχετισμένα αντικείμενα θα διαγραφούν επίσης:" msgid "Objects" msgstr "Αντικείμενα" -msgid "Yes, I'm sure" -msgstr "Ναι, είμαι βέβαιος" +msgid "Yes, I’m sure" +msgstr "Ναι" msgid "No, take me back" -msgstr "Όχι, επέστρεψε με πίσω." +msgstr "Όχι" msgid "Delete multiple objects" msgstr "Διαγραφή πολλαπλών αντικειμένων" @@ -456,29 +473,26 @@ msgid "" "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Η διαγραφή των επιλεγμένων %(objects_name)s θα είχε σαν αποτέλεσμα την " -"διαγραφή συσχετισμένων αντικειμένων για τα οποία δεν έχετε το διακαίωμα " -"διαγραφής:" +"Η διαγραφή των επιλεγμένων αντικειμένων τύπου «%(objects_name)s» θα είχε " +"αποτέλεσμα τη διαγραφή των ακόλουθων συσχετισμένων αντικειμένων για τα οποία " +"δεν έχετε το διακαίωμα διαγραφής:" #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"Η διαγραφή των επιλεγμένων %(objects_name)s απαιτεί την διαγραφή των " -"παρακάτω προστατευμένων αντικειμένων:" +"Η διαγραφή των επιλεγμένων αντικειμένων τύπου «%(objects_name)s» απαιτεί τη " +"διαγραφή των παρακάτω προστατευμένων συσχετισμένων αντικειμένων:" #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -"Επιβεβαιώστε ότι επιθημείτε την διαγραφή των επιλεγμένων %(objects_name)s . " -"Αν προχωρήσετε με την διαγραφή όλα τα παρακάτω συσχετισμένα αντικείμενα θα " -"διαγραφούν επίσης:" - -msgid "View" -msgstr "Προβολή" +"Επιβεβαιώστε ότι επιθυμείτε τη διαγραφή των επιλεγμένων αντικειμένων τύπου " +"«%(objects_name)s». Αν προχωρήσετε με τη διαγραφή, όλα τα παρακάτω " +"συσχετισμένα αντικείμενα θα διαγραφούν επίσης:" msgid "Delete?" msgstr "Διαγραφή;" @@ -490,21 +504,11 @@ msgstr " Ανά %(filter_title)s " msgid "Summary" msgstr "Περίληψη" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Μοντέλα στην εφαρμογή %(name)s" - -msgid "Add" -msgstr "Προσθήκη" - -msgid "You don't have permission to view or edit anything." -msgstr "Δεν έχετε δικαίωμα να δείτε ή να επεξεργαστείτε τίποτα." - msgid "Recent actions" msgstr "Πρόσφατες ενέργειες" msgid "My actions" -msgstr "Οι ενέργειες μου" +msgstr "Οι ενέργειές μου" msgid "None available" msgstr "Κανένα διαθέσιμο" @@ -513,25 +517,28 @@ msgid "Unknown content" msgstr "Άγνωστο περιεχόμενο" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Φαίνεται να υπάρχει πρόβλημα με την εγκατάσταση της βάσης σας. Θα πρέπει να " -"βεβαιωθείτε ότι οι απαραίτητοι πίνακες έχουν δημιουργηθεί και ότι η βάση " -"είναι προσβάσιμη από τον αντίστοιχο χρήστη που έχετε δηλώσει." +"Υπάρχει κάποιο πρόβλημα στη βάση δεδομένων. Βεβαιωθείτε πως οι κατάλληλοι " +"πίνακες έχουν δημιουργηθεί και πως υπάρχουν τα κατάλληλα δικαιώματα " +"πρόσβασης." #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " "page. Would you like to login to a different account?" msgstr "" -"Επικυρωθήκατε ως %(username)s, αλλά δεν έχετε εξουσιοδότηση για αυτή την " -"σελίδα. Θέλετε να συνδεθείτε με άλλο λογαριασμό;" +"Έχετε ταυτοποιηθεί ως %(username)s, αλλά δεν έχετε δικαίωμα πρόσβασης σ' " +"αυτή τη σελίδα. Θέλετε να συνδεθείτε με άλλο λογαριασμό;" msgid "Forgotten your password or username?" msgstr "Ξεχάσατε το συνθηματικό ή το όνομα χρήστη σας;" +msgid "Toggle navigation" +msgstr "Εναλλαγή προβολής πλοήγησης" + msgid "Date/time" msgstr "Ημερομηνία/ώρα" @@ -542,11 +549,11 @@ msgid "Action" msgstr "Ενέργεια" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Δεν υπάρχει ιστορικό αλλαγών γι' αυτό το αντικείμενο. Είναι πιθανό η " -"προσθήκη του να μην πραγματοποιήθηκε χρησιμοποιώντας το διαχειριστικό." +"Αυτό το αντικείμενο δεν έχει ιστορικό αλλαγών. Πιθανότατα δεν προστέθηκε " +"μέσω του παρόντος διαχειριστικού ιστότοπου." msgid "Show all" msgstr "Εμφάνιση όλων" @@ -571,10 +578,10 @@ msgid "%(full_result_count)s total" msgstr "%(full_result_count)s συνολικά" msgid "Save as new" -msgstr "Αποθήκευση ως νέο" +msgstr "Αποθήκευση ως νέου" msgid "Save and add another" -msgstr "Αποθήκευση και προσθήκη καινούριου" +msgstr "Αποθήκευση και προσθήκη καινούργιου" msgid "Save and continue editing" msgstr "Αποθήκευση και συνέχεια επεξεργασίας" @@ -587,18 +594,18 @@ msgstr "Κλείσιμο" #, python-format msgid "Change selected %(model)s" -msgstr "Άλλαξε το επιλεγμένο %(model)s" +msgstr "Να τροποποιηθεί το επιλεγμένο αντικείμενο (%(model)s)" #, python-format msgid "Add another %(model)s" -msgstr "Πρόσθεσε άλλο ένα %(model)s" +msgstr "Να προστεθεί %(model)s" #, python-format msgid "Delete selected %(model)s" -msgstr "Διέγραψε το επιλεγμένο %(model)s" +msgstr "Να διαγραφεί το επιλεγμένο αντικείμενο (%(model)s)" msgid "Thanks for spending some quality time with the Web site today." -msgstr "Ευχαριστούμε που διαθέσατε κάποιο ποιοτικό χρόνο στον ιστότοπο σήμερα." +msgstr "Ευχαριστούμε που διαθέσατε χρόνο στον ιστότοπο." msgid "Log in again" msgstr "Επανασύνδεση" @@ -610,12 +617,11 @@ msgid "Your password was changed." msgstr "Το συνθηματικό σας αλλάχθηκε." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Παρακαλούμε εισάγετε το παλιό σας συνθηματικό, για λόγους ασφάλειας, και " -"κατόπιν εισάγετε το νέο σας συνθηματικό δύο φορές ούτως ώστε να " -"πιστοποιήσουμε ότι το πληκτρολογήσατε σωστά." +"Δώστε το παλιό σας συνθηματικό και ακολούθως το νέο σας συνθηματικό δύο " +"φορές ώστε να ελέγξουμε ότι το πληκτρολογήσατε σωστά." msgid "Change my password" msgstr "Αλλαγή του συνθηματικού μου" @@ -624,19 +630,17 @@ msgid "Password reset" msgstr "Επαναφορά συνθηματικού" msgid "Your password has been set. You may go ahead and log in now." -msgstr "" -"Ορίσατε επιτυχώς έναν κωδικό πρόσβασής. Πλέον έχετε την δυνατότητα να " -"συνδεθήτε." +msgstr "Το συνθηματικό σας ορίστηκε. Μπορείτε τώρα να συνδεθείτε." msgid "Password reset confirmation" -msgstr "Επιβεβαίωση επαναφοράς κωδικού πρόσβασης" +msgstr "Επιβεβαίωση επαναφοράς συνθηματικού" msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -"Παρακαλούμε πληκτρολογήστε το νέο κωδικό πρόσβασης δύο φορές ώστε να " -"βεβαιωθούμε ότι δεν πληκτρολογήσατε κάποιον χαρακτήρα λανθασμένα." +"Δώστε το νέο συνθηματικό σας δύο φορές ώστε να ελέγξουμε ότι το " +"πληκτρολογήσατε σωστά." msgid "New password:" msgstr "Νέο συνθηματικό:" @@ -648,61 +652,56 @@ msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"Ο σύνδεσμος που χρησιμοποιήσατε για την επαναφορά του κωδικού πρόσβασης δεν " -"είναι πλεόν διαθέσιμος. Πιθανώς έχει ήδη χρησιμοποιηθεί. Θα χρειαστεί να " -"πραγματοποιήσετε και πάλι την διαδικασία αίτησης επαναφοράς του κωδικού " -"πρόσβασης." +"Ο σύνδεσμος που χρησιμοποιήσατε για την επαναφορά του συνθηματικού δεν είναι " +"σωστός, ίσως γιατί έχει ήδη χρησιμοποιηθεί. Πραγματοποιήστε εξαρχής τη " +"διαδικασία αίτησης επαναφοράς του συνθηματικού." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Σας έχουμε αποστείλει οδηγίες σχετικά με τον ορισμό του κωδικού σας, αν " -"υπάρχει ήδη κάποιος λογαριασμός με την διεύθυνση ηλεκτρονικού ταχυδρομείου " -"που δηλώσατε. Θα λάβετε τις οδηγίες σύντομα." +"Σας στείλαμε email με οδηγίες ορισμού συνθηματικού. Θα πρέπει να το λάβετε " +"σύντομα." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Εάν δεν λάβετε email, παρακαλούμε σιγουρευτείτε οτί έχετε εισάγει την " -"διεύθυνση με την οποία έχετε εγγραφεί, και ελέγξτε τον φάκελο με τα " -"ανεπιθύμητα." +"Εάν δεν λάβετε email, παρακαλούμε σιγουρευτείτε ότι έχετε εισαγάγει τη " +"διεύθυνση με την οποία έχετε εγγραφεί, και ελέγξτε το φάκελο ανεπιθύμητης " +"αλληλογραφίας." #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -"Λαμβάνετε αυτό το email επειδή ζητήσατε επαναφορά κωδικού για τον λογαριασμό " -"σας στο %(site_name)s." +"Λαμβάνετε αυτό το email επειδή ζητήσατε επαναφορά συνθηματικού για το " +"λογαριασμό σας στον ιστότοπο %(site_name)s." msgid "Please go to the following page and choose a new password:" msgstr "" -"Παρακαλούμε επισκεφθήτε την ακόλουθη σελίδα και επιλέξτε ένα νέο κωδικό " -"πρόσβασης: " +"Παρακαλούμε επισκεφθείτε την ακόλουθη σελίδα και επιλέξτε νέο συνθηματικό: " -msgid "Your username, in case you've forgotten:" -msgstr "" -"Το όνομα χρήστη με το οποίο είστε καταχωρημένος για την περίπτωση στην οποία " -"το έχετε ξεχάσει:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Το όνομα χρήστη, σε περίπτωση που δεν το θυμάστε:" msgid "Thanks for using our site!" -msgstr "Ευχαριστούμε που χρησιμοποιήσατε τον ιστότοπο μας!" +msgstr "Ευχαριστούμε που χρησιμοποιήσατε τον ιστότοπό μας!" #, python-format msgid "The %(site_name)s team" -msgstr "Η ομάδα του %(site_name)s" +msgstr "Η ομάδα του ιστότοπου %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Ξεχάσατε τον κωδικό σας; Εισάγετε το email σας παρακάτω, και θα σας " -"αποστείλουμε οδηγίες για να ρυθμίσετε εναν καινούργιο." +"Ξεχάσατε το συνθηματικό σας; Εισαγάγετε το email σας και θα σας στείλουμε " +"οδηγίες για να ορίσετε καινούργιο." msgid "Email address:" -msgstr "Ηλεκτρονική διεύθυνση:" +msgstr "Διεύθυνση email:" msgid "Reset my password" msgstr "Επαναφορά του συνθηματικού μου" @@ -712,15 +711,15 @@ msgstr "Όλες οι ημερομηνίες" #, python-format msgid "Select %s" -msgstr "Επιλέξτε %s" +msgstr "Επιλέξτε αντικείμενο (%s)" #, python-format msgid "Select %s to change" -msgstr "Επιλέξτε %s προς αλλαγή" +msgstr "Επιλέξτε αντικείμενο (%s) προς αλλαγή" #, python-format msgid "Select %s to view" -msgstr "Επιλέξτε %s για προβολή" +msgstr "Επιλέξτε αντικείμενο (%s) για προβολή" msgid "Date:" msgstr "Ημ/νία:" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 15d30ebfe431..d5dc5e564e00 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -14,80 +14,80 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: contrib/admin/actions.py:41 +#: contrib/admin/actions.py:16 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "" + +#: contrib/admin/actions.py:46 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: contrib/admin/actions.py:50 contrib/admin/options.py:1883 +#: contrib/admin/actions.py:55 contrib/admin/options.py:1886 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: contrib/admin/actions.py:52 contrib/admin/options.py:1885 +#: contrib/admin/actions.py:57 contrib/admin/options.py:1888 msgid "Are you sure?" msgstr "" -#: contrib/admin/actions.py:79 -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "" - -#: contrib/admin/apps.py:12 +#: contrib/admin/apps.py:13 msgid "Administration" msgstr "" #: contrib/admin/filters.py:108 contrib/admin/filters.py:213 -#: contrib/admin/filters.py:248 contrib/admin/filters.py:282 -#: contrib/admin/filters.py:401 contrib/admin/filters.py:466 +#: contrib/admin/filters.py:249 contrib/admin/filters.py:284 +#: contrib/admin/filters.py:403 contrib/admin/filters.py:468 msgid "All" msgstr "" -#: contrib/admin/filters.py:249 +#: contrib/admin/filters.py:250 msgid "Yes" msgstr "" -#: contrib/admin/filters.py:250 +#: contrib/admin/filters.py:251 msgid "No" msgstr "" -#: contrib/admin/filters.py:260 +#: contrib/admin/filters.py:262 msgid "Unknown" msgstr "" -#: contrib/admin/filters.py:330 +#: contrib/admin/filters.py:332 msgid "Any date" msgstr "" -#: contrib/admin/filters.py:331 +#: contrib/admin/filters.py:333 msgid "Today" msgstr "" -#: contrib/admin/filters.py:335 +#: contrib/admin/filters.py:337 msgid "Past 7 days" msgstr "" -#: contrib/admin/filters.py:339 +#: contrib/admin/filters.py:341 msgid "This month" msgstr "" -#: contrib/admin/filters.py:343 +#: contrib/admin/filters.py:345 msgid "This year" msgstr "" -#: contrib/admin/filters.py:351 +#: contrib/admin/filters.py:353 msgid "No date" msgstr "" -#: contrib/admin/filters.py:352 +#: contrib/admin/filters.py:354 msgid "Has date" msgstr "" -#: contrib/admin/filters.py:467 +#: contrib/admin/filters.py:469 msgid "Empty" msgstr "" -#: contrib/admin/filters.py:468 +#: contrib/admin/filters.py:470 msgid "Not empty" msgstr "" @@ -98,16 +98,16 @@ msgid "" "that both fields may be case-sensitive." msgstr "" -#: contrib/admin/helpers.py:21 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: contrib/admin/helpers.py:312 +#: contrib/admin/helpers.py:329 #, python-format msgid "Add another %(verbose_name)s" msgstr "" -#: contrib/admin/helpers.py:315 +#: contrib/admin/helpers.py:332 msgid "Remove" msgstr "" @@ -191,7 +191,7 @@ msgstr "" msgid "Added." msgstr "" -#: contrib/admin/models.py:117 contrib/admin/options.py:2109 +#: contrib/admin/models.py:117 contrib/admin/options.py:2112 msgid "and" msgstr "" @@ -214,148 +214,148 @@ msgstr "" msgid "No fields changed." msgstr "" -#: contrib/admin/options.py:201 contrib/admin/options.py:233 +#: contrib/admin/options.py:203 contrib/admin/options.py:235 msgid "None" msgstr "" -#: contrib/admin/options.py:279 +#: contrib/admin/options.py:281 msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -#: contrib/admin/options.py:1217 contrib/admin/options.py:1241 +#: contrib/admin/options.py:1221 contrib/admin/options.py:1245 #, python-brace-format msgid "The {name} “{obj}” was added successfully." msgstr "" -#: contrib/admin/options.py:1219 +#: contrib/admin/options.py:1223 msgid "You may edit it again below." msgstr "" -#: contrib/admin/options.py:1231 +#: contrib/admin/options.py:1235 #, python-brace-format msgid "" "The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -#: contrib/admin/options.py:1281 +#: contrib/admin/options.py:1285 #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -#: contrib/admin/options.py:1291 +#: contrib/admin/options.py:1295 #, python-brace-format msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -#: contrib/admin/options.py:1304 +#: contrib/admin/options.py:1308 #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -#: contrib/admin/options.py:1316 +#: contrib/admin/options.py:1320 #, python-brace-format msgid "The {name} “{obj}” was changed successfully." msgstr "" -#: contrib/admin/options.py:1393 contrib/admin/options.py:1725 +#: contrib/admin/options.py:1397 contrib/admin/options.py:1727 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: contrib/admin/options.py:1412 +#: contrib/admin/options.py:1416 msgid "No action selected." msgstr "" -#: contrib/admin/options.py:1437 +#: contrib/admin/options.py:1441 #, python-format msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "" -#: contrib/admin/options.py:1523 +#: contrib/admin/options.py:1527 #, python-format msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -#: contrib/admin/options.py:1618 +#: contrib/admin/options.py:1622 #, python-format msgid "Add %s" msgstr "" -#: contrib/admin/options.py:1620 +#: contrib/admin/options.py:1624 #, python-format msgid "Change %s" msgstr "" -#: contrib/admin/options.py:1622 +#: contrib/admin/options.py:1626 #, python-format msgid "View %s" msgstr "" -#: contrib/admin/options.py:1703 +#: contrib/admin/options.py:1705 msgid "Database error" msgstr "" -#: contrib/admin/options.py:1772 +#: contrib/admin/options.py:1774 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: contrib/admin/options.py:1803 +#: contrib/admin/options.py:1805 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: contrib/admin/options.py:1811 +#: contrib/admin/options.py:1813 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: contrib/admin/options.py:1928 +#: contrib/admin/options.py:1932 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, #. suitable to be an item in a list. -#: contrib/admin/options.py:2102 +#: contrib/admin/options.py:2105 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: contrib/admin/options.py:2111 +#: contrib/admin/options.py:2114 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: contrib/admin/sites.py:42 contrib/admin/templates/admin/base_site.html:3 +#: contrib/admin/sites.py:47 contrib/admin/templates/admin/base_site.html:3 msgid "Django site admin" msgstr "" -#: contrib/admin/sites.py:45 contrib/admin/templates/admin/base_site.html:6 +#: contrib/admin/sites.py:50 contrib/admin/templates/admin/base_site.html:6 msgid "Django administration" msgstr "" -#: contrib/admin/sites.py:48 +#: contrib/admin/sites.py:53 msgid "Site administration" msgstr "" -#: contrib/admin/sites.py:395 contrib/admin/templates/admin/login.html:63 -#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/sites.py:399 contrib/admin/templates/admin/login.html:63 +#: contrib/admin/templates/registration/password_reset_complete.html:15 #: contrib/admin/tests.py:135 msgid "Log in" msgstr "" -#: contrib/admin/sites.py:524 +#: contrib/admin/sites.py:544 #, python-format msgid "%(app)s administration" msgstr "" @@ -371,8 +371,8 @@ msgstr "" #: contrib/admin/templates/admin/500.html:6 #: contrib/admin/templates/admin/app_index.html:9 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/base.html:64 +#: contrib/admin/templates/admin/auth/user/change_password.html:10 +#: contrib/admin/templates/admin/base.html:65 #: contrib/admin/templates/admin/change_form.html:18 #: contrib/admin/templates/admin/change_list.html:31 #: contrib/admin/templates/admin/delete_confirmation.html:14 @@ -458,50 +458,50 @@ msgstr "" msgid "Enter a username and password." msgstr "" -#: contrib/admin/templates/admin/auth/user/change_password.html:17 -#: contrib/admin/templates/admin/auth/user/change_password.html:55 -#: contrib/admin/templates/admin/base.html:52 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:52 +#: contrib/admin/templates/admin/base.html:53 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:4 msgid "Change password" msgstr "" -#: contrib/admin/templates/admin/auth/user/change_password.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:25 #: contrib/admin/templates/admin/change_form.html:43 #: contrib/admin/templates/admin/change_list.html:51 #: contrib/admin/templates/admin/login.html:23 -#: contrib/admin/templates/registration/password_change_form.html:21 +#: contrib/admin/templates/registration/password_change_form.html:18 msgid "Please correct the error below." msgstr "" -#: contrib/admin/templates/admin/auth/user/change_password.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:25 #: contrib/admin/templates/admin/change_form.html:43 #: contrib/admin/templates/admin/change_list.html:51 #: contrib/admin/templates/admin/login.html:23 -#: contrib/admin/templates/registration/password_change_form.html:21 +#: contrib/admin/templates/registration/password_change_form.html:18 msgid "Please correct the errors below." msgstr "" -#: contrib/admin/templates/admin/auth/user/change_password.html:32 +#: contrib/admin/templates/admin/auth/user/change_password.html:29 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "" -#: contrib/admin/templates/admin/base.html:38 +#: contrib/admin/templates/admin/base.html:39 msgid "Welcome," msgstr "" -#: contrib/admin/templates/admin/base.html:43 +#: contrib/admin/templates/admin/base.html:44 msgid "View site" msgstr "" -#: contrib/admin/templates/admin/base.html:48 +#: contrib/admin/templates/admin/base.html:49 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "" -#: contrib/admin/templates/admin/base.html:54 +#: contrib/admin/templates/admin/base.html:55 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" @@ -524,11 +524,11 @@ msgstr "" msgid "View on site" msgstr "" -#: contrib/admin/templates/admin/change_list.html:62 +#: contrib/admin/templates/admin/change_list.html:76 msgid "Filter" msgstr "" -#: contrib/admin/templates/admin/change_list.html:64 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Clear all filters" msgstr "" @@ -661,6 +661,10 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" +#: contrib/admin/templates/admin/nav_sidebar.html:2 +msgid "Toggle navigation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" @@ -757,18 +761,18 @@ msgstr "" msgid "Password change" msgstr "" -#: contrib/admin/templates/registration/password_change_done.html:14 +#: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." msgstr "" -#: contrib/admin/templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:23 msgid "" "Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: contrib/admin/templates/registration/password_change_form.html:54 -#: contrib/admin/templates/registration/password_reset_confirm.html:32 +#: contrib/admin/templates/registration/password_change_form.html:51 +#: contrib/admin/templates/registration/password_reset_confirm.html:31 msgid "Change my password" msgstr "" @@ -778,7 +782,7 @@ msgstr "" msgid "Password reset" msgstr "" -#: contrib/admin/templates/registration/password_reset_complete.html:16 +#: contrib/admin/templates/registration/password_reset_complete.html:13 msgid "Your password has been set. You may go ahead and log in now." msgstr "" @@ -786,33 +790,33 @@ msgstr "" msgid "Password reset confirmation" msgstr "" -#: contrib/admin/templates/registration/password_reset_confirm.html:18 +#: contrib/admin/templates/registration/password_reset_confirm.html:16 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: contrib/admin/templates/registration/password_reset_confirm.html:24 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "New password:" msgstr "" -#: contrib/admin/templates/registration/password_reset_confirm.html:29 +#: contrib/admin/templates/registration/password_reset_confirm.html:28 msgid "Confirm password:" msgstr "" -#: contrib/admin/templates/registration/password_reset_confirm.html:38 +#: contrib/admin/templates/registration/password_reset_confirm.html:37 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: contrib/admin/templates/registration/password_reset_done.html:15 +#: contrib/admin/templates/registration/password_reset_done.html:13 msgid "" "We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -#: contrib/admin/templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." @@ -842,35 +846,35 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:16 +#: contrib/admin/templates/registration/password_reset_form.html:14 msgid "" "Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:22 +#: contrib/admin/templates/registration/password_reset_form.html:20 msgid "Email address:" msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:25 +#: contrib/admin/templates/registration/password_reset_form.html:23 msgid "Reset my password" msgstr "" -#: contrib/admin/templatetags/admin_list.py:423 +#: contrib/admin/templatetags/admin_list.py:390 msgid "All dates" msgstr "" -#: contrib/admin/views/main.py:100 +#: contrib/admin/views/main.py:102 #, python-format msgid "Select %s" msgstr "" -#: contrib/admin/views/main.py:102 +#: contrib/admin/views/main.py:104 #, python-format msgid "Select %s to change" msgstr "" -#: contrib/admin/views/main.py:104 +#: contrib/admin/views/main.py:106 #, python-format msgid "Select %s to view" msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po index ed5ee8d920ee..bca964aa4348 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -72,30 +72,26 @@ msgstr "" msgid "Click to remove all chosen %s at once." msgstr "" -#: contrib/admin/static/admin/js/actions.js:49 -#: contrib/admin/static/admin/js/actions.min.js:2 +#: contrib/admin/static/admin/js/actions.js:64 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: contrib/admin/static/admin/js/actions.js:118 -#: contrib/admin/static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:130 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: contrib/admin/static/admin/js/actions.js:130 -#: contrib/admin/static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:143 msgid "" "You have selected an action, but you haven’t saved your changes to " "individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -#: contrib/admin/static/admin/js/actions.js:132 -#: contrib/admin/static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:144 msgid "" "You have selected an action, and you haven’t made any changes on individual " "fields. You’re probably looking for the Go button rather than the Save " @@ -103,7 +99,7 @@ msgid "" msgstr "" #: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:13 -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:113 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:111 msgid "Now" msgstr "" @@ -123,47 +119,47 @@ msgstr "" msgid "6 p.m." msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:80 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:78 #, javascript-format msgid "Note: You are %s hour ahead of server time." msgid_plural "Note: You are %s hours ahead of server time." msgstr[0] "" msgstr[1] "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:86 #, javascript-format msgid "Note: You are %s hour behind server time." msgid_plural "Note: You are %s hours behind server time." msgstr[0] "" msgstr[1] "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:131 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:129 msgid "Choose a Time" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:161 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:159 msgid "Choose a time" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:178 -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:336 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:176 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:334 msgid "Cancel" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:241 -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:321 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:239 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:319 msgid "Today" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:258 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:256 msgid "Choose a Date" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:315 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:313 msgid "Yesterday" msgstr "" -#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:327 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:325 msgid "Tomorrow" msgstr "" @@ -216,48 +212,105 @@ msgid "December" msgstr "" #: contrib/admin/static/admin/js/calendar.js:25 +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:26 +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:27 +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:28 +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:29 +msgctxt "abbrev. month May" +msgid "May" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:30 +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:31 +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:32 +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:33 +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:34 +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:35 +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:36 +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:39 msgctxt "one letter Sunday" msgid "S" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:26 +#: contrib/admin/static/admin/js/calendar.js:40 msgctxt "one letter Monday" msgid "M" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:27 +#: contrib/admin/static/admin/js/calendar.js:41 msgctxt "one letter Tuesday" msgid "T" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:28 +#: contrib/admin/static/admin/js/calendar.js:42 msgctxt "one letter Wednesday" msgid "W" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:29 +#: contrib/admin/static/admin/js/calendar.js:43 msgctxt "one letter Thursday" msgid "T" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:30 +#: contrib/admin/static/admin/js/calendar.js:44 msgctxt "one letter Friday" msgid "F" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:31 +#: contrib/admin/static/admin/js/calendar.js:45 msgctxt "one letter Saturday" msgid "S" msgstr "" #: contrib/admin/static/admin/js/collapse.js:16 #: contrib/admin/static/admin/js/collapse.js:34 -#: contrib/admin/static/admin/js/collapse.min.js:1 -#: contrib/admin/static/admin/js/collapse.min.js:2 msgid "Show" msgstr "" #: contrib/admin/static/admin/js/collapse.js:30 -#: contrib/admin/static/admin/js/collapse.min.js:2 msgid "Hide" msgstr "" diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo index b61dbe6af2a3..b9a3fd95be53 100644 Binary files a/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/django.po b/django/contrib/admin/locale/eo/LC_MESSAGES/django.po index ffab5e1e580d..5a74272df0de 100644 --- a/django/contrib/admin/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/eo/LC_MESSAGES/django.po @@ -1,20 +1,21 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Baptiste Darthenay , 2012-2013 -# Baptiste Darthenay , 2013-2019 +# Batist D 🐍 , 2012-2013 +# Batist D 🐍 , 2013-2019 # Claude Paroz , 2016 # Dinu Gherman , 2011 # kristjan , 2012 +# Matthieu Desplantes , 2021 # Nikolay Korotkiy , 2017 # Adamo Mesha , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-18 12:48+0000\n" -"Last-Translator: Baptiste Darthenay \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-13 08:23+0000\n" +"Last-Translator: Matthieu Desplantes \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -23,6 +24,10 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Forigi elektitajn %(verbose_name_plural)sn" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sukcese forigis %(count)d %(items)s." @@ -34,10 +39,6 @@ msgstr "Ne povas forigi %(name)s" msgid "Are you sure?" msgstr "Ĉu vi certas?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Forigi elektitajn %(verbose_name_plural)sn" - msgid "Administration" msgstr "Administrado" @@ -74,6 +75,12 @@ msgstr "Neniu dato" msgid "Has date" msgstr "Havas daton" +msgid "Empty" +msgstr "Malplena" + +msgid "Not empty" +msgstr "Ne malplena" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -131,23 +138,23 @@ msgid "log entries" msgstr "protokoleroj" #, python-format -msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" aldonita." +msgid "Added “%(object)s”." +msgstr "Aldonis “%(object)s”" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Ŝanĝita \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Forigita \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "Protokolera objekto" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Aldonita {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "Aldonita." @@ -156,16 +163,16 @@ msgid "and" msgstr "kaj" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Ŝanĝita {fields} por {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "" #, python-brace-format msgid "Changed {fields}." msgstr "Ŝanĝita {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Forigita {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "Neniu kampo ŝanĝita." @@ -173,50 +180,39 @@ msgstr "Neniu kampo ŝanĝita." msgid "None" msgstr "Neniu" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Premadu la stirklavon, aŭ Komando-klavon ĉe Mac, por elekti pli ol unu." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "La {name} \"{obj}\" estis aldonita sukcese." +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "Eblas redakti ĝin sube." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"La {name} \"{obj}\" estis sukcese aldonita. Vi povas sube aldoni alian {name}" -"n." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"La {name} \"{obj}\" estis sukcese ŝanĝita. Vi povas sube redakti ĝin denove." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"La {name} \"{obj}\" estis aldonita sukcese. Vi rajtas ĝin redakti denove " -"sube." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"La {name} \"{obj}\" estis sukcese ŝanĝita. Vi povas sube aldoni alian {name}" -"n." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "La {name} \"{obj}\" estis ŝanĝita sukcese." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -229,12 +225,12 @@ msgid "No action selected." msgstr "Neniu ago elektita." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "La %(name)s \"%(obj)s\" estis forigita sukcese." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s kun ID \"%(key)s\" ne ekzistas. Eble tio estis forigita?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -304,8 +300,8 @@ msgstr "%(app)s administrado" msgid "Page not found" msgstr "Paĝo ne trovita" -msgid "We're sorry, but the requested page could not be found." -msgstr "Bedaŭrinde la petitan paĝon ne povas esti trovita." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Bedaŭrinde la petita paĝo ne estis trovita." msgid "Home" msgstr "Ĉefpaĝo" @@ -320,11 +316,9 @@ msgid "Server Error (500)" msgstr "Servila eraro (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Okazis eraro. Ĝi estis raportita al la retejaj administrantoj tra retpoŝto " -"kaj baldaŭ devus esti riparita. Dankon por via pacienco." msgid "Run the selected action" msgstr "Lanĉi la elektita agon" @@ -342,12 +336,23 @@ msgstr "Elekti ĉiuj %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Viŝi elekton" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeloj en la %(name)s aplikaĵo" + +msgid "Add" +msgstr "Aldoni" + +msgid "View" +msgstr "Vidi" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Unue, bovolu tajpi salutnomon kaj pasvorton. Tiam, vi povos redakti pli da " -"uzantaj agordoj." msgid "Enter a username and password." msgstr "Enigu salutnomon kaj pasvorton." @@ -390,6 +395,9 @@ msgstr "Vidi sur retejo" msgid "Filter" msgstr "Filtri" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Forigi el ordigado" @@ -432,7 +440,7 @@ msgstr "" msgid "Objects" msgstr "Objektoj" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Jes, mi certas" msgid "No, take me back" @@ -466,9 +474,6 @@ msgstr "" "Ĉu vi certas, ke vi volas forigi la elektitajn %(objects_name)s? Ĉiuj el la " "sekvaj objektoj kaj iliaj rilataj eroj estos forigita:" -msgid "View" -msgstr "Vidi" - msgid "Delete?" msgstr "Forviŝi?" @@ -479,16 +484,6 @@ msgstr " Laŭ %(filter_title)s " msgid "Summary" msgstr "Resumo" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modeloj en la %(name)s aplikaĵo" - -msgid "Add" -msgstr "Aldoni" - -msgid "You don't have permission to view or edit anything." -msgstr "Vi havas nenian permeson por vidi aŭ redakti." - msgid "Recent actions" msgstr "Lastaj agoj" @@ -502,13 +497,10 @@ msgid "Unknown content" msgstr "Nekonata enhavo" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Io malbonas en via datumbaza instalo. Bonvolu certigi ke la konvenaj tabeloj " -"de datumbazo estis kreitaj, kaj ke la datumbazo estas legebla per la ĝusta " -"uzanto." #, python-format msgid "" @@ -521,6 +513,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Ĉu vi forgesis vian pasvorton aŭ salutnomo?" +msgid "Toggle navigation" +msgstr "Ŝalti navigadon" + msgid "Date/time" msgstr "Dato/horo" @@ -531,11 +526,11 @@ msgid "Action" msgstr "Ago" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Ĉi tiu objekto ne havas ŝanĝ-historion. Eble ĝi ne estis aldonita per la " -"administranta retejo." +"Ĉi tiu objekto ne havas historion de ŝanĝoj. Ĝi verŝajne ne estis aldonita " +"per ĉi tiu administrejo." msgid "Show all" msgstr "Montri ĉion" @@ -599,11 +594,11 @@ msgid "Your password was changed." msgstr "Via pasvorto estis sukcese ŝanĝita." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Bonvolu enigi vian malnovan pasvorton, pro sekureco, kaj tiam enigi vian " -"novan pasvorton dufoje, tiel ni povas konfirmi ke vi ĝuste tajpis ĝin." +"Bonvolu entajpi vian malnovan pasvorton pro sekureco, kaj entajpi vian novan " +"pasvorton dufoje, por ke ni estu certaj, ke vi tajpis ĝin ĝuste." msgid "Change my password" msgstr "Ŝanĝi mian passvorton" @@ -615,7 +610,7 @@ msgid "Your password has been set. You may go ahead and log in now." msgstr "Via pasvorto estis ŝanĝita. Vi povas iri antaŭen kaj ensaluti nun." msgid "Password reset confirmation" -msgstr "Pasvorta rekomenciga konfirmo" +msgstr "Konfirmo de restarigo de pasvorto" msgid "" "Please enter your new password twice so we can verify you typed it in " @@ -634,23 +629,22 @@ msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"La pasvorta rekomenciga ligo malvalidis, eble ĉar ĝi jam estis uzata. " -"Bonvolu peti novan pasvortan rekomencigon." +"La ligilo por restarigi pasvorton estis malvalida, eble ĉar ĝi jam estis " +"uzita. Bonvolu denove peti restarigon de pasvorto." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Ni retpoŝte sendis al vi instrukciojn por agordi la pasvorton, se la " -"koncerna konto ekzistas, al la retpoŝta adreso kiun vi sendis. Vi baldaŭ " -"devus ĝin ricevi." +"Ni sendis al vi instrukciojn por starigi vian pasvorton, se ekzistas konto " +"kun la retadreso, kiun vi provizis. Vi devus ricevi ilin post mallonge." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Se vi ne ricevas retpoŝton, bonvolu certigi ke vi metis la adreson per kiu " -"vi registris, kaj kontroli vian spaman dosierujon." +"Se vi ne ricevas retmesaĝon, bonvolu certiĝi, ke vi entajpis la adreson, per " +"kiu vi registriĝis, kaj kontrolu en via spamujo." #, python-format msgid "" @@ -663,8 +657,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Bonvolu iri al la sekvanta paĝo kaj elekti novan pasvorton:" -msgid "Your username, in case you've forgotten:" -msgstr "Via salutnomo, se vi forgesis:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Via uzantnomo, se vi forgesis ĝin:" msgid "Thanks for using our site!" msgstr "Dankon pro uzo de nia retejo!" @@ -674,11 +668,11 @@ msgid "The %(site_name)s team" msgstr "La %(site_name)s teamo" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Vi forgesis vian pasvorton? Malsupre enigu vian retpoŝtan adreson kaj ni " -"retpoŝte sendos instrukciojn por agordi novan." +"Ĉu vi forgesis vian pasvorton? Entajpu vian retpoŝtadreson sube kaj ni " +"sendos al vi retpoŝte instrukciojn por ŝanĝi ĝin." msgid "Email address:" msgstr "Retpoŝto:" diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo index f4c502ec187e..3e5dbb4f9346 100644 Binary files a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.po b/django/contrib/admin/locale/es/LC_MESSAGES/django.po index 949e20400fc8..293118994152 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.po @@ -4,8 +4,8 @@ # abraham.martin , 2014 # Antoni Aloy , 2011-2014 # Claude Paroz , 2014 -# Ernesto Avilés Vázquez , 2015-2016 -# franchukelly , 2011 +# Ernesto Avilés, 2015-2016 +# 8cb2d5a716c3c9a99b6d20472609a4d5_6d03802 , 2011 # guillem , 2012 # Ignacio José Lizarán Rus , 2019 # Igor Támara , 2013 @@ -17,14 +17,15 @@ # Marc Garcia , 2011 # Miguel Angel Tribaldos , 2017 # Pablo, 2015 +# Uriel Medina , 2020 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 08:44+0000\n" -"Last-Translator: Ignacio José Lizarán Rus \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-25 17:35+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -84,6 +85,12 @@ msgstr "Sin fecha" msgid "Has date" msgstr "Tiene fecha" +msgid "Empty" +msgstr "Vacío" + +msgid "Not empty" +msgstr "No vacío" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -141,23 +148,23 @@ msgid "log entries" msgstr "entradas de registro" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Añadidos \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "Agregado “%(object)s”." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Cambiados \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Modificado “%(object)s” — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Eliminado/a \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "Eliminado “%(object)s.”" msgid "LogEntry Object" msgstr "Objeto de registro de Log" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Añadido {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "Agregado {name} “{object}”." msgid "Added." msgstr "Añadido." @@ -166,16 +173,16 @@ msgid "and" msgstr "y" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Modificado {fields} por {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "Cambios en {fields} para {name} “{object}”." #, python-brace-format msgid "Changed {fields}." msgstr "Modificado {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Eliminado {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "Eliminado {name} “{object}”." msgid "No fields changed." msgstr "No ha cambiado ningún campo." @@ -183,52 +190,49 @@ msgstr "No ha cambiado ningún campo." msgid "None" msgstr "Ninguno" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar " -"más de una opción." +"Mantenga presionado \"Control\" o \"Comando\" en una Mac, para seleccionar " +"más de uno." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "Se añadió con éxito el {name} \"{obj}\"." +msgid "The {name} “{obj}” was added successfully." +msgstr "El {name} “{obj}” fue agregado correctamente." msgid "You may edit it again below." msgstr "Puede volverlo a editar otra vez a continuación." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Se añadió con éxito el {name} \"{obj}\". Puede añadir otro {name} a " +"El {name} “{obj}” se agregó correctamente. Puede agregar otro {name} a " "continuación." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"Se modificó con éxito el {name} \"{obj}\". Puede editarlo otra vez a " +"El {name} “{obj}” se cambió correctamente. Puede editarlo nuevamente a " "continuación." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"Se añadió con éxito el {name} \"{obj}\". Puede editarlo otra vez a " +"El {name} “{obj}” se agregó correctamente. Puede editarlo nuevamente a " "continuación." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Se modificó con éxito el {name} \"{obj}\". Puede añadir otro {name} a " +"El {name} “{obj}” se cambió correctamente. Puede agregar otro {name} a " "continuación." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "Se modificó con éxito el {name} \"{obj}\"." +msgid "The {name} “{obj}” was changed successfully." +msgstr "El {name} “{obj}” se cambió correctamente." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -241,12 +245,12 @@ msgid "No action selected." msgstr "No se seleccionó ninguna acción." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "El%(name)s “%(obj)s” fue eliminado con éxito." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s con ID \"%(key)s\" no existe. ¿Fue quizá eliminado?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s con el ID “%(key)s” no existe. ¿Quizás fue eliminado?" #, python-format msgid "Add %s" @@ -258,7 +262,7 @@ msgstr "Modificar %s" #, python-format msgid "View %s" -msgstr "Vistas %s" +msgstr "Vista %s" msgid "Database error" msgstr "Error en la base de datos" @@ -316,8 +320,8 @@ msgstr "Administración de %(app)s " msgid "Page not found" msgstr "Página no encontrada" -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la página solicitada." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero no se pudo encontrar la página solicitada." msgid "Home" msgstr "Inicio" @@ -332,12 +336,11 @@ msgid "Server Error (500)" msgstr "Error de servidor (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Ha habido un error. Ha sido comunicado al administrador del sitio por correo " -"electrónico y debería solucionarse a la mayor brevedad. Gracias por su " -"paciencia y comprensión." +"Hubo un error. Se ha informado a los administradores del sitio por correo " +"electrónico y debería solucionarse en breve. Gracias por su paciencia." msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" @@ -355,12 +358,25 @@ msgstr "Seleccionar todos los %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Limpiar selección" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelos en la aplicación %(name)s" + +msgid "Add" +msgstr "Añadir" + +msgid "View" +msgstr "Vista" + +msgid "You don’t have permission to view or edit anything." +msgstr "No cuenta con permiso para ver ni editar nada." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar " -"el resto de opciones del usuario." +"Primero, ingrese un nombre de usuario y contraseña. Luego, podrá editar más " +"opciones del usuario." msgid "Enter a username and password." msgstr "Introduzca un nombre de usuario y contraseña" @@ -369,7 +385,7 @@ msgid "Change password" msgstr "Cambiar contraseña" msgid "Please correct the error below." -msgstr "Por Favor corrija el siguiente error." +msgstr "Por favor corrija el siguiente error." msgid "Please correct the errors below." msgstr "Por favor, corrija los siguientes errores." @@ -381,7 +397,7 @@ msgstr "" "strong>." msgid "Welcome," -msgstr "Bienvenido/a," +msgstr "Bienvenidos," msgid "View site" msgstr "Ver el sitio" @@ -390,7 +406,7 @@ msgid "Documentation" msgstr "Documentación" msgid "Log out" -msgstr "Terminar sesión" +msgstr "Cerrar sesión" #, python-format msgid "Add %(name)s" @@ -405,8 +421,11 @@ msgstr "Ver en el sitio" msgid "Filter" msgstr "Filtro" +msgid "Clear all filters" +msgstr "Borrar todos los filtros" + msgid "Remove from sorting" -msgstr "Elimina de la ordenación" +msgstr "Eliminar del ordenación" #, python-format msgid "Sorting priority: %(priority_number)s" @@ -447,8 +466,8 @@ msgstr "" msgid "Objects" msgstr "Objetos" -msgid "Yes, I'm sure" -msgstr "Sí, estoy seguro" +msgid "Yes, I’m sure" +msgstr "Si, estoy seguro" msgid "No, take me back" msgstr "No, llévame atrás" @@ -482,9 +501,6 @@ msgstr "" "¿Está usted seguro que quiere eliminar el %(objects_name)s seleccionado? " "Todos los siguientes objetos y sus elementos relacionados serán borrados:" -msgid "View" -msgstr "Vista" - msgid "Delete?" msgstr "¿Eliminar?" @@ -495,16 +511,6 @@ msgstr " Por %(filter_title)s " msgid "Summary" msgstr "Resumen" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelos en la aplicación %(name)s" - -msgid "Add" -msgstr "Añadir" - -msgid "You don't have permission to view or edit anything." -msgstr "No tiene permisos para ver o editar nada" - msgid "Recent actions" msgstr "Acciones recientes" @@ -518,13 +524,13 @@ msgid "Unknown content" msgstr "Contenido desconocido" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Algo va mal con la instalación de la base de datos. Asegúrese de que las " -"tablas necesarias han sido creadas, y de que la base de datos puede ser " -"leída por el usuario apropiado." +"Algo anda mal con la instalación de su base de datos. Asegúrese de que se " +"hayan creado las tablas de base de datos adecuadas y asegúrese de que el " +"usuario adecuado pueda leer la base de datos." #, python-format msgid "" @@ -537,6 +543,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "¿Ha olvidado la contraseña o el nombre de usuario?" +msgid "Toggle navigation" +msgstr "Activar navegación" + msgid "Date/time" msgstr "Fecha/hora" @@ -547,17 +556,17 @@ msgid "Action" msgstr "Acción" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Este objeto no tiene histórico de cambios. Probablemente no fue añadido " -"usando este sitio de administración." +"Este objeto no tiene un historial de cambios. Probablemente no se agregó a " +"través de este sitio de administración." msgid "Show all" msgstr "Mostrar todo" msgid "Save" -msgstr "Grabar" +msgstr "Guardar" msgid "Popup closing…" msgstr "Cerrando ventana emergente..." @@ -576,13 +585,13 @@ msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" msgid "Save as new" -msgstr "Grabar como nuevo" +msgstr "Guardar como nuevo" msgid "Save and add another" -msgstr "Grabar y añadir otro" +msgstr "Guardar y añadir otro" msgid "Save and continue editing" -msgstr "Grabar y continuar editando" +msgstr "Guardar y continuar editando" msgid "Save and view" msgstr "Guardar y ver" @@ -592,7 +601,7 @@ msgstr "Cerrar" #, python-format msgid "Change selected %(model)s" -msgstr "Cambiar %(model)s seleccionado" +msgstr "Cambiar %(model)s seleccionados" #, python-format msgid "Add another %(model)s" @@ -615,11 +624,11 @@ msgid "Your password was changed." msgstr "Su contraseña ha sido cambiada." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Por favor, introduzca su contraseña antigua, por seguridad, y después " -"introduzca la nueva contraseña dos veces para verificar que la ha escrito " +"Ingrese su contraseña anterior, por razones de seguridad, y luego ingrese su " +"nueva contraseña dos veces para que podamos verificar que la ingresó " "correctamente." msgid "Change my password" @@ -630,8 +639,7 @@ msgstr "Restablecer contraseña" msgid "Your password has been set. You may go ahead and log in now." msgstr "" -"Su contraseña ha sido establecida. Ahora puede seguir adelante e iniciar " -"sesión." +"Su contraseña ha sido establecida. Ahora puede continuar e iniciar sesión." msgid "Password reset confirmation" msgstr "Confirmación de restablecimiento de contraseña" @@ -658,19 +666,19 @@ msgstr "" "contraseña." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Le hemos enviado por email las instrucciones para restablecer la contraseña, " -"si es que existe una cuenta con la dirección electrónica que indicó. Debería " -"recibirlas en breve." +"Le enviamos instrucciones por correo electrónico para configurar su " +"contraseña, si existe una cuenta con el correo electrónico que ingresó. " +"Debería recibirlos en breve." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Si no recibe un correo, por favor asegúrese de que ha introducido la " -"dirección de correo con la que se registró y verifique su carpeta de spam." +"Si no recibe un correo electrónico, asegúrese de haber ingresado la " +"dirección con la que se registró y verifique su carpeta de correo no deseado." #, python-format msgid "" @@ -683,8 +691,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Por favor, vaya a la página siguiente y escoja una nueva contraseña." -msgid "Your username, in case you've forgotten:" -msgstr "Su nombre de usuario, en caso de haberlo olvidado:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Su nombre de usuario, en caso de que lo haya olvidado:" msgid "Thanks for using our site!" msgstr "¡Gracias por usar nuestro sitio!" @@ -694,12 +702,11 @@ msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"¿Ha olvidado su clave? Introduzca su dirección de correo a continuación y le " -"enviaremos por correo electrónico las instrucciones para establecer una " -"nueva." +"¿Olvidaste tu contraseña? Ingrese su dirección de correo electrónico a " +"continuación y le enviaremos las instrucciones para configurar una nueva." msgid "Email address:" msgstr "Correo electrónico:" @@ -712,11 +719,11 @@ msgstr "Todas las fechas" #, python-format msgid "Select %s" -msgstr "Escoja %s" +msgstr "Seleccione %s" #, python-format msgid "Select %s to change" -msgstr "Escoja %s a modificar" +msgstr "Seleccione %s a modificar" #, python-format msgid "Select %s to view" diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo index a953b628cfc2..d732ed0c9de5 100644 Binary files a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po index 6ac954a2d3fb..bdfacec6bc14 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po @@ -2,18 +2,19 @@ # # Translators: # Antoni Aloy , 2011-2012 -# Ernesto Avilés Vázquez , 2015-2016 +# e4db27214f7e7544f2022c647b585925_bb0e321, 2015-2016 # Jannis Leidel , 2011 # Josue Naaman Nistal Guerra , 2014 # Leonardo J. Caballero G. , 2011 +# Uriel Medina , 2020-2021 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Ernesto Avilés Vázquez \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-11 05:37+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -88,22 +89,37 @@ msgstr "" "acción, los cambios no guardados se perderán." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Ha seleccionado una acción, pero no ha guardado los cambios en los campos " -"individuales todavía. Pulse OK para guardar. Tendrá que volver a ejecutar la " -"acción." +"Ha seleccionado una acción, pero aún no ha guardado los cambios en los " +"campos individuales. Haga clic en Aceptar para guardar. Deberá volver a " +"ejecutar la acción." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Ha seleccionado una acción y no hs hecho ningún cambio en campos " -"individuales. Probablemente esté buscando el botón Ejecutar en lugar del " -"botón Guardar." +"Ha seleccionado una acción y no ha realizado ningún cambio en campos " +"individuales. Probablemente esté buscando el botón 'Ir' en lugar del botón " +"'Guardar'." + +msgid "Now" +msgstr "Ahora" + +msgid "Midnight" +msgstr "Medianoche" + +msgid "6 a.m." +msgstr "6 a.m." + +msgid "Noon" +msgstr "Mediodía" + +msgid "6 p.m." +msgstr "6 p.m." #, javascript-format msgid "Note: You are %s hour ahead of server time." @@ -117,27 +133,12 @@ msgid_plural "Note: You are %s hours behind server time." msgstr[0] "Nota: Usted esta a %s hora de retraso de tiempo de servidor." msgstr[1] "Nota: Usted va %s horas por detrás de la hora del servidor." -msgid "Now" -msgstr "Ahora" - msgid "Choose a Time" -msgstr "Elija una hora" +msgstr "Elija una Hora" msgid "Choose a time" msgstr "Elija una hora" -msgid "Midnight" -msgstr "Medianoche" - -msgid "6 a.m." -msgstr "6 a.m." - -msgid "Noon" -msgstr "Mediodía" - -msgid "6 p.m." -msgstr "6 p.m." - msgid "Cancel" msgstr "Cancelar" @@ -145,7 +146,7 @@ msgid "Today" msgstr "Hoy" msgid "Choose a Date" -msgstr "Elija una fecha" +msgstr "Elija una Fecha" msgid "Yesterday" msgstr "Ayer" @@ -189,6 +190,54 @@ msgstr "Noviembre" msgid "December" msgstr "Diciembre" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Ene" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Abr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "May" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Ago" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Oct" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dic" + msgctxt "one letter Sunday" msgid "S" msgstr "D" @@ -221,4 +270,4 @@ msgid "Show" msgstr "Mostrar" msgid "Hide" -msgstr "Esconder" +msgstr "Ocultar" diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo index 9af1d279bf7c..862aaa63d946 100644 Binary files a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po index e394eadc759c..189f5b5854dc 100644 --- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # Translators: # Jannis Leidel , 2011 # Leonardo José Guzmán , 2013 -# Ramiro Morales, 2013-2019 +# Ramiro Morales, 2013-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-01 10:11+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-21 12:55+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -19,6 +19,10 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Eliminar %(verbose_name_plural)s seleccionados/as" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Se eliminaron con éxito %(count)d %(items)s." @@ -30,10 +34,6 @@ msgstr "No se puede eliminar %(name)s" msgid "Are you sure?" msgstr "¿Está seguro?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Eliminar %(verbose_name_plural)s seleccionados/as" - msgid "Administration" msgstr "Administración" @@ -70,6 +70,12 @@ msgstr "Sin fecha" msgid "Has date" msgstr "Tiene fecha" +msgid "Empty" +msgstr "Vacío/a" + +msgid "Not empty" +msgstr "No vacío/a" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -334,6 +340,19 @@ msgstr "Seleccionar lo(s)/a(s) %(total_count)s %(module_name)s existentes" msgid "Clear selection" msgstr "Borrar selección" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelos en la aplicación %(name)s" + +msgid "Add" +msgstr "Agregar" + +msgid "View" +msgstr "Ver" + +msgid "You don’t have permission to view or edit anything." +msgstr "No tiene permiso para ver o modificar nada." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -384,6 +403,9 @@ msgstr "Ver en el sitio" msgid "Filter" msgstr "Filtrar" +msgid "Clear all filters" +msgstr "Limpiar todos los filtros" + msgid "Remove from sorting" msgstr "Remover de ordenamiento" @@ -463,9 +485,6 @@ msgstr "" "los siguientes objetos e ítems relacionados a los mismos también serán " "eliminados:" -msgid "View" -msgstr "Ver" - msgid "Delete?" msgstr "¿Eliminar?" @@ -476,16 +495,6 @@ msgstr " Por %(filter_title)s " msgid "Summary" msgstr "Resumen" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelos en la aplicación %(name)s" - -msgid "Add" -msgstr "Agregar" - -msgid "You don’t have permission to view or edit anything." -msgstr "No tiene permiso para ver o modificar nada." - msgid "Recent actions" msgstr "Acciones recientes" @@ -518,6 +527,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "¿Olvidó su contraseña o nombre de usuario?" +msgid "Toggle navigation" +msgstr "(des)activar ordenamiento" + msgid "Date/time" msgstr "Fecha/hora" diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo index bac48d8653d1..abd7d3601aba 100644 Binary files a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po index ed9155d51b98..782aa17f45c9 100644 --- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po @@ -2,13 +2,13 @@ # # Translators: # Jannis Leidel , 2011 -# Ramiro Morales, 2014-2016 +# Ramiro Morales, 2014-2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-21 12:54+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -84,22 +84,22 @@ msgstr "" "ejecuta una acción las mismas se perderán." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Ha seleccionado una acción, pero todavía no ha grabado las modificaciones " -"que ha realizado en campos individuales. Por favor haga click en Aceptar " -"para grabarlas. Necesitará ejecutar la acción nuevamente." +"Ha seleccionado una acción pero todavía no ha grabado sus cambios en campos " +"individuales. Por favor haga click en Ok para grabarlos. Luego necesitará re-" +"ejecutar la acción." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Ha seleccionado una acción pero no ha realizado ninguna modificación en " -"campos individuales. Es probable que lo que necesite usar en realidad sea el " -"botón Ejecutar y no el botón Guardar." +"Ha seleccionado una acción y no ha realizado ninguna modificación de campos " +"individuales. Es probable que deba usar el botón 'Ir' y no el botón " +"'Grabar'." msgid "Now" msgstr "Ahora" @@ -193,6 +193,54 @@ msgstr "Noviembre" msgid "December" msgstr "Diciembre" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Ene" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Abr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "May" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Ago" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Set" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Oct" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dic" + msgctxt "one letter Sunday" msgid "S" msgstr "D" diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo index 43e182482730..f141d32b08b2 100644 Binary files a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po index 1a424f203506..fd4d403e8a1d 100644 --- a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Abraham Estrada, 2011-2013 +# Abe Estrada, 2011-2013 # Alex Dzul , 2015 +# Gustavo Jimenez , 2020 +# Jesús Bautista , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/" "language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -64,9 +66,15 @@ msgid "This year" msgstr "Este año" msgid "No date" -msgstr "" +msgstr "Sin fecha" msgid "Has date" +msgstr "Tiene fecha" + +msgid "Empty" +msgstr "" + +msgid "Not empty" msgstr "" #, python-format @@ -88,20 +96,29 @@ msgstr "Agregar otro/a %(verbose_name)s" msgid "Remove" msgstr "Eliminar" +msgid "Addition" +msgstr "Adición" + +msgid "Change" +msgstr "Modificar" + +msgid "Deletion" +msgstr "Eliminación" + msgid "action time" msgstr "hora de la acción" msgid "user" -msgstr "" +msgstr "usuario" msgid "content type" -msgstr "" +msgstr "tipo de contenido" msgid "object id" msgstr "id de objeto" #. Translators: 'repr' means representation -#. (https://docs.python.org/3/library/functions.html#repr) +#. (https://docs.python.org/library/functions.html#repr) msgid "object repr" msgstr "repr de objeto" @@ -118,32 +135,32 @@ msgid "log entries" msgstr "entradas de registro" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Añadidos \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Modificados \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Eliminados \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "Objeto de registro de Log" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "" msgid "Added." -msgstr "" +msgstr "Agregado." msgid "and" msgstr "y" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "" #, python-brace-format @@ -151,7 +168,7 @@ msgid "Changed {fields}." msgstr "" #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "" msgid "No fields changed." @@ -160,40 +177,38 @@ msgstr "No ha modificado ningún campo." msgid "None" msgstr "Ninguno" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Mantenga presionado \"Control, o \"Command\" en una Mac, para seleccionar " -"más de uno." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully." +msgstr "El {name} \"{obj}\" se agregó correctamente." + +msgid "You may edit it again below." msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "" msgid "" @@ -207,11 +222,11 @@ msgid "No action selected." msgstr "No se ha seleccionado ninguna acción." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" #, python-format @@ -222,6 +237,10 @@ msgstr "Agregar %s" msgid "Change %s" msgstr "Modificar %s" +#, python-format +msgid "View %s" +msgstr "" + msgid "Database error" msgstr "Error en la base de datos" @@ -278,8 +297,8 @@ msgstr "Administración de %(app)s " msgid "Page not found" msgstr "Página no encontrada" -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la página solicitada." +msgid "We’re sorry, but the requested page could not be found." +msgstr "" msgid "Home" msgstr "Inicio" @@ -294,11 +313,9 @@ msgid "Server Error (500)" msgstr "Error de servidor (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Ha habido un error. Se ha informado a los administradores del sitio a través " -"de correo electrónico y debe ser reparado en breve. Gracias por su paciencia." msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" @@ -316,12 +333,23 @@ msgstr "Seleccionar lo(s)/a(s) %(total_count)s de %(module_name)s" msgid "Clear selection" msgstr "Borrar selección" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelos en la aplicación %(name)s" + +msgid "Add" +msgstr "Agregar" + +msgid "View" +msgstr "Vista" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Primero introduzca un nombre de usuario y una contraseña. Luego podrá " -"configurar opciones adicionales acerca del usuario." msgid "Enter a username and password." msgstr "Introduzca un nombre de usuario y una contraseña." @@ -330,7 +358,7 @@ msgid "Change password" msgstr "Cambiar contraseña" msgid "Please correct the error below." -msgstr "Por favor, corrija los siguientes errores." +msgstr "" msgid "Please correct the errors below." msgstr "Por favor, corrija los siguientes errores." @@ -345,7 +373,7 @@ msgid "Welcome," msgstr "Bienvenido," msgid "View site" -msgstr "" +msgstr "Ver sitio" msgid "Documentation" msgstr "Documentación" @@ -366,6 +394,9 @@ msgstr "Ver en el sitio" msgid "Filter" msgstr "Filtrar" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Elimina de la clasificación" @@ -406,10 +437,10 @@ msgstr "" "\"? Se eliminarán los siguientes objetos relacionados:" msgid "Objects" -msgstr "" +msgstr "Objetos" -msgid "Yes, I'm sure" -msgstr "Sí, estoy seguro" +msgid "Yes, I’m sure" +msgstr "" msgid "No, take me back" msgstr "" @@ -443,9 +474,6 @@ msgstr "" "¿Está seguro que desea eliminar el seleccionado %(objects_name)s ? Todos los " "objetos siguientes y sus elementos asociados serán eliminados:" -msgid "Change" -msgstr "Modificar" - msgid "Delete?" msgstr "Eliminar?" @@ -454,23 +482,13 @@ msgid " By %(filter_title)s " msgstr "Por %(filter_title)s" msgid "Summary" -msgstr "" - -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelos en la aplicación %(name)s" - -msgid "Add" -msgstr "Agregar" - -msgid "You don't have permission to edit anything." -msgstr "No tiene permiso para editar nada" +msgstr "Resúmen" msgid "Recent actions" msgstr "" msgid "My actions" -msgstr "" +msgstr "Mis acciones" msgid "None available" msgstr "Ninguna disponible" @@ -479,13 +497,10 @@ msgid "Unknown content" msgstr "Contenido desconocido" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Hay algún problema con su instalación de base de datos. Asegúrese de que las " -"tablas de la misma hayan sido creadas, y asegúrese de que el usuario " -"apropiado tenga permisos de lectura en la base de datos." #, python-format msgid "" @@ -496,6 +511,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "¿Ha olvidado su contraseña o nombre de usuario?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Fecha/hora" @@ -506,11 +524,9 @@ msgid "Action" msgstr "Acción" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Este objeto no tiene historia de modificaciones. Probablemente no fue " -"añadido usando este sitio de administración." msgid "Show all" msgstr "Mostrar todos/as" @@ -518,19 +534,7 @@ msgstr "Mostrar todos/as" msgid "Save" msgstr "Guardar" -msgid "Popup closing..." -msgstr "" - -#, python-format -msgid "Change selected %(model)s" -msgstr "" - -#, python-format -msgid "Add another %(model)s" -msgstr "" - -#, python-format -msgid "Delete selected %(model)s" +msgid "Popup closing…" msgstr "" msgid "Search" @@ -555,6 +559,24 @@ msgstr "Guardar y agregar otro" msgid "Save and continue editing" msgstr "Guardar y continuar editando" +msgid "Save and view" +msgstr "" + +msgid "Close" +msgstr "Cerrar" + +#, python-format +msgid "Change selected %(model)s" +msgstr "" + +#, python-format +msgid "Add another %(model)s" +msgstr "" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "" + msgid "Thanks for spending some quality time with the Web site today." msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." @@ -568,12 +590,9 @@ msgid "Your password was changed." msgstr "Su contraseña ha sido cambiada." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Por favor, por razones de seguridad, introduzca primero su contraseña " -"antigua y luego introduzca la nueva contraseña dos veces para verificar que " -"la ha escrito correctamente." msgid "Change my password" msgstr "Cambiar mi contraseña" @@ -609,16 +628,14 @@ msgstr "" "contraseña." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Si usted no recibe un correo electrónico, por favor, asegúrese de que ha " -"introducido la dirección con la que se registró, y revise su carpeta de spam." #, python-format msgid "" @@ -633,8 +650,8 @@ msgstr "" "Por favor visite la página que se muestra a continuación y elija una nueva " "contraseña:" -msgid "Your username, in case you've forgotten:" -msgstr "Su nombre de usuario, en caso de haberlo olvidado:" +msgid "Your username, in case you’ve forgotten:" +msgstr "" msgid "Thanks for using our site!" msgstr "¡Gracias por usar nuestro sitio!" @@ -644,11 +661,9 @@ msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"¿Olvidó su contraseña? Ingrese su dirección de correo electrónico, y le " -"enviaremos las instrucciones para establecer una nueva." msgid "Email address:" msgstr "Correo electrónico:" @@ -667,6 +682,10 @@ msgstr "Seleccione %s" msgid "Select %s to change" msgstr "Seleccione %s a modificar" +#, python-format +msgid "Select %s to view" +msgstr "" + msgid "Date:" msgstr "Fecha:" diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo index 195ac375b74a..dbfc3b8c0b53 100644 Binary files a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.po b/django/contrib/admin/locale/et/LC_MESSAGES/django.po index f0feb715bd08..18a4e187403c 100644 --- a/django/contrib/admin/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/et/LC_MESSAGES/django.po @@ -2,19 +2,20 @@ # # Translators: # eallik , 2011 +# Erlend Eelmets , 2020 # Jannis Leidel , 2011 # Janno Liivak , 2013-2015 # Martin Pajuste , 2015 -# Martin Pajuste , 2016,2019 +# Martin Pajuste , 2016,2019-2020 # Marti Raudsepp , 2016 # Ragnar Rebase , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-12-28 01:34+0000\n" -"Last-Translator: Ragnar Rebase \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-03 15:38+0000\n" +"Last-Translator: Erlend Eelmets \n" "Language-Team: Estonian (http://www.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -74,6 +75,12 @@ msgstr "Kuupäev puudub" msgid "Has date" msgstr "Kuupäev olemas" +msgid "Empty" +msgstr "Tühi" + +msgid "Not empty" +msgstr "Mitte tühi" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -332,6 +339,19 @@ msgstr "Märgista kõik %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Tühjenda valik" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Rakenduse %(name)s moodulid" + +msgid "Add" +msgstr "Lisa" + +msgid "View" +msgstr "Vaata" + +msgid "You don’t have permission to view or edit anything." +msgstr "Teil pole õigust midagi vaadata ega muuta." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -380,6 +400,9 @@ msgstr "Näita lehel" msgid "Filter" msgstr "Filtreeri" +msgid "Clear all filters" +msgstr "Tühjenda kõik filtrid" + msgid "Remove from sorting" msgstr "Eemalda sorteerimisest" @@ -457,9 +480,6 @@ msgstr "" "Kas oled kindel, et soovid kustutada valitud %(objects_name)s? Kõik " "järgnevad objektid ja seotud objektid kustutatakse:" -msgid "View" -msgstr "Vaata" - msgid "Delete?" msgstr "Kustutan?" @@ -470,16 +490,6 @@ msgstr " %(filter_title)s " msgid "Summary" msgstr "Kokkuvõte" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Rakenduse %(name)s moodulid" - -msgid "Add" -msgstr "Lisa" - -msgid "You don’t have permission to view or edit anything." -msgstr "Teil pole õigust midagi vaadata ega muuta." - msgid "Recent actions" msgstr "Hiljutised toimingud" @@ -511,6 +521,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Unustasite oma parooli või kasutajanime?" +msgid "Toggle navigation" +msgstr "Lülita navigeerimine sisse" + msgid "Date/time" msgstr "Kuupäev/kellaaeg" diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo index 1c8e66387a30..d14d67660d49 100644 Binary files a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po index 21e137f4c4b1..0c060049377d 100644 --- a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po @@ -4,15 +4,16 @@ # eallik , 2011 # Jannis Leidel , 2011 # Janno Liivak , 2013-2015 -# Martin Pajuste , 2016 +# Martin , 2021 +# Martin , 2016,2020 # Ragnar Rebase , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-12-28 01:38+0000\n" -"Last-Translator: Ragnar Rebase \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-22 11:55+0000\n" +"Last-Translator: Martin \n" "Language-Team: Estonian (http://www.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -87,16 +88,16 @@ msgstr "" "toimingu, lähevad salvestamata muudatused kaotsi." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Valisite toimingu, kuid pole salvestanud muudatusi lahtrites. Salvestamiseks " "palun vajutage OK. Peate toimingu uuesti käivitama." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Valisite toimingu, kuid ei muutnud ühtegi lahtrit. Tõenäoliselt otsite Mine " @@ -186,6 +187,54 @@ msgstr "november" msgid "December" msgstr "detsember" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "jaan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "veebr" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "märts" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "mai" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "juuni" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "juuli" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "aug" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "sept" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "dets" + msgctxt "one letter Sunday" msgid "S" msgstr "P" diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo index e3c840f91661..727455944992 100644 Binary files a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po index 9176368484fd..5853594fd299 100644 --- a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po @@ -7,13 +7,14 @@ # julen, 2012-2013 # julen, 2013 # Urtzi Odriozola , 2017 +# Yoaira García , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-22 09:57+0000\n" -"Last-Translator: Eneko Illarramendi \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-22 12:29+0000\n" +"Last-Translator: Yoaira García \n" "Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,6 +22,10 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Ezabatu aukeratutako %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s elementu ezabatu dira." @@ -32,10 +37,6 @@ msgstr "Ezin da %(name)s ezabatu" msgid "Are you sure?" msgstr "Ziur al zaude?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Ezabatu aukeratutako %(verbose_name_plural)s" - msgid "Administration" msgstr "Kudeaketa" @@ -72,6 +73,12 @@ msgstr "Datarik ez" msgid "Has date" msgstr "Data dauka" +msgid "Empty" +msgstr "Hutsik" + +msgid "Not empty" +msgstr "" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -129,23 +136,23 @@ msgid "log entries" msgstr "log sarrerak" #, python-format -msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" gehituta." +msgid "Added “%(object)s”." +msgstr "" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "\"%(object)s\" aldatuta - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "\"%(object)s\" ezabatuta." +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "LogEntry objetua" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "{name} \"{object}\" gehitu." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "Gehituta" @@ -154,16 +161,16 @@ msgid "and" msgstr "eta" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{fields}-(e)tik {name} \"{object}\" aldatatuta." +msgid "Changed {fields} for {name} “{object}”." +msgstr "" #, python-brace-format msgid "Changed {fields}." msgstr "{fields} aldatuta." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "{name} \"{object}\" ezabatuta." +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "Ez da eremurik aldatu." @@ -171,48 +178,39 @@ msgstr "Ez da eremurik aldatu." msgid "None" msgstr "Bat ere ez" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Bat baino gehiago hautatzeko, sakatu \"Kontrol\" tekla edo \"Command\" Mac " -"batean." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" ondo gehitu da." +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "Aldaketa gehiago egin ditzazkezu jarraian." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"{name} \"{obj}\" ondo gehitu da. Beste {name} bat gehitu dezakezu jarraian." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" ondo aldatu da. Aldaketa gehiago egin ditzazkezu jarraian." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" ondo gehitu da. Aldaketa gehiago egin ditzazkezu jarraian." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"{name} \"{obj}\" ondo aldatu da. Beste {name} bat gehitu dezakezu jarraian." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" ondo aldatu da." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -225,13 +223,12 @@ msgid "No action selected." msgstr "Ez dago ekintzarik aukeratuta." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ondo ezabatu da." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -"\"%(key)s\" ID dun %(name)s ez dira existitzen. Agian ezabatua izan da?" #, python-format msgid "Add %s" @@ -302,8 +299,8 @@ msgstr "%(app)s kudeaketa" msgid "Page not found" msgstr "Ez da orririk aurkitu" -msgid "We're sorry, but the requested page could not be found." -msgstr "Barkatu, eskatutako orria ezin daiteke aurkitu" +msgid "We’re sorry, but the requested page could not be found." +msgstr "Sentitzen dugu, baina eskatutako orria ezin da aurkitu." msgid "Home" msgstr "Hasiera" @@ -318,11 +315,9 @@ msgid "Server Error (500)" msgstr "Zerbitzariaren errorea (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Errore bat gertatu da. Errorea guneko kudeatzaileari jakinarazi zaio email " -"bidez eta laster egon beharko luke konponduta. Barkatu eragozpenak." msgid "Run the selected action" msgstr "Burutu aukeratutako ekintza" @@ -340,12 +335,25 @@ msgstr "Hautatu %(total_count)s %(module_name)s guztiak" msgid "Clear selection" msgstr "Garbitu hautapena" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s aplikazioaren modeloak" + +msgid "Add" +msgstr "Gehitu" + +msgid "View" +msgstr "Ikusi" + +msgid "You don’t have permission to view or edit anything." +msgstr "Ez duzu ezer ikusteko edo editatzeko baimenik." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Lehenik idatzi erabiltzaile-izena eta pasahitza. Gero erabiltzaile-aukera " -"gehiago aldatu ahal izango dituzu." +"Lehenik, sartu erabiltzailea eta pasahitza bat. Gero, editatzeko aukera " +"gehiago izango dituzu. " msgid "Enter a username and password." msgstr "Sartu erabiltzaile izen eta pasahitz bat." @@ -389,6 +397,9 @@ msgstr "Webgunean ikusi" msgid "Filter" msgstr "Iragazkia" +msgid "Clear all filters" +msgstr "Garbitu filtro guztiak." + msgid "Remove from sorting" msgstr "Kendu ordenaziotik" @@ -430,8 +441,8 @@ msgstr "" msgid "Objects" msgstr "Objetuak" -msgid "Yes, I'm sure" -msgstr "Bai, ziur nago" +msgid "Yes, I’m sure" +msgstr "bai, ziur nago " msgid "No, take me back" msgstr "Ez, itzuli atzera" @@ -465,9 +476,6 @@ msgstr "" "Ziur zaude aukeratutako %(objects_name)s ezabatu nahi duzula? Objektu guzti " "hauek eta erlazionatutako elementu guztiak ezabatuko dira:" -msgid "View" -msgstr "Ikusi" - msgid "Delete?" msgstr "Ezabatu?" @@ -478,16 +486,6 @@ msgstr "Irizpidea: %(filter_title)s" msgid "Summary" msgstr "Laburpena" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s aplikazioaren modeloak" - -msgid "Add" -msgstr "Gehitu" - -msgid "You don't have permission to view or edit anything." -msgstr "Ez duzu ezer ikusi edo ezabatzeko baimenik." - msgid "Recent actions" msgstr "Azken ekintzak" @@ -501,12 +499,10 @@ msgid "Unknown content" msgstr "Eduki ezezaguna" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Zerbait gaizki dago zure datu-basearen instalazioan. Ziurtatu datu-baseko " -"taulak sortu direla eta dagokion erabiltzaileak irakurtzeko baimena duela." #, python-format msgid "" @@ -519,6 +515,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Pasahitza edo erabiltzaile-izena ahaztu duzu?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Data/ordua" @@ -529,11 +528,9 @@ msgid "Action" msgstr "Ekintza" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Objektu honek ez dauka aldaketen historiarik. Ziurrenik kudeaketa gunetik " -"kanpo gehituko zen." msgid "Show all" msgstr "Erakutsi dena" @@ -597,11 +594,11 @@ msgid "Your password was changed." msgstr "Zure pasahitza aldatu egin da." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Idatzi pasahitz zaharra segurtasun arrazoiengatik eta gero pasahitz berria " -"bi aldiz, akatsik egiten ez duzula ziurta dezagun." +"Mesedez, sartu zure pasahitza zaharra segurtasunagatik, gero sartu berria bi " +"aldiz, ondo idatzita dagoela ziurtatzeko. " msgid "Change my password" msgstr "Nire pasahitza aldatu" @@ -634,19 +631,18 @@ msgstr "" "erabilita egotea. Eskatu berriro pasahitza berrezartzea." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Zure pasahitza ezartzeko jarraibideak bidali dizkizugu email bidez, sartu " -"duzun helbide elektronikoa kontu bati lotuta badago. Laster jaso beharko " -"zenituzke." +"Zure pasahitza jartzeko aginduak bidali dizkizugu... sartu duzun posta " +"elektronikoarekin konturen bat baldin badago. Laster jasoko dituzu." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Ez baduzu mezurik jasotzen, ziurtatu izena ematean erabilitako helbide " -"berdina idatzi duzula eta egiaztatu spam karpeta." +"Posta elektronikorik jasotzen ez baduzu, ziurtatu erregistratu duzun " +"helbidean sartu zarela, eta zure spam horria begiratu. " #, python-format msgid "" @@ -659,8 +655,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Zoaz hurrengo orrira eta aukeratu pasahitz berria:" -msgid "Your username, in case you've forgotten:" -msgstr "Zure erabiltzaile-izena (ahaztu baduzu):" +msgid "Your username, in case you’ve forgotten:" +msgstr "" msgid "Thanks for using our site!" msgstr "Mila esker gure webgunea erabiltzeagatik!" @@ -670,11 +666,11 @@ msgid "The %(site_name)s team" msgstr "%(site_name)s webguneko taldea" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Pasahitza ahaztu duzu? Idatzi zure helbide elektronikoa eta berri bat " -"ezartzeko jarraibideak bidaliko dizkizugu." +"Pasahitza ahaztu zaizu? Sartu zure helbidea behean, eta berria jartzeko " +"argibideak bidaliko dizkizugu " msgid "Email address:" msgstr "Helbide elektronikoa:" diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo index 85b2dbf67648..7ebef695c37b 100644 Binary files a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po index 2d64609052d7..70431e4a6432 100644 --- a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po @@ -1,21 +1,24 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Ali Nikneshan , 2015 +# Ahmad Hosseini , 2020 +# Ali Nikneshan , 2015,2020 # Ali Vakilzade , 2015 +# Amir Ajorloo , 2020 # Arash Fazeli , 2012 # Jannis Leidel , 2011 # MJafar Mashhadi , 2018 # Mohammad Hossein Mojtahedi , 2017,2019 # Pouya Abbassi, 2016 +# rahim agh , 2021 # Reza Mohammadi , 2013-2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-23 12:01+0000\n" -"Last-Translator: Mohammad Hossein Mojtahedi \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-03 06:12+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -24,6 +27,10 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "حذف %(verbose_name_plural)s های انتخاب شده" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d تا %(items)s با موفقیت حذف شدند." @@ -35,10 +42,6 @@ msgstr "امکان حذف %(name)s نیست." msgid "Are you sure?" msgstr "آیا مطمئن هستید؟" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "حذف %(verbose_name_plural)s های انتخاب شده" - msgid "Administration" msgstr "مدیریت" @@ -75,6 +78,12 @@ msgstr "بدون تاریخ" msgid "Has date" msgstr "دارای تاریخ" +msgid "Empty" +msgstr "خالی" + +msgid "Not empty" +msgstr "غیر خالی" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -132,23 +141,23 @@ msgid "log entries" msgstr "موارد اتفاقات" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "\"%(object)s\" افروده شد." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "تغییر \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "تغییر یافت \"%(object)s\" - %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" +msgid "Deleted “%(object)s.”" msgstr "\"%(object)s\" حدف شد." msgid "LogEntry Object" msgstr "شئ LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "اضافه شد {name} «{object}»." +msgid "Added {name} “{object}”." +msgstr "اضافه شد {name} \"{object}\"." msgid "Added." msgstr "اضافه شد" @@ -157,7 +166,7 @@ msgid "and" msgstr "و" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "{fields} برای {name} \"{object}\" تغییر یافتند." #, python-brace-format @@ -165,7 +174,7 @@ msgid "Changed {fields}." msgstr "{fields} تغییر یافتند." #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "{name} \"{object}\" حذف شد." msgid "No fields changed." @@ -174,14 +183,13 @@ msgstr "فیلدی تغییر نیافته است." msgid "None" msgstr "هیچ" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" "برای انتخاب بیش از یکی \"Control\"، یا \"Command\" روی Mac، را پایین نگه " "دارید." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "{name} \"{obj}\" با موفقیت اضافه شد." msgid "You may edit it again below." @@ -189,36 +197,34 @@ msgstr "می‌توانید مجدداً ویرایش کنید." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" "{name} \"{obj}\" با موفقیت اضافه شد. شما میتوانید {name} دیگری در قسمت پایین " "اضافه کنید." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" "{name} \"{obj}\" با موفقیت تغییر یافت. شما میتوانید دوباره آنرا در قسمت " "پایین ویرایش کنید." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" " {name} \"{obj}\" به موفقیت اضافه شد. شما میتوانید در قسمت پایین، آنرا " "ویرایش کنید." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" "{name} \"{obj}\" با موفقیت تغییر یافت. شما میتوانید {name} دیگری در قسمت " "پایین اضافه کنید." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "{name} \"{obj}\" با موفقیت تغییر یافت." msgid "" @@ -232,11 +238,11 @@ msgid "No action selected." msgstr "فعالیتی انتخاب نشده" #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "%(name)s·\"%(obj)s\" با موفقیت حذف شد." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "%(name)s با کلید «%(key)s» وجود ندارد. ممکن است حذف شده باشد." #, python-format @@ -307,7 +313,7 @@ msgstr "مدیریت ‎%(app)s‎" msgid "Page not found" msgstr "صفحه یافت نشد" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "شرمنده، صفحه مورد تقاضا یافت نشد." msgid "Home" @@ -323,11 +329,11 @@ msgid "Server Error (500)" msgstr "خطای سرور (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"مشکلی پیش آمده. این مشکل از طریق ایمیل به مدیران سایت اطلاع داده شد و به " -"زودی اصلاح میگردد. از صبر شما ممنونیم" +"مشکلی پیش آمده. این مشکل از طریق ایمیل به مدیران وب‌گاه اطلاع داده شد و به " +"زودی اصلاح می‌گردد. از صبر شما متشکریم." msgid "Run the selected action" msgstr "اجرای حرکت انتخاب شده" @@ -345,8 +351,21 @@ msgstr "انتخاب تمامی %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "لغو انتخاب‌ها" +#, python-format +msgid "Models in the %(name)s application" +msgstr "مدلها در برنامه %(name)s " + +msgid "Add" +msgstr "اضافه کردن" + +msgid "View" +msgstr "مشاهده" + +msgid "You don’t have permission to view or edit anything." +msgstr "شما اجازهٔ مشاهده یا ویرایش چیزی را ندارید." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "ابتدا یک نام کاربری و گذرواژه وارد کنید. سپس می توانید مشخصات دیگر کاربر را " @@ -393,6 +412,9 @@ msgstr "مشاهده در وب‌گاه" msgid "Filter" msgstr "فیلتر" +msgid "Clear all filters" +msgstr "پاک کردن همه فیلترها" + msgid "Remove from sorting" msgstr "حذف از مرتب سازی" @@ -434,7 +456,7 @@ msgstr "" msgid "Objects" msgstr "اشیاء" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "بله، مطمئن هستم." msgid "No, take me back" @@ -468,9 +490,6 @@ msgstr "" "آیا در خصوص حذف %(objects_name)s انتخاب شده اطمینان دارید؟ تمام موجودیت‌های " "ذیل به همراه موارد مرتبط با آنها حذف خواهند شد:" -msgid "View" -msgstr "مشاهده" - msgid "Delete?" msgstr "حذف؟" @@ -481,16 +500,6 @@ msgstr "براساس %(filter_title)s " msgid "Summary" msgstr "خلاصه" -#, python-format -msgid "Models in the %(name)s application" -msgstr "مدلها در برنامه %(name)s " - -msgid "Add" -msgstr "اضافه کردن" - -msgid "You don't have permission to view or edit anything." -msgstr "شما اجازهٔ مشاهده یا ویرایش چیزی را ندارید." - msgid "Recent actions" msgstr "فعالیتهای اخیر" @@ -504,7 +513,7 @@ msgid "Unknown content" msgstr "محتوا ناشناخته" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -523,6 +532,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "گذرواژه یا نام کاربری خود را فراموش کرده‌اید؟" +msgid "Toggle navigation" +msgstr "تعویض جهت یابی" + msgid "Date/time" msgstr "تاریخ/ساعت" @@ -533,11 +545,11 @@ msgid "Action" msgstr "عمل" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"این شیء تاریخچهٔ تغییرات ندارد. احتمالا این شیء توسط وب‌گاه مدیریت ایجاد نشده " -"است." +"این شیء هنوز تاریخچه تغییرات ندارد. ممکن است توسط این وب‌گاه مدیر ساخته نشده " +"باشد." msgid "Show all" msgstr "نمایش همه" @@ -601,11 +613,11 @@ msgid "Your password was changed." msgstr "گذرواژهٔ شما تغییر یافت." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"گذرواژهٔ قدیمی خود را، برای امنیت بیشتر، وارد کنید و سپس گذرواژهٔ جدیدتان را " -"دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ کرده‌اید." +"برای امنیت بیشتر٬ لطفا گذرواژه قدیمی خود را وارد کنید٬ سپس گذرواژه جدیدتان " +"را دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ کرده‌اید. " msgid "Change my password" msgstr "تغییر گذرواژهٔ من" @@ -640,14 +652,14 @@ msgstr "" "استفاده شده است. لطفاً برای یک گذرواژهٔ جدید درخواست دهید." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "دستورالعمل تنظیم گذرواژه را برایتان ایمیل کردیم. اگر با ایمیلی که وارد کردید " -"اکانتی وجود داشت باشد باید به زودی این دستورالعمل‌ها را دریافت کنید." +"اکانتی وجود داشته باشد باید به زودی این دستورالعمل‌ها را دریافت کنید." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "اگر ایمیلی دریافت نمی‌کنید، لطفاً بررسی کنید که آدرسی که وارد کرده‌اید همان است " @@ -664,7 +676,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "لطفاً به صفحهٔ زیر بروید و یک گذرواژهٔ جدید انتخاب کنید:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "نام کاربری‌تان، چنانچه احیاناً یادتان رفته است:" msgid "Thanks for using our site!" @@ -675,11 +687,11 @@ msgid "The %(site_name)s team" msgstr "گروه %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"رمز خود را فراموش کرده اید؟ آدرس ایمیل خود را در زیر وارد کنید، و ما روش " -"تنظیم رمز جدید را برایتان می فرستیم." +"گذرواژه خود را فراموش کرده اید؟ آدرس ایمیل خود را وارد کنید و ما مراحل تعیین " +"کلمه عبور جدید را برای شما ایمیل می‌کنیم." msgid "Email address:" msgstr "آدرس ایمیل:" diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo index 7c6fa113bca6..2add5c779c5c 100644 Binary files a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po index 5f8db3b153d4..f082b60eddd9 100644 --- a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po @@ -6,15 +6,16 @@ # Ali Vakilzade , 2015 # Jannis Leidel , 2011 # Pouya Abbassi, 2016 +# rahim agh , 2020-2021 # Reza Mohammadi , 2014 # Sina Cheraghi , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Mohammad Hossein Mojtahedi \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-03 13:56+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -87,21 +88,21 @@ msgstr "" "دهید، تغییرات از دست خواهند رفت" msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"شما کاری را انتخاب کرده اید، ولی هنوز تغییرات بعضی فیلد ها را ذخیره نکرده " -"اید. لطفا OK را فشار دهید تا ذخیره شود.\n" -"شما باید عملیات را دوباره انجام دهید." +"شما یک اقدام را انتخاب کرده‌اید، ولی تغییراتی که در فیلدهای شخصی وارد کرده‌اید " +"هنوز ذخیره نشده‌اند. لطفاً کلید OK را برای ذخیره کردن تغییرات بزنید. لازم است " +"که اقدام را دوباره اجرا کنید." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"شما عملی را انجام داده اید، ولی تغییری انجام نداده اید. احتمالا دنبال کلید " -"Go به جای Save میگردید." +"شما یک اقدام را انتخاب کرده‌اید، ولی تغییراتی در فیلدهای شخصی وارد نکرده‌اید. " +"احتمالاً به جای کلید Save به دنبال کلید Go می‌گردید." msgid "Now" msgstr "اکنون" @@ -187,6 +188,54 @@ msgstr "نوامبر" msgid "December" msgstr "دسامبر" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "ژانویه" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "فوریه" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "مارس" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "آوریل" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "می" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "ژوئن" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "ژوئیه" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "اوت" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "سپتامبر" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "اکتبر" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "نوامبر" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "دسامبر" + msgctxt "one letter Sunday" msgid "S" msgstr "ی" diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo index b65ffeff53f9..b9134b2a7e5c 100644 Binary files a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po index a2c0a3806e10..6417007b092e 100644 --- a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015,2017 +# Aarni Koskela, 2015,2017,2020 # Antti Kaihola , 2011 # Jannis Leidel , 2011 # Klaus Dahlén , 2012 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-18 00:36+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-09 06:47+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -21,6 +21,10 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d \"%(items)s\"-kohdetta poistettu." @@ -32,10 +36,6 @@ msgstr "Ei voida poistaa: %(name)s" msgid "Are you sure?" msgstr "Oletko varma?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet" - msgid "Administration" msgstr "Hallinta" @@ -72,6 +72,12 @@ msgstr "Ei päivämäärää" msgid "Has date" msgstr "On päivämäärä" +msgid "Empty" +msgstr "Tyhjä" + +msgid "Not empty" +msgstr "Ei tyhjä" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -129,22 +135,22 @@ msgid "log entries" msgstr "lokimerkinnät" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "Lisätty \"%(object)s\"." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" msgstr "Muokattu \"%(object)s\" - %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" +msgid "Deleted “%(object)s.”" msgstr "Poistettu \"%(object)s.\"" msgid "LogEntry Object" msgstr "Lokimerkintätietue" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "Lisätty {name} \"{object}\"." msgid "Added." @@ -154,7 +160,7 @@ msgid "and" msgstr "ja" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "Muutettu {fields} {name}-kohteelle \"{object}\"." #, python-brace-format @@ -162,7 +168,7 @@ msgid "Changed {fields}." msgstr "Muutettu {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "Poistettu {name} \"{object}\"." msgid "No fields changed." @@ -171,43 +177,40 @@ msgstr "Ei muutoksia kenttiin." msgid "None" msgstr "Ei arvoa" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" " Pidä \"Ctrl\" (tai Macin \"Command\") pohjassa valitaksesi useita " "vaihtoehtoja." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "{name} \"{obj}\" on lisätty." msgid "You may edit it again below." -msgstr "" +msgstr "Voit muokata sitä jälleen alla." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." -msgstr "{name} \"{obj}\" on lisätty. Voit lisätä toisen {name} alla." +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "{name} \"{obj}\" on lisätty. Voit lisätä toisen {name}-kohteen alla." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} \"{obj}\" on muokattu. Voit muokata sitä edelleen alla." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "{name} \"{obj}\" on lisätty. Voit muokata sitä uudelleen alla." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "{name} \"{obj}\" on lisätty. Voit muokata sitä edelleen alla." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "{name} \"{obj}\" on muokattu. Voit lisätä toisen alla." +msgstr "{name} \"{obj}\" on muokattu. Voit lisätä toisen {name}-kohteen alla." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "{name} \"{obj}\" on muokattu." msgid "" @@ -221,12 +224,12 @@ msgid "No action selected." msgstr "Ei toimintoa valittuna." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "%(name)s \"%(obj)s\" on poistettu." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s tunnisteella %(key)s puuttuu. Se on voitu poistaa." +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s tunnisteella \"%(key)s\" puuttuu. Se on voitu poistaa." #, python-format msgid "Add %s" @@ -238,7 +241,7 @@ msgstr "Muokkaa %s" #, python-format msgid "View %s" -msgstr "" +msgstr "Näytä %s" msgid "Database error" msgstr "Tietokantavirhe" @@ -296,7 +299,7 @@ msgstr "%(app)s-ylläpito" msgid "Page not found" msgstr "Sivua ei löydy" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "Pahoittelemme, pyydettyä sivua ei löytynyt." msgid "Home" @@ -312,7 +315,7 @@ msgid "Server Error (500)" msgstr "Palvelinvirhe (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "Sattui virhe. Virheestä on huomautettu sivuston ylläpitäjille sähköpostitse " @@ -334,8 +337,21 @@ msgstr "Valitse kaikki %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Tyhjennä valinta" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s -applikaation mallit" + +msgid "Add" +msgstr "Lisää" + +msgid "View" +msgstr "Näytä" + +msgid "You don’t have permission to view or edit anything." +msgstr "Sinulla ei ole oikeutta näyttää tai muokata mitään." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "Syötä ensin käyttäjätunnus ja salasana. Sen jälkeen voit muokata muita " @@ -348,7 +364,7 @@ msgid "Change password" msgstr "Vaihda salasana" msgid "Please correct the error below." -msgstr "" +msgstr "Korjaa allaoleva virhe." msgid "Please correct the errors below." msgstr "Korjaa allaolevat virheet." @@ -382,6 +398,9 @@ msgstr "Näytä lopputulos" msgid "Filter" msgstr "Suodatin" +msgid "Clear all filters" +msgstr "Tyhjennä kaikki suotimet" + msgid "Remove from sorting" msgstr "Poista järjestämisestä" @@ -424,7 +443,7 @@ msgstr "" msgid "Objects" msgstr "Kohteet" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Kyllä, olen varma" msgid "No, take me back" @@ -459,9 +478,6 @@ msgstr "" "Haluatki varmasti poistaa valitut %(objects_name)s? Samalla poistetaan " "kaikki alla mainitut ja niihin liittyvät kohteet:" -msgid "View" -msgstr "" - msgid "Delete?" msgstr "Poista?" @@ -472,16 +488,6 @@ msgstr " %(filter_title)s " msgid "Summary" msgstr "Yhteenveto" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s -applikaation mallit" - -msgid "Add" -msgstr "Lisää" - -msgid "You don't have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "Viimeisimmät tapahtumat" @@ -495,7 +501,7 @@ msgid "Unknown content" msgstr "Tuntematon sisältö" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -513,6 +519,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Unohditko salasanasi tai käyttäjätunnuksesi?" +msgid "Toggle navigation" +msgstr "Kytke navigaatio" + msgid "Date/time" msgstr "Pvm/klo" @@ -523,7 +532,7 @@ msgid "Action" msgstr "Tapahtuma" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "Tällä kohteella ei ole muutoshistoriaa. Sitä ei ole ilmeisesti lisätty tämän " @@ -536,7 +545,7 @@ msgid "Save" msgstr "Tallenna ja poistu" msgid "Popup closing…" -msgstr "" +msgstr "Ponnahdusikkuna sulkeutuu..." msgid "Search" msgstr "Haku" @@ -561,7 +570,7 @@ msgid "Save and continue editing" msgstr "Tallenna välillä ja jatka muokkaamista" msgid "Save and view" -msgstr "" +msgstr "Tallenna ja näytä" msgid "Close" msgstr "Sulje" @@ -591,7 +600,7 @@ msgid "Your password was changed." msgstr "Salasanasi on vaihdettu." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" "Syötä vanha salasanasi varmistukseksi, ja syötä sitten uusi salasanasi kaksi " @@ -630,14 +639,14 @@ msgstr "" "käytetty. Ole hyvä ja pyydä uusi salasanan nollaus." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "Sinulle on lähetetty sähköpostitse ohjeet salasanasi asettamiseen, mikäli " "antamallasi sähköpostiosoitteella on olemassa tili." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "Jos viestiä ei näy, ole hyvä ja varmista syöttäneesi oikea sähköpostiosoite " @@ -654,7 +663,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Määrittele uusi salasanasi oheisella sivulla:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "Käyttäjätunnuksesi siltä varalta, että olet unohtanut sen:" msgid "Thanks for using our site!" @@ -665,7 +674,7 @@ msgid "The %(site_name)s team" msgstr "%(site_name)s -sivuston ylläpitäjät" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" "Unohditko salasanasi? Syötä sähköpostiosoitteesi alle ja lähetämme sinulle " @@ -690,7 +699,7 @@ msgstr "Valitse muokattava %s" #, python-format msgid "Select %s to view" -msgstr "" +msgstr "Valitse näytettävä %s" msgid "Date:" msgstr "Pvm:" diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo index 10d6422a4d22..7ff9be784b07 100644 Binary files a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po index bf775c864486..05b16029e3fa 100644 --- a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015,2017 +# Aarni Koskela, 2015,2017,2020-2021 # Antti Kaihola , 2011 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-14 12:20+0000\n" "Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" @@ -85,8 +85,8 @@ msgstr "" "Jos suoritat toiminnon, tallentamattomat muutoksesi katoavat." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Olet valinnut toiminnon, mutta et ole vielä tallentanut muutoksiasi " @@ -94,12 +94,28 @@ msgstr "" "toiminto uudelleen." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Olet valinnut toiminnon etkä ole tehnyt yhtään muutosta yksittäisissä " -"kentissä. Etsit todennäköisesti Suorita-nappia Tallenna-napin sijaan." +"kentissä. Etsit todennäköisesti Suorita-painiketta Tallenna-painikkeen " +"sijaan." + +msgid "Now" +msgstr "Nyt" + +msgid "Midnight" +msgstr "24" + +msgid "6 a.m." +msgstr "06" + +msgid "Noon" +msgstr "12" + +msgid "6 p.m." +msgstr "18:00" #, javascript-format msgid "Note: You are %s hour ahead of server time." @@ -113,27 +129,12 @@ msgid_plural "Note: You are %s hours behind server time." msgstr[0] "Huom: Olet %s tunnin palvelinaikaa jäljessä." msgstr[1] "Huom: Olet %s tuntia palvelinaikaa jäljessä." -msgid "Now" -msgstr "Nyt" - msgid "Choose a Time" msgstr "Valitse kellonaika" msgid "Choose a time" msgstr "Valitse kellonaika" -msgid "Midnight" -msgstr "24" - -msgid "6 a.m." -msgstr "06" - -msgid "Noon" -msgstr "12" - -msgid "6 p.m." -msgstr "18:00" - msgid "Cancel" msgstr "Peruuta" @@ -185,6 +186,54 @@ msgstr "marraskuu" msgid "December" msgstr "joulukuu" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Tammi" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Helmi" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Maalis" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Huhti" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Touko" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Kesä" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Heinä" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Elo" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Syys" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Loka" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Marras" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Joulu" + msgctxt "one letter Sunday" msgid "S" msgstr "Su" diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo index 0eee0beac29c..e24a3370902e 100644 Binary files a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po index d8b7cd17f891..86d0b2bc94c5 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2013-2019 +# Bruno Brouard , 2021 +# Claude Paroz , 2013-2020 # Claude Paroz , 2011,2013 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 16:24+0000\n" -"Last-Translator: Claude Paroz \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-04 20:53+0000\n" +"Last-Translator: Bruno Brouard \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,6 +19,10 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Supprimer les %(verbose_name_plural)s sélectionnés" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "La suppression de %(count)d %(items)s a réussi." @@ -29,10 +34,6 @@ msgstr "Impossible de supprimer %(name)s" msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Supprimer les %(verbose_name_plural)s sélectionnés" - msgid "Administration" msgstr "Administration" @@ -69,6 +70,12 @@ msgstr "Aucune date" msgid "Has date" msgstr "Possède une date" +msgid "Empty" +msgstr "Vide" + +msgid "Not empty" +msgstr "Non vide" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -92,13 +99,13 @@ msgid "Addition" msgstr "Ajout" msgid "Change" -msgstr "Modifier" +msgstr "Modification" msgid "Deletion" msgstr "Suppression" msgid "action time" -msgstr "heure de l’action" +msgstr "date de l’action" msgid "user" msgstr "utilisateur" @@ -192,14 +199,14 @@ msgstr "" msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"L’objet {name} « {obj} » a été modifié avec succès. Vous pouvez continuer " -"l’édition ci-dessous." +"L’objet {name} « {obj} » a été modifié avec succès. Vous pouvez l’éditer à " +"nouveau ci-dessous." #, python-brace-format msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"L’objet {name} « {obj} » a été ajouté avec succès. Vous pouvez continuer " -"l’édition ci-dessous." +"L’objet {name} « {obj} » a été ajouté avec succès. Vous pouvez l’éditer à " +"nouveau ci-dessous." #, python-brace-format msgid "" @@ -289,7 +296,7 @@ msgid "Django administration" msgstr "Administration de Django" msgid "Site administration" -msgstr "Administration du site" +msgstr "Site d’administration" msgid "Log in" msgstr "Connexion" @@ -299,7 +306,7 @@ msgid "%(app)s administration" msgstr "Administration de %(app)s" msgid "Page not found" -msgstr "Cette page n’a pas été trouvée" +msgstr "Page non trouvée" msgid "We’re sorry, but the requested page could not be found." msgstr "Nous sommes désolés, mais la page demandée est introuvable." @@ -340,6 +347,19 @@ msgstr "Sélectionner tous les %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Effacer la sélection" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modèles de l’application %(name)s" + +msgid "Add" +msgstr "Ajouter" + +msgid "View" +msgstr "Afficher" + +msgid "You don’t have permission to view or edit anything." +msgstr "Vous n’avez pas la permission de voir ou de modifier quoi que ce soit." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -390,6 +410,9 @@ msgstr "Voir sur le site" msgid "Filter" msgstr "Filtre" +msgid "Clear all filters" +msgstr "Effacer tous les filtres" + msgid "Remove from sorting" msgstr "Enlever du tri" @@ -468,9 +491,6 @@ msgstr "" "Voulez-vous vraiment supprimer les objets %(objects_name)s sélectionnés ? " "Tous les objets suivants et les éléments liés seront supprimés :" -msgid "View" -msgstr "Afficher" - msgid "Delete?" msgstr "Supprimer ?" @@ -481,16 +501,6 @@ msgstr " Par %(filter_title)s " msgid "Summary" msgstr "Résumé" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modèles de l’application %(name)s" - -msgid "Add" -msgstr "Ajouter" - -msgid "You don’t have permission to view or edit anything." -msgstr "Vous n’avez pas la permission de voir ou de modifier quoi que ce soit." - msgid "Recent actions" msgstr "Actions récentes" @@ -524,6 +534,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Mot de passe ou nom d’utilisateur oublié ?" +msgid "Toggle navigation" +msgstr "Basculer la navigation" + msgid "Date/time" msgstr "Date/heure" diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo index 2b0b2cb8258d..2e4d5c35ffc3 100644 Binary files a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po index 4b17b0ccf5cc..87491cec8d64 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2014-2017 +# Claude Paroz , 2014-2017,2020-2021 # Claude Paroz , 2011-2012 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-10-21 13:28+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 14:34+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -84,17 +84,17 @@ msgstr "" "Si vous lancez une action, ces modifications vont être perdues." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Vous avez sélectionné une action, mais vous n'avez pas encore sauvegardé " -"certains champs modifiés. Cliquez sur OK pour sauver. Vous devrez " +"Vous avez sélectionné une action, mais vous n'avez pas encore enregistré " +"certains champs modifiés. Cliquez sur OK pour enregistrer. Vous devrez " "réappliquer l'action." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Vous avez sélectionné une action, et vous n'avez fait aucune modification " @@ -185,6 +185,54 @@ msgstr "Novembre" msgid "December" msgstr "Décembre" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "fév" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "avr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "mai" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "jui" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "aoû" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "oct" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "déc" + msgctxt "one letter Sunday" msgid "S" msgstr "D" diff --git a/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo index cc210211c84e..d1e16909dd8e 100644 Binary files a/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/gd/LC_MESSAGES/django.po b/django/contrib/admin/locale/gd/LC_MESSAGES/django.po index 9fd3338d2346..28cc9e9148ba 100644 --- a/django/contrib/admin/locale/gd/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/gd/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-12-13 12:51+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-16 08:31+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" @@ -20,6 +20,10 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " "(n > 2 && n < 20) ? 2 : 3;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Sguab às na %(verbose_name_plural)s a chaidh a thaghadh" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Chaidh %(count)d %(items)s a sguabadh às." @@ -31,10 +35,6 @@ msgstr "Chan urrainn dhuinn %(name)s a sguabadh às" msgid "Are you sure?" msgstr "A bheil thu cinnteach?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Sguab às na %(verbose_name_plural)s a chaidh a thaghadh" - msgid "Administration" msgstr "Rianachd" @@ -71,6 +71,12 @@ msgstr "Gun cheann-là" msgid "Has date" msgstr "Tha ceann-là aige" +msgid "Empty" +msgstr "Falamh" + +msgid "Not empty" +msgstr "Neo-fhalamh" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -345,6 +351,19 @@ msgstr "Tagh a h-uile %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Falamhaich an taghadh" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modailean ann an aplacaid %(name)s" + +msgid "Add" +msgstr "Cuir ris" + +msgid "View" +msgstr "Seall" + +msgid "You don’t have permission to view or edit anything." +msgstr "Chan eil cead agad gus dad a shealltainn no a dheasachadh." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -395,6 +414,9 @@ msgstr "Seall e air an làrach" msgid "Filter" msgstr "Criathraich" +msgid "Clear all filters" +msgstr "Falamhaich gach crithrag" + msgid "Remove from sorting" msgstr "Thoir air falbh on t-seòrsachadh" @@ -474,9 +496,6 @@ msgstr "" "sguabadh às? Thèid a h-uile oibseact seo ’s na nithean dàimheach aca a " "sguabadh às:" -msgid "View" -msgstr "Seall" - msgid "Delete?" msgstr "A bheil thu airson a sguabadh às?" @@ -487,16 +506,6 @@ msgstr " le %(filter_title)s " msgid "Summary" msgstr "Gearr-chunntas" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modailean ann an aplacaid %(name)s" - -msgid "Add" -msgstr "Cuir ris" - -msgid "You don’t have permission to view or edit anything." -msgstr "Chan eil cead agad gus dad a shealltainn no a dheasachadh." - msgid "Recent actions" msgstr "Gnìomhan o chionn goirid" @@ -530,6 +539,9 @@ msgid "Forgotten your password or username?" msgstr "" "An do dhìochuimhnich thu am facal-faire no an t-ainm-cleachdaiche agad?" +msgid "Toggle navigation" +msgstr "Toglaich an t-seòladaireachd" + msgid "Date/time" msgstr "Ceann-là ’s àm" diff --git a/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.mo index e7c0103c2285..db338a43071e 100644 Binary files a/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.po index f198aa452e31..17b7a767e5ed 100644 --- a/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/gd/LC_MESSAGES/djangojs.po @@ -3,13 +3,14 @@ # Translators: # GunChleoc, 2015-2016 # GunChleoc, 2015 +# GunChleoc, 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-22 17:29+0000\n" -"Last-Translator: GunChleoc\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 11:28+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" "MIME-Version: 1.0\n" @@ -89,8 +90,8 @@ msgstr "" "shàbhaladh air chall." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Thagh thu gnìomh ach cha do shàbhail thu na dh’atharraich thu ann an " @@ -98,8 +99,8 @@ msgstr "" "tu an gnìomh a ruith a-rithist." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Thagh thu gnìomh agus cha do rinn thu atharrachadh air ran fa leth sam bith. " @@ -202,6 +203,54 @@ msgstr "An t-Samhain" msgid "December" msgstr "An Dùbhlachd" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "" + msgctxt "one letter Sunday" msgid "S" msgstr "Dò" diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo index 6803b9cf7592..49935c8147c6 100644 Binary files a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.po b/django/contrib/admin/locale/he/LC_MESSAGES/django.po index e5315484b917..f7f8889ac432 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/he/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Alex Gaynor , 2011 +# 534b44a19bf18d20b71ecc4eb77c572f_db336e9 , 2011 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2015,2017,2019 +# Meir Kriheli , 2011-2015,2017,2019-2020 +# Yaron Shahrabani , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-03-19 16:40+0000\n" -"Last-Translator: Meir Kriheli \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-11-12 12:52+0000\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,6 +20,10 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % " "1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "מחק %(verbose_name_plural)s שנבחרו" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s נמחקו בהצלחה." @@ -30,10 +35,6 @@ msgstr "לא ניתן למחוק %(name)s" msgid "Are you sure?" msgstr "האם את/ה בטוח/ה ?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "מחק %(verbose_name_plural)s שנבחרו" - msgid "Administration" msgstr "ניהול" @@ -70,6 +71,12 @@ msgstr "ללא תאריך" msgid "Has date" msgstr "עם תאריך" +msgid "Empty" +msgstr "ריק" + +msgid "Not empty" +msgstr "לא ריק" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -127,23 +134,23 @@ msgid "log entries" msgstr "רישומי יומן" #, python-format -msgid "Added \"%(object)s\"." -msgstr "בוצעה הוספת \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "„%(object)s” נוסף." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "בוצע שינוי \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "בוצעה מחיקת \"%(object)s\"." +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "אובייקט LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "בוצעה הוספת {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "נוסף." @@ -152,16 +159,16 @@ msgid "and" msgstr "ו" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "בוצע שינוי {fields} עבור {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "" #, python-brace-format msgid "Changed {fields}." msgstr " {fields} שונו." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "בוצעה מחיקת {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "אף שדה לא השתנה." @@ -169,43 +176,39 @@ msgstr "אף שדה לא השתנה." msgid "None" msgstr "ללא" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "יש להחזיק \"Control\" או \"Command\" במק, כדי לבחור יותר מאחד." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה." +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "ניתן לערוך שוב מתחת." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." -msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה. ניתן להוסיף עוד {name} מתחת.." +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "עדכון {name} \"{obj}\" " +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה. ניתן לערוך שוב מתחת." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "עדכון {name} \"{obj}\" בוצע בהצלחה. ניתן להוסיף עוד {name} מתחת." +msgstr "" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "שינוי {name} \"{obj}\" בוצע בהצלחה." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -216,12 +219,12 @@ msgid "No action selected." msgstr "לא נבחרה פעולה." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s עם ID \"%(key)s\" לא במצאי. אולי זה נמחק?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -295,8 +298,8 @@ msgstr "ניהול %(app)s" msgid "Page not found" msgstr "דף לא קיים" -msgid "We're sorry, but the requested page could not be found." -msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש." +msgid "We’re sorry, but the requested page could not be found." +msgstr "אנו מתנצלים, העמוד המבוקש אינו קיים." msgid "Home" msgstr "דף הבית" @@ -311,10 +314,9 @@ msgid "Server Error (500)" msgstr "שגיאת שרת (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך." msgid "Run the selected action" msgstr "הפעל את הפעולה שבחרת בה." @@ -332,12 +334,25 @@ msgstr "בחירת כל %(total_count)s ה־%(module_name)s" msgid "Clear selection" msgstr "איפוס בחירה" +#, python-format +msgid "Models in the %(name)s application" +msgstr "מודלים ביישום %(name)s" + +msgid "Add" +msgstr "הוספה" + +msgid "View" +msgstr "צפיה" + +msgid "You don’t have permission to view or edit anything." +msgstr "אין לך כלל הרשאות צפיה או עריכה." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות " -"עבור המשתמש." +"ראשית יש להזין שם משתמש וססמה. לאחר מכן ניתן יהיה לערוך אפשרויות משתמש " +"נוספות." msgid "Enter a username and password." msgstr "נא לשים שם משתמש וסיסמה." @@ -380,6 +395,9 @@ msgstr "צפיה באתר" msgid "Filter" msgstr "סינון" +msgid "Clear all filters" +msgstr "ניקוי כל הסינונים" + msgid "Remove from sorting" msgstr "הסרה ממיון" @@ -421,8 +439,8 @@ msgstr "" msgid "Objects" msgstr "אובייקטים" -msgid "Yes, I'm sure" -msgstr "כן, אני בטוח/ה" +msgid "Yes, I’m sure" +msgstr "כן, בבטחה" msgid "No, take me back" msgstr "לא, קח אותי חזרה." @@ -455,9 +473,6 @@ msgstr "" "האם אתה בטוח שאתה רוצה למחוק את ה%(objects_name)s הנבחר? כל האובייקטים הבאים " "ופריטים הקשורים להם יימחקו:" -msgid "View" -msgstr "צפיה" - msgid "Delete?" msgstr "מחיקה ?" @@ -468,16 +483,6 @@ msgstr " לפי %(filter_title)s " msgid "Summary" msgstr "סיכום" -#, python-format -msgid "Models in the %(name)s application" -msgstr "מודלים ביישום %(name)s" - -msgid "Add" -msgstr "הוספה" - -msgid "You don't have permission to view or edit anything." -msgstr "אין לך הרשאות לצפיה או עריכה." - msgid "Recent actions" msgstr "פעולות אחרונות" @@ -491,12 +496,12 @@ msgid "Unknown content" msgstr "תוכן לא ידוע" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים " -"המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים." +"משהו שגוי בהתקנת בסיס הנתונים שלך. יש לוודא יצירת הטבלאות המתאימות וקיום " +"הרשאות קריאה על בסיס הנתונים עבור המשתמש המתאים." #, python-format msgid "" @@ -509,6 +514,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "שכחת את שם המשתמש והסיסמה שלך ?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "תאריך/שעה" @@ -519,10 +527,9 @@ msgid "Action" msgstr "פעולה" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." -msgstr "" -"לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו." +msgstr "לאובייקט זה אין היסטוריית שינויים. כנראה לא נוסף דרך ממשק הניהול." msgid "Show all" msgstr "הצג הכל" @@ -588,11 +595,11 @@ msgid "Your password was changed." msgstr "סיסמתך שונתה." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"נא להזין את סיסמתך הישנה, לצרכי אבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי " -"שנוכל לוודא שהקלדת אותה כראוי." +"נא להזין את הססמה הישנה שלך, למען האבטחה, ולאחר מכן את הססמה החדשה שלך " +"פעמיים כדי שנוכל לוודא שהקלדת אותה נכון." msgid "Change my password" msgstr "שנה את סיסמתי" @@ -625,18 +632,18 @@ msgstr "" "חדש." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"שלחנו אליך דואר אלקטרוני עם הוראות לקביעת הסיסמה, אם קיים חשבון עם כתובת " -"הדואר שהזנת. ההודעה אמור להגיע בקרוב." +"שלחנו לך הוראות לקביעת הססמה, בהנחה שקיים חשבון עם כתובת הדואר האלקטרוני " +"שהזנת. ההוראות אמורות להתקבל בקרוב." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"אם הדוא\"ל לא הגיע, נא לוודא שהזנת כתובת נכונה בעת הרישום ולבדוק את תיקיית " -"דואר הזבל." +"אם לא קיבלת דואר אלקטרוני, נא לוודא שהזנת את הכתובת שנרשמת עימה ושההודעה לא " +"נחתה בתיקיית דואר הזבל." #, python-format msgid "" @@ -649,8 +656,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "נא להגיע לעמוד הבא ולבחור סיסמה חדשה:" -msgid "Your username, in case you've forgotten:" -msgstr "שם המשתמש שלך, במקרה ששכחת:" +msgid "Your username, in case you’ve forgotten:" +msgstr "שם המשתמש שלך במקרה ושכחת:" msgid "Thanks for using our site!" msgstr "תודה על השימוש באתר שלנו!" @@ -660,11 +667,11 @@ msgid "The %(site_name)s team" msgstr "צוות %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת " -"סיסמה חדשה." +"שכחת את הססמה שלך? נא להזין את כתובת הדואר האלקטרוני מתחת ואנו נשלח הוראות " +"לקביעת ססמה חדשה." msgid "Email address:" msgstr "כתובת דוא\"ל:" diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo index fe37ec5a8339..56ec2380ea73 100644 Binary files a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po index 43eee285656e..3d94448d387f 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Alex Gaynor , 2012 +# 534b44a19bf18d20b71ecc4eb77c572f_db336e9 , 2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2012,2014-2015,2017 +# Meir Kriheli , 2011-2012,2014-2015,2017,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-08-01 18:00+0000\n" "Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" @@ -85,20 +85,20 @@ msgstr "" "נשמרו יאבדו." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"בחרת פעולה, אבל עוד לא שמרת את השינויים לשדות בודדים. אנא לחץ על אישור כדי " +"בחרת פעולה, אך לא שמרת עדיין את השינויים לשדות בודדים. נא ללחוץ על אישור כדי " "לשמור. יהיה עליך להפעיל את הפעולה עוד פעם." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"בחרת פעולה, ולא עשיתה שינויימ על שדות. אתה כנראה מחפש את הכפתור ללכת במקום " -"הכפתור לשמור." +"בחרת פעולה, אך לא ביצעת שינויים בשדות. כנראה חיפשת את כפתור בצע במקום כפתור " +"שמירה." msgid "Now" msgstr "כעת" diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo index 9bbaf7bf3a9f..3cb66b60a122 100644 Binary files a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po index 2f1eb4141aa0..31c4a76378e8 100644 --- a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2019 +# Michael Wolf , 2016-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-23 09:33+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-21 12:57+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -69,6 +69,12 @@ msgstr "Žadyn datum" msgid "Has date" msgstr "Ma datum" +msgid "Empty" +msgstr "Prózdny" + +msgid "Not empty" +msgstr "Njeprózdny" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -333,6 +339,19 @@ msgstr "Wubjerće wšě %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Wuběr wotstronić" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modele w nałoženju %(name)s" + +msgid "Add" +msgstr "Přidać" + +msgid "View" +msgstr "Pokazać" + +msgid "You don’t have permission to view or edit anything." +msgstr "Nimaće prawo něšto pokazać abo wobdźěłać." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -381,6 +400,9 @@ msgstr "Na sydle pokazać" msgid "Filter" msgstr "Filtrować" +msgid "Clear all filters" +msgstr "Wšě filtry zhašeć" + msgid "Remove from sorting" msgstr "Ze sortěrowanja wotstronić" @@ -456,9 +478,6 @@ msgstr "" "Chceće woprawdźe wubrane %(objects_name)s zhašeć? Wšě slědowace objekty a " "jich přisłušne zapiski so zhašeja:" -msgid "View" -msgstr "Pokazać" - msgid "Delete?" msgstr "Zhašeć?" @@ -469,16 +488,6 @@ msgstr "Po %(filter_title)s " msgid "Summary" msgstr "Zjeće" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modele w nałoženju %(name)s" - -msgid "Add" -msgstr "Přidać" - -msgid "You don’t have permission to view or edit anything." -msgstr "Nimaće prawo něšto pokazać abo wobdźěłać." - msgid "Recent actions" msgstr "Najnowše akcije" @@ -511,6 +520,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Sće swoje hesło abo wužiwarske mjeno zabył?" +msgid "Toggle navigation" +msgstr "Nawigaciju přepinać" + msgid "Date/time" msgstr "Datum/čas" diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.mo index 48ff13aed2bb..562a4d4b002f 100644 Binary files a/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.po index e33aed632acc..9408a8c83568 100644 --- a/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/hsb/LC_MESSAGES/djangojs.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016 +# Michael Wolf , 2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 00:02+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 21:45+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -87,8 +87,8 @@ msgstr "" "wuwjedźeće, so waše njeskładowane změny zhubja." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Sće akciju wubrał, ale njejsće hišće swoje změny na jednoliwych polach " @@ -96,8 +96,8 @@ msgstr "" "znowa wuwjesć." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Sće akciju wubrał, a njejsće žane změny na jednotliwych polach přewjedł. " @@ -191,6 +191,54 @@ msgstr "Nowember" msgid "December" msgstr "December" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan." + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb." + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Měr." + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Apr." + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Meja" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun." + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul." + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Awg." + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sep." + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Okt." + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Now." + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dec." + msgctxt "one letter Sunday" msgid "S" msgstr "Nj" diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo index 780ec2e8ba24..972ab3dee7d8 100644 Binary files a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po index 9d53aaf67cc7..16495647e3a5 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Ádám Krizsány , 2015 # Akos Zsolt Hochrein , 2018 -# András Veres-Szentkirályi, 2016,2018-2019 +# András Veres-Szentkirályi, 2016,2018-2020 # Istvan Farkas , 2019 # Jannis Leidel , 2011 # János R, 2017 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-18 09:25+0000\n" -"Last-Translator: Istvan Farkas \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-20 07:29+0000\n" +"Last-Translator: András Veres-Szentkirályi\n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -77,6 +77,12 @@ msgstr "Nincs dátuma" msgid "Has date" msgstr "Van dátuma" +msgid "Empty" +msgstr "Üres" + +msgid "Not empty" +msgstr "Nem üres" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -341,6 +347,19 @@ msgstr "Az összes %(module_name)s kiválasztása, összesen %(total_count)s db" msgid "Clear selection" msgstr "Kiválasztás törlése" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s alkalmazásban elérhető modellek." + +msgid "Add" +msgstr "Új" + +msgid "View" +msgstr "Megtekintés" + +msgid "You don’t have permission to view or edit anything." +msgstr "Jelenleg nincs jogosultsága bármit megtekinteni vagy szerkeszteni." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -390,6 +409,9 @@ msgstr "Megtekintés a honlapon" msgid "Filter" msgstr "Szűrő" +msgid "Clear all filters" +msgstr "Összes szűrő törlése" + msgid "Remove from sorting" msgstr "Eltávolítás a rendezésből" @@ -467,9 +489,6 @@ msgstr "" "Biztosan törölni akarja a kiválasztott %(objects_name)s objektumokat? Minden " "alábbi objektum, és a hozzájuk kapcsolódóak is törlésre kerülnek:" -msgid "View" -msgstr "Megtekintés" - msgid "Delete?" msgstr "Törli?" @@ -480,16 +499,6 @@ msgstr " %(filter_title)s szerint " msgid "Summary" msgstr "Összegzés" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s alkalmazásban elérhető modellek." - -msgid "Add" -msgstr "Új" - -msgid "You don’t have permission to view or edit anything." -msgstr "Jelenleg nincs jogosultsága bármit megtekinteni vagy szerkeszteni." - msgid "Recent actions" msgstr "Legutóbbi műveletek" @@ -522,6 +531,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Elfelejtette jelszavát vagy felhasználónevét?" +msgid "Toggle navigation" +msgstr "Navigáció megjelenítése/elrejtése" + msgid "Date/time" msgstr "Dátum/idő" diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo index fd76d35a639d..2cc3c16f0dbe 100644 Binary files a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po index 5642e4069e9b..1cd0459b8054 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po @@ -1,19 +1,19 @@ # This file is distributed under the same license as the Django package. # # Translators: -# András Veres-Szentkirályi, 2016 +# András Veres-Szentkirályi, 2016,2020-2021 # Attila Nagy <>, 2012 # Jannis Leidel , 2011 -# János R (Hangya), 2011 +# János R, 2011 # Máté Őry , 2012 # Szilveszter Farkas , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: János R (Hangya)\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-01 15:16+0000\n" +"Last-Translator: András Veres-Szentkirályi\n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -86,8 +86,8 @@ msgstr "" "futtat egy műveletet, akkor a módosítások elvesznek." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Kiválasztott egy műveletet, de nem mentette az egyes mezőkhöz kapcsolódó " @@ -95,8 +95,8 @@ msgstr "" "műveletet." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Kiválasztott egy műveletet, és nem módosított egyetlen mezőt sem. " @@ -186,6 +186,54 @@ msgstr "november" msgid "December" msgstr "december" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "már" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "ápr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "máj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "jún" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "júl" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "aug" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "szep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "dec" + msgctxt "one letter Sunday" msgid "S" msgstr "V" diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo index 8b739391a295..7d56210e919e 100644 Binary files a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.po b/django/contrib/admin/locale/id/LC_MESSAGES/django.po index 984e0a344ae0..3fe3a154767e 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # Fery Setiawan , 2015-2019 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi , 2016,2020 # rodin , 2011-2013 # rodin , 2013-2017 # sage , 2019 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-18 13:06+0000\n" -"Last-Translator: sage \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-24 09:53+0000\n" +"Last-Translator: oon arfiandwi \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -25,6 +25,10 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Hapus %(verbose_name_plural)s yang dipilih" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sukses menghapus %(count)d %(items)s." @@ -36,10 +40,6 @@ msgstr "Tidak dapat menghapus %(name)s" msgid "Are you sure?" msgstr "Yakin?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Hapus %(verbose_name_plural)s yang dipilih" - msgid "Administration" msgstr "Administrasi" @@ -76,6 +76,12 @@ msgstr "Tidak ada tanggal" msgid "Has date" msgstr "Ada tanggal" +msgid "Empty" +msgstr "Kosong" + +msgid "Not empty" +msgstr "Tidak kosong" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -336,6 +342,19 @@ msgstr "Pilih seluruh %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Bersihkan pilihan" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Model pada aplikasi %(name)s" + +msgid "Add" +msgstr "Tambah" + +msgid "View" +msgstr "Lihat" + +msgid "You don’t have permission to view or edit anything." +msgstr "Anda tidak memiliki izin untuk melihat atau mengedit apa pun." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -384,6 +403,9 @@ msgstr "Lihat di situs" msgid "Filter" msgstr "Filter" +msgid "Clear all filters" +msgstr "Hapus semua penyaringan" + msgid "Remove from sorting" msgstr "Dihapus dari pengurutan" @@ -461,9 +483,6 @@ msgstr "" "Yakin akan menghapus %(objects_name)s terpilih? Semua objek berikut beserta " "objek terkait juga akan dihapus:" -msgid "View" -msgstr "Lihat" - msgid "Delete?" msgstr "Hapus?" @@ -474,16 +493,6 @@ msgstr " Berdasarkan %(filter_title)s " msgid "Summary" msgstr "Ringkasan" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Model pada aplikasi %(name)s" - -msgid "Add" -msgstr "Tambah" - -msgid "You don’t have permission to view or edit anything." -msgstr "Anda tidak memiliki izin untuk melihat atau mengedit apa pun." - msgid "Recent actions" msgstr "Tindakan terbaru" @@ -515,6 +524,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Lupa nama pengguna atau sandi?" +msgid "Toggle navigation" +msgstr "Alihkan navigasi" + msgid "Date/time" msgstr "Tanggal/waktu" diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo index 6b7bff39c635..9aa68a75493b 100644 Binary files a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po index aa096df9e02d..125897b7a73f 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po @@ -3,15 +3,16 @@ # Translators: # Fery Setiawan , 2015-2016 # Jannis Leidel , 2011 +# oon arfiandwi , 2020 # rodin , 2011-2012 # rodin , 2014,2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: rodin \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 11:28+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -85,21 +86,21 @@ msgstr "" "telah dilakukan akan hilang." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Anda telah memilih sebuah aksi, tetapi belum menyimpan perubahan ke bidang " -"yang ada. Klik OK untuk menyimpan perubahan ini. Anda akan perlu mengulangi " -"aksi tersebut kembali." +"Anda telah memilih tindakan, tetapi Anda belum menyimpan perubahan ke masing-" +"masing bidang. Silakan klik OK untuk menyimpan. Anda harus menjalankan " +"kembali tindakan tersebut." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Anda telah memilih sebuah aksi, tetapi belum mengubah bidang apapun. " -"Kemungkinan Anda mencari tombol Buka dan bukan tombol Simpan." +"Anda telah memilih tindakan, dan Anda belum membuat perubahan apa pun di " +"setiap bidang. Anda mungkin mencari tombol Buka daripada tombol Simpan." msgid "Now" msgstr "Sekarang" @@ -183,6 +184,54 @@ msgstr "November" msgid "December" msgstr "Desember" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "" + msgctxt "one letter Sunday" msgid "S" msgstr "M" diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo index 0f8eea9a90e0..553296860530 100644 Binary files a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.po b/django/contrib/admin/locale/is/LC_MESSAGES/django.po index ea97dd69aac9..868a4528c657 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/is/LC_MESSAGES/django.po @@ -4,15 +4,15 @@ # Dagur Ammendrup , 2019 # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 -# Kári Tristan Helgason , 2013 -# Thordur Sigurdsson , 2016-2019 +# 479d446b5da12875beba10cac54e9faf_a7ca1e7 , 2013 +# Thordur Sigurdsson , 2016-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-20 05:02+0000\n" -"Last-Translator: Thordur Sigurdsson \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -72,6 +72,12 @@ msgstr "Engin dagsetning" msgid "Has date" msgstr "Hefur dagsetningu" +msgid "Empty" +msgstr "Tómt" + +msgid "Not empty" +msgstr "Ekki tómt" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -333,6 +339,19 @@ msgstr "Velja alla %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Hreinsa val" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Módel í appinu %(name)s" + +msgid "Add" +msgstr "Bæta við" + +msgid "View" +msgstr "Skoða" + +msgid "You don’t have permission to view or edit anything." +msgstr "Þú hefur ekki réttindi til að skoða eða breyta neinu." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -381,6 +400,9 @@ msgstr "Skoða á vef" msgid "Filter" msgstr "Sía" +msgid "Clear all filters" +msgstr "Hreinsa allar síur" + msgid "Remove from sorting" msgstr "Taka úr röðun" @@ -456,9 +478,6 @@ msgstr "" "Ertu viss um að þú viljir eyða völdum %(objects_name)s? Öllum eftirtöldum " "hlutum og skyldum hlutum verður eytt:" -msgid "View" -msgstr "Skoða" - msgid "Delete?" msgstr "Eyða?" @@ -469,16 +488,6 @@ msgstr " Eftir %(filter_title)s " msgid "Summary" msgstr "Samantekt" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Módel í appinu %(name)s" - -msgid "Add" -msgstr "Bæta við" - -msgid "You don’t have permission to view or edit anything." -msgstr "Þú hefur ekki réttindi til að skoða eða breyta neinu." - msgid "Recent actions" msgstr "Nýlegar aðgerðir" @@ -510,6 +519,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Gleymt notandanafn eða lykilorð?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Dagsetning/tími" diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo index 3f47b7b22ad2..5b06183e088a 100644 Binary files a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po index 847c39cea442..480c55096260 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po @@ -5,14 +5,14 @@ # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 # Matt R, 2018 -# Thordur Sigurdsson , 2016-2017 +# Thordur Sigurdsson , 2016-2017,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2018-05-18 14:09+0000\n" -"Last-Translator: Matt R\n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-07-07 22:53+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -85,16 +85,16 @@ msgstr "" "ekki verða vistaðar." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Þú hefur valið aðgerð en hefur ekki vistað breytingar á reitum. Vinsamlegast " "veldu 'Í lagi' til að vista. Þú þarft að endurkeyra aðgerðina." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Þú hefur valið aðgerð en hefur ekki gert breytingar á reitum. Þú ert líklega " diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo index 72b2ffa20f79..099be53f1108 100644 Binary files a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.po b/django/contrib/admin/locale/it/LC_MESSAGES/django.po index d47979e0a0c2..98e90bc677da 100644 --- a/django/contrib/admin/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/it/LC_MESSAGES/django.po @@ -1,25 +1,25 @@ # This file is distributed under the same license as the Django package. # # Translators: -# AndreiCR , 2017 +# 0d21a39e384d88c2313b89b5042c04cb, 2017 # Carlo Miron , 2018-2019 # Denis Darii , 2011 # Flavio Curella , 2013 # Jannis Leidel , 2011 # Luciano De Falco Alfano, 2016 # Marco Bonetti, 2014 -# Mirco Grillo , 2018 +# Mirco Grillo , 2018,2020 # Nicola Larosa , 2013 -# palmux , 2014-2015 +# palmux , 2014-2015,2021 # Mattia Procopio , 2015 # Stefano Brentegani , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 10:24+0000\n" -"Last-Translator: Carlo Miron \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 15:53+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -28,6 +28,10 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Cancella %(verbose_name_plural)s selezionati" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Cancellati/e con successo %(count)d %(items)s." @@ -39,10 +43,6 @@ msgstr "Impossibile cancellare %(name)s " msgid "Are you sure?" msgstr "Confermi?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Cancella %(verbose_name_plural)s selezionati" - msgid "Administration" msgstr "Amministrazione" @@ -79,6 +79,12 @@ msgstr "Senza data" msgid "Has date" msgstr "Ha la data" +msgid "Empty" +msgstr "Vuoto" + +msgid "Not empty" +msgstr "Non vuoto" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -136,22 +142,22 @@ msgid "log entries" msgstr "voci di log" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Aggiunto \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "\"%(object)s\" aggiunto." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Cambiato \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "%(object)s%(changes)s modificati" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Cancellato \"%(object)s .\"" +msgid "Deleted “%(object)s.”" +msgstr "\"%(object)s\" cancellato." msgid "LogEntry Object" msgstr "Oggetto LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "Aggiunto {name} \"{object}\"." msgid "Added." @@ -161,7 +167,7 @@ msgid "and" msgstr "e" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "Modificati {fields} per {name} \"{object}\"." #, python-brace-format @@ -169,7 +175,7 @@ msgid "Changed {fields}." msgstr "Modificati {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "Eliminato {name} \"{object}\"." msgid "No fields changed." @@ -178,13 +184,12 @@ msgstr "Nessun campo modificato." msgid "None" msgstr "Nessuno" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "Il {name} \"{obj}\" è stato aggiunto con successo." msgid "You may edit it again below." @@ -192,36 +197,34 @@ msgstr "Puoi modificarlo di nuovo qui sotto." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" "Il {name} \"{obj}\" è stato aggiunto con successo. Puoi aggiungere un altro " "{name} qui sotto." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" "Il {name} \"{obj}\" è stato modificato con successo. Puoi modificarlo " "nuovamente qui sotto." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" "Il {name} \"{obj}\" è stato aggiunto con successo. Puoi modificarlo " "nuovamente qui sotto." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" "Il {name} \"{obj}\" è stato modificato con successo. Puoi aggiungere un " "altro {name} qui sotto." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "Il {name} \"{obj}\" è stato modificato con successo." msgid "" @@ -235,13 +238,13 @@ msgid "No action selected." msgstr "Nessuna azione selezionata." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "%(name)s \"%(obj)s\" cancellato correttamente." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -"%(name)s con ID \"%(key)s\" non esiste. Probabilmente sarà stato cancellato?" +"%(name)s con ID \"%(key)s\" non esiste. Probabilmente è stato cancellato?" #, python-format msgid "Add %s" @@ -311,7 +314,7 @@ msgstr "Amministrazione %(app)s" msgid "Page not found" msgstr "Pagina non trovata" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "Spiacenti, ma la pagina richiesta non è stata trovata." msgid "Home" @@ -327,7 +330,7 @@ msgid "Server Error (500)" msgstr "Errore del server (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "Si è verificato un errore. Gli amministratori del sito ne sono stati " @@ -350,8 +353,21 @@ msgstr "Seleziona tutti %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Annulla la selezione" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelli nell'applicazione %(name)s" + +msgid "Add" +msgstr "Aggiungi" + +msgid "View" +msgstr "Vista" + +msgid "You don’t have permission to view or edit anything." +msgstr "Non hai i permessi per visualizzare o modificare nulla." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "Prima di tutto inserisci nome utente e password. Poi potrai modificare le " @@ -399,6 +415,9 @@ msgstr "Vedi sul sito" msgid "Filter" msgstr "Filtra" +msgid "Clear all filters" +msgstr "Cancella tutti i filtri" + msgid "Remove from sorting" msgstr "Elimina dall'ordinamento" @@ -441,7 +460,7 @@ msgstr "" msgid "Objects" msgstr "Oggetti" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Sì, sono sicuro" msgid "No, take me back" @@ -476,9 +495,6 @@ msgstr "" "Confermi la cancellazione dell'elemento %(objects_name)s selezionato? " "Saranno rimossi tutti i seguenti oggetti e le loro voci correlate:" -msgid "View" -msgstr "Vista" - msgid "Delete?" msgstr "Cancellare?" @@ -489,16 +505,6 @@ msgstr " Per %(filter_title)s " msgid "Summary" msgstr "Riepilogo" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelli nell'applicazione %(name)s" - -msgid "Add" -msgstr "Aggiungi" - -msgid "You don't have permission to view or edit anything." -msgstr "Non hai i permessi per visualizzare o modificare nulla" - msgid "Recent actions" msgstr "Azioni recenti" @@ -512,13 +518,13 @@ msgid "Unknown content" msgstr "Contenuto sconosciuto" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Ci sono problemi nell'installazione del database. Assicurarsi che le tabelle " -"appropriate del database siano state create, e che il database sia leggibile " -"dall'utente appropriato." +"Qualcosa non è andato a buon fine nell'installazione del database. " +"Assicurati che le tabelle del database siano state create, e che il database " +"sia leggibile dall'utente corretto." #, python-format msgid "" @@ -531,6 +537,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Hai dimenticato la password o lo username?" +msgid "Toggle navigation" +msgstr "Abilita/disabilita navigazione" + msgid "Date/time" msgstr "Data/ora" @@ -541,7 +550,7 @@ msgid "Action" msgstr "Azione" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "Questo oggetto non ha cambiamenti registrati. Probabilmente non è stato " @@ -609,7 +618,7 @@ msgid "Your password was changed." msgstr "La tua password è stata cambiata." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" "Inserisci la password attuale, per ragioni di sicurezza, e poi la nuova " @@ -648,15 +657,14 @@ msgstr "" "era già stato usato. Richiedi una nuova reimpostazione della password." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Abbiamo inviato istruzioni per impostare la password all'indirizzo email che " -"hai indicato. Dovresti riceverle a breve a patto che l'indirizzo che hai " -"inserito sia valido." +"Abbiamo inviato istruzioni per impostare la password, se esiste un account " +"valido all'indirizzo email che hai indicato. Dovresti riceverle a breve." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "Se non ricevi un messaggio email, accertati di aver inserito l'indirizzo con " @@ -673,7 +681,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Vai alla pagina seguente e scegli una nuova password:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:" msgid "Thanks for using our site!" @@ -684,11 +692,11 @@ msgid "The %(site_name)s team" msgstr "Il team di %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti " -"invieremo istruzioni per impostarne una nuova." +"Password dimenticata? Inserisci il tuo indirizzo email qui sotto e ti " +"invieremo le istruzioni per impostarne una nuova." msgid "Email address:" msgstr "Indirizzo email:" diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo index 85f5ce8e858a..dfa33eb7b99f 100644 Binary files a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po index baa69c6b88d9..1ebba618bcb2 100644 --- a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po @@ -5,15 +5,16 @@ # Jannis Leidel , 2011 # Luciano De Falco Alfano, 2016 # Marco Bonetti, 2014 +# Mirco Grillo , 2020 # Nicola Larosa , 2011-2012 -# palmux , 2015 +# palmux , 2015,2021 # Stefano Brentegani , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 15:58+0000\n" "Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" @@ -89,20 +90,20 @@ msgstr "" "un'azione, le modifiche non salvate andranno perse." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Hai selezionato un'azione, ma non hai ancora salvato le modifiche apportate " -"a campi singoli. Fai clic su OK per salvare. Poi dovrai ri-eseguire l'azione." +"a campi singoli. Fai clic su OK per salvare. Poi dovrai rieseguire l'azione." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Hai selezionato un'azione, e non hai ancora apportato alcuna modifica a " -"campi singoli. Probabilmente stai cercando il pulsante Go, invece di Save." +"Hai selezionato un'azione e non hai ancora apportato alcuna modifica ai " +"campi singoli. Probabilmente stai cercando il pulsante Vai, invece di Salva." msgid "Now" msgstr "Adesso" @@ -188,6 +189,54 @@ msgstr "Novembre" msgid "December" msgstr "Dicembre" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Gen" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Mag" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Giu" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Lug" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Ago" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Set" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Ott" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dic" + msgctxt "one letter Sunday" msgid "S" msgstr "D" diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo index 2a968da0922b..ceaede55a180 100644 Binary files a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po index afa002d1a49c..0775826a3bd5 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po @@ -1,19 +1,23 @@ # This file is distributed under the same license as the Django package. # # Translators: +# akiyoko , 2020 # Claude Paroz , 2016 +# GOTO Hayato , 2019 # Jannis Leidel , 2011 # Shinichi Katsumata , 2019 # Shinya Okano , 2012-2018 +# Takuro Onoue , 2020 +# Takuya N , 2020 # Tetsuya Morimoto , 2011 # 上田慶祐 , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-19 07:00+0000\n" -"Last-Translator: Shinichi Katsumata \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-08 04:30+0000\n" +"Last-Translator: Takuro Onoue \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -22,6 +26,10 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "選択された %(verbose_name_plural)s の削除" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d 個の %(items)s を削除しました。" @@ -33,10 +41,6 @@ msgstr "%(name)s が削除できません" msgid "Are you sure?" msgstr "よろしいですか？" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "選択された %(verbose_name_plural)s の削除" - msgid "Administration" msgstr "管理" @@ -73,6 +77,12 @@ msgstr "日付なし" msgid "Has date" msgstr "日付あり" +msgid "Empty" +msgstr "空" + +msgid "Not empty" +msgstr "空でない" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -130,23 +140,23 @@ msgid "log entries" msgstr "ログエントリー" #, python-format -msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" を追加しました。" +msgid "Added “%(object)s”." +msgstr "“%(object)s” を追加しました。" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "\"%(object)s\" を変更しました - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "“%(object)s” を変更しました — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "\"%(object)s\"を削除しました。" +msgid "Deleted “%(object)s.”" +msgstr "“%(object)s” を削除しました。" msgid "LogEntry Object" msgstr "ログエントリー オブジェクト" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "{name} \"{object}\" を追加しました。" +msgid "Added {name} “{object}”." +msgstr "{name} “{object}” を追加しました。" msgid "Added." msgstr "追加されました。" @@ -155,16 +165,16 @@ msgid "and" msgstr "と" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{name} \"{object}\" の {fields} を変更しました。" +msgid "Changed {fields} for {name} “{object}”." +msgstr "{name} “{object}” の {fields} を変更しました。" #, python-brace-format msgid "Changed {fields}." msgstr "{fields} を変更しました。" #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "{name} \"{object}\" を削除しました。" +msgid "Deleted {name} “{object}”." +msgstr "{name} “{object}” を削除しました。" msgid "No fields changed." msgstr "変更はありませんでした。" @@ -172,44 +182,41 @@ msgstr "変更はありませんでした。" msgid "None" msgstr "None" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"複数選択するときには Control キーを押したまま選択してください。Mac では " +"複数選択するときには Control キーを押したまま選択してください。Mac は " "Command キーを使ってください" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" を追加しました。" +msgid "The {name} “{obj}” was added successfully." +msgstr "{name} “{obj}” を追加しました。" msgid "You may edit it again below." msgstr "以下で再度編集できます。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." -msgstr "{name} \"{obj}\" を追加しました。 別の {name} を以下から追加できます。" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "{name} “{obj}” を追加しました。別の {name} を以下から追加できます。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "{name} \"{obj}\" を変更しました。 以下から再度編集できます。" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "{name} “{obj}” を変更しました。以下から再度編集できます。" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "{name} \"{obj}\" を追加しました。続けて編集できます。" +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "{name} “{obj}” を追加しました。続けて編集できます。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "{name} \"{obj}\" を変更しました。 別の {name} を以下から追加できます。" +msgstr "{name} “{obj}” を変更しました。 別の {name} を以下から追加できます。" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" を変更しました。" +msgid "The {name} “{obj}” was changed successfully." +msgstr "{name} “{obj}” を変更しました。" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -221,13 +228,13 @@ msgid "No action selected." msgstr "操作が選択されていません。" #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" を削除しました。" +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "%(name)s “%(obj)s” を削除しました。" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -"ID \"%(key)s\" の%(name)sは見つかりませんでした。削除された可能性があります。" +"ID “%(key)s” の%(name)sは見つかりませんでした。削除された可能性があります。" #, python-format msgid "Add %s" @@ -295,7 +302,7 @@ msgstr "%(app)s 管理" msgid "Page not found" msgstr "ページが見つかりません" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。" msgid "Home" @@ -311,7 +318,7 @@ msgid "Server Error (500)" msgstr "サーバーエラー (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "エラーが発生しました。サイト管理者にメールで報告されたので、修正されるまでし" @@ -333,8 +340,21 @@ msgstr "%(total_count)s個ある%(module_name)s を全て選択" msgid "Clear selection" msgstr "選択を解除" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s アプリケーション内のモデル" + +msgid "Add" +msgstr "追加" + +msgid "View" +msgstr "表示" + +msgid "You don’t have permission to view or edit anything." +msgstr "表示または変更のためのパーミッションがありません。" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "まずユーザー名とパスワードを登録してください。その後詳細情報が編集可能になり" @@ -382,6 +402,9 @@ msgstr "サイト上で表示" msgid "Filter" msgstr "フィルター" +msgid "Clear all filters" +msgstr "全てのフィルターを解除" + msgid "Remove from sorting" msgstr "ソート条件から外します" @@ -424,8 +447,8 @@ msgstr "" msgid "Objects" msgstr "オブジェクト" -msgid "Yes, I'm sure" -msgstr "はい" +msgid "Yes, I’m sure" +msgstr "はい、大丈夫です" msgid "No, take me back" msgstr "戻る" @@ -458,9 +481,6 @@ msgstr "" "本当に選択した %(objects_name)s を削除しますか？ 以下の全てのオブジェクトと関" "連する要素が削除されます:" -msgid "View" -msgstr "表示" - msgid "Delete?" msgstr "削除しますか?" @@ -471,16 +491,6 @@ msgstr "%(filter_title)s で絞り込む" msgid "Summary" msgstr "概要" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s アプリケーション内のモデル" - -msgid "Add" -msgstr "追加" - -msgid "You don't have permission to view or edit anything." -msgstr "表示または変更のためのパーミッションがありません。" - msgid "Recent actions" msgstr "最近行った操作" @@ -494,12 +504,12 @@ msgid "Unknown content" msgstr "不明なコンテント" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"データベースの設定に問題があるようです。適切なテーブルが作られていること、適" -"切なユーザーでデータベースのデータを読み込めることを確認してください。" +"データベースのインストールに問題があります。適切なデータベーステーブルが作ら" +"れているか、適切なユーザーがデータベースを読み込み可能かを確認してください。" #, python-format msgid "" @@ -512,6 +522,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "パスワードまたはユーザー名を忘れましたか？" +msgid "Toggle navigation" +msgstr "ナビゲーションを切り替えます" + msgid "Date/time" msgstr "日付/時刻" @@ -522,7 +535,7 @@ msgid "Action" msgstr "操作" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "このオブジェクトには変更履歴がありません。おそらくこの管理サイトで追加したも" @@ -589,7 +602,7 @@ msgid "Your password was changed." msgstr "あなたのパスワードは変更されました" msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" "セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは正" @@ -626,14 +639,14 @@ msgstr "" "す。もう一度パスワードリセットしてください。" msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "入力されたメールアドレスを持つアカウントが存在する場合、パスワードを設定する" -"ためのメールを送信しました。すぐに受け取る必要があります。" +"ためのメールを送信しました。すぐに届くはずです。" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "メールが届かない場合は、登録したメールアドレスを入力したか確認し、スパムフォ" @@ -650,8 +663,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "次のページで新しいパスワードを選んでください:" -msgid "Your username, in case you've forgotten:" -msgstr "あなたのユーザー名 (念のため):" +msgid "Your username, in case you’ve forgotten:" +msgstr "あなたのユーザー名 (もし忘れていたら):" msgid "Thanks for using our site!" msgstr "ご利用ありがとうございました！" @@ -661,7 +674,7 @@ msgid "The %(site_name)s team" msgstr " %(site_name)s チーム" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" "パスワードを忘れましたか? メールアドレスを以下に入力すると、新しいパスワード" diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo index 24824f82dc96..3cd4e3622966 100644 Binary files a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po index 3768547cd480..65a0872b204b 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po @@ -3,13 +3,14 @@ # Translators: # Jannis Leidel , 2011 # Shinya Okano , 2012,2014-2016 +# Takuro Onoue , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Shinya Okano \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 11:28+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -81,16 +82,16 @@ msgstr "" "す。" msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "操作を選択しましたが、フィールドに未保存の変更があります。OKをクリックして保" "存してください。その後、操作を再度実行する必要があります。" msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "操作を選択しましたが、フィールドに変更はありませんでした。もしかして保存ボタ" @@ -178,6 +179,54 @@ msgstr "11月" msgid "December" msgstr "12月" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "" + msgctxt "one letter Sunday" msgid "S" msgstr "日" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo index 5e50c80fbf31..bbfe573e9bdd 100644 Binary files a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po index 7fcad066aeb0..c968af1c8cd9 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Jiyoon, Ha , 2016 +# DONGHO JEONG , 2020 # Geonho Kim / Leo Kim , 2019 # Gihun Ham , 2018 # Hang Park , 2019 @@ -9,8 +10,9 @@ # Ian Y. Choi , 2015,2019 # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jay Oh , 2020 # Le Tartuffe , 2014,2016 -# Noh Seho , 2018 +# Seho Noh , 2018 # Seacbyul Lee , 2017 # Taesik Yoon , 2015 # Yang Chan Woo , 2019 @@ -18,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-05 07:07+0000\n" -"Last-Translator: Geonho Kim / Leo Kim \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-05 05:57+0000\n" +"Last-Translator: DONGHO JEONG \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,6 +81,12 @@ msgstr "날짜 없음" msgid "Has date" msgstr "날짜 있음" +msgid "Empty" +msgstr "비어 있음" + +msgid "Not empty" +msgstr "비어 있지 않음" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -346,6 +354,19 @@ msgstr "%(total_count)s개의 %(module_name)s 모두를 선택합니다." msgid "Clear selection" msgstr "선택 해제" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s 애플리케이션의 모델" + +msgid "Add" +msgstr "추가" + +msgid "View" +msgstr "보기" + +msgid "You don’t have permission to view or edit anything." +msgstr "독자는 뷰 및 수정 권한이 없습니다." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -394,6 +415,9 @@ msgstr "사이트에서 보기" msgid "Filter" msgstr "필터" +msgid "Clear all filters" +msgstr "모든 필터 삭제" + msgid "Remove from sorting" msgstr "정렬에서 " @@ -470,9 +494,6 @@ msgstr "" "선택한 %(objects_name)s를 정말 삭제하시겠습니까? 다음의 오브젝트와 연관 아이" "템들이 모두 삭제됩니다:" -msgid "View" -msgstr "보기" - msgid "Delete?" msgstr "삭제" @@ -483,16 +504,6 @@ msgstr "%(filter_title)s (으)로" msgid "Summary" msgstr "개요" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s 애플리케이션의 모델" - -msgid "Add" -msgstr "추가" - -msgid "You don’t have permission to view or edit anything." -msgstr "독자는 뷰 및 수정 권한이 없습니다." - msgid "Recent actions" msgstr "최근 활동" @@ -525,6 +536,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "아이디 또는 비밀번호를 분실하였습니까?" +msgid "Toggle navigation" +msgstr "토글 메뉴" + msgid "Date/time" msgstr "날짜/시간" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo index 8ef689d23183..9d8de15a175b 100644 Binary files a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po index 6d52c03b99f3..9bfafc886963 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po @@ -5,15 +5,16 @@ # Hoseok Lee , 2016 # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jay Oh , 2020 # Le Tartuffe , 2014 # minsung kang, 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Hoseok Lee \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-07-04 14:16+0000\n" +"Last-Translator: Jay Oh \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,16 +85,16 @@ msgstr "" "지 않은 값들을 잃어버리게 됩니다." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "개별 필드의 값들을 저장하지 않고 액션을 선택했습니다. OK를 누르면 저장되며, " "액션을 한 번 더 실행해야 합니다." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "개별 필드에 아무런 변경이 없는 상태로 액션을 선택했습니다. 저장 버튼이 아니" diff --git a/django/contrib/admin/locale/ky/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..35be3e9dc048 Binary files /dev/null and b/django/contrib/admin/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ky/LC_MESSAGES/django.po b/django/contrib/admin/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..c26d68e35edd --- /dev/null +++ b/django/contrib/admin/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,705 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Belek , 2016 +# Chyngyz Monokbaev , 2016 +# Soyuzbek Orozbek uulu , 2020 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-11-23 00:50+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Тандалган %(verbose_name_plural)s элементтерин өчүрүү" + +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d %(items)s ийгиликтүү өчүрүлдү." + +#, python-format +msgid "Cannot delete %(name)s" +msgstr "%(name)s өчүрүү мүмкүн эмес" + +msgid "Are you sure?" +msgstr "Чечимиңиз аныкпы?" + +msgid "Administration" +msgstr "Башкаруу" + +msgid "All" +msgstr "Баары" + +msgid "Yes" +msgstr "Ооба" + +msgid "No" +msgstr "Жок" + +msgid "Unknown" +msgstr "Такталбаган" + +msgid "Any date" +msgstr "Кааалаган бир күн" + +msgid "Today" +msgstr "Бүгүн" + +msgid "Past 7 days" +msgstr "Өткөн 7 күн" + +msgid "This month" +msgstr "Бул айда" + +msgid "This year" +msgstr "Бул жылда" + +msgid "No date" +msgstr "Күн белгиленген эмес" + +msgid "Has date" +msgstr "Күн белгиленген" + +msgid "Empty" +msgstr "Бош" + +msgid "Not empty" +msgstr "Бош эмес" + +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" +"Сураныч кызматкердин %(username)s жана сыр сөзүн туура жазыңыз. Эки " +"талаага тең баш тамга же кичүү тамга менен жазганыңыз маанилүү экенин эске " +"тутуңуз." + +msgid "Action:" +msgstr "Аракет" + +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Дагы %(verbose_name)s кошуу" + +msgid "Remove" +msgstr "Алып таштоо" + +msgid "Addition" +msgstr "Кошумча" + +msgid "Change" +msgstr "Өзгөртүү" + +msgid "Deletion" +msgstr "Өчүрүү" + +msgid "action time" +msgstr "аракет убактысы" + +msgid "user" +msgstr "колдонуучу" + +msgid "content type" +msgstr "Контент тиби" + +msgid "object id" +msgstr "объекттин id-си" + +#. Translators: 'repr' means representation +#. (https://docs.python.org/library/functions.html#repr) +msgid "object repr" +msgstr "объекттин repr-и" + +msgid "action flag" +msgstr "аракет белгиси" + +msgid "change message" +msgstr "билдирүүнү өзгөртүү" + +msgid "log entry" +msgstr "Жазуу журналы" + +msgid "log entries" +msgstr "Жазуу журналдары" + +#, python-format +msgid "Added “%(object)s”." +msgstr "“%(object)s” кошулду" + +#, python-format +msgid "Changed “%(object)s” — %(changes)s" +msgstr "“%(object)s” — %(changes)s өзгөрдү" + +#, python-format +msgid "Deleted “%(object)s.”" +msgstr "“%(object)s.” өчүрүлдү" + +msgid "LogEntry Object" +msgstr "LogEntry обектиси" + +#, python-brace-format +msgid "Added {name} “{object}”." +msgstr "{name} “{object}” кошулду" + +msgid "Added." +msgstr "Кошулду." + +msgid "and" +msgstr "жана" + +#, python-brace-format +msgid "Changed {fields} for {name} “{object}”." +msgstr "{name} “{object}” үчүн {fields} өзгөртүлдү." + +#, python-brace-format +msgid "Changed {fields}." +msgstr "{fields} өзгөртүлдү." + +#, python-brace-format +msgid "Deleted {name} “{object}”." +msgstr "{name} “{object}” өчүрүлдү." + +msgid "No fields changed." +msgstr "Эч бир талаа өзгөртүлгөн жок" + +msgid "None" +msgstr "Эчбир" + +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "Көбүрөөк тандоо үчүн “CTRL”, же макбук үчүн “Cmd” кармап туруңуз." + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully." +msgstr "{name} \"{obj}\" ийгиликтүү кошулду." + +msgid "You may edit it again below." +msgstr "Сиз муну төмөндө кайра өзгөртүшүңүз мүмкүн." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "{name} \"{obj}\" ийгиликтүү кошулду. Сиз башка {name} кошо аласыз." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "{name} “{obj}” ийгиликтүү өзгөрдү. Сиз аны төмөндө өзгөртө аласыз." + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "{name} “{obj}” ийгиликтүү кошулду. Сиз аны төмөндө өзгөртө аласыз." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may add another {name} " +"below." +msgstr "" +"{name} “{obj}” ийгиликтүү өзгөрдү. Төмөндө башка {name} кошсоңуз болот." + +#, python-brace-format +msgid "The {name} “{obj}” was changed successfully." +msgstr "{name} \"{obj}\" ийгиликтүү өзгөрдү." + +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" +"Нерселердин үстүнөн аракет кылуудан мурда алар тандалуусу керек. Эч " +"нерсеөзгөргөн жок." + +msgid "No action selected." +msgstr "Аракет тандалган жок." + +#, python-format +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "%(name)s \"%(obj)s\" ийгиликтүү өчүрүлдү" + +#, python-format +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" +"ID си %(key)s\" болгон %(name)s табылган жок. Ал өчүрүлгөн болуп жүрбөсүн?" + +#, python-format +msgid "Add %s" +msgstr "%s кошуу" + +#, python-format +msgid "Change %s" +msgstr "%s өзгөртүү" + +#, python-format +msgid "View %s" +msgstr "%s көрүү" + +msgid "Database error" +msgstr "Берилиштер базасында ката" + +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s%(name)s ийгиликтүү өзгөртүлдү." + +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "Бүт %(total_count)s тандалды" + +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "%(cnt)s нерседен эчтемке тандалган жок" + +#, python-format +msgid "Change history: %s" +msgstr "%s тарыхын өзгөртүү" + +#. Translators: Model verbose name and instance representation, +#. suitable to be an item in a list. +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" +"%(class_name)s %(instance)s өчүрүлүүсү үчүн %(related_objects)s да " +"өчүрүлүүсү талап кылынат." + +msgid "Django site admin" +msgstr "Жанго башкарма сайты" + +msgid "Django administration" +msgstr "Жанго башкармасы" + +msgid "Site administration" +msgstr "Сайт башкармасы" + +msgid "Log in" +msgstr "Кирүү" + +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s башкармасы" + +msgid "Page not found" +msgstr "Барак табылган жок" + +msgid "We’re sorry, but the requested page could not be found." +msgstr "Кечирим сурайбыз, сиз сураган барак табылбады." + +msgid "Home" +msgstr "Башкы" + +msgid "Server error" +msgstr "Сервер катасы" + +msgid "Server error (500)" +msgstr "Сервер (500) катасы" + +msgid "Server Error (500)" +msgstr "Сервер (500) катасы" + +msgid "" +"There’s been an error. It’s been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"Ката кетти. Сайт башкармасына экат менен кайрылсаңыз тез арада маселе " +"чечилиши мүмкүн. Түшүнгөнүңүз үчүн рахмат." + +msgid "Run the selected action" +msgstr "Тандалган аракетти иштетиңиз" + +msgid "Go" +msgstr "Жөнө" + +msgid "Click here to select the objects across all pages" +msgstr "Барак боюнча бүт обекттерди тандоо үчүн чыкылдатыңыз" + +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "Бүт %(total_count)s %(module_name)s тандаңыз" + +msgid "Clear selection" +msgstr "Тандоону бошотуу" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s колдонмосундагы моделдер" + +msgid "Add" +msgstr "Кошуу" + +msgid "View" +msgstr "Көрүү" + +msgid "You don’t have permission to view or edit anything." +msgstr "Сиз эчнерсени көрүүгө же өзгөртүүгө жеткиңиз жок." + +msgid "" +"First, enter a username and password. Then, you’ll be able to edit more user " +"options." +msgstr "" +"Оболу колдонуучу атыңызды жана сырсөздү териңиз. Ошондо гана башка " +"маалыматтарын өзгөртө аласыз." + +msgid "Enter a username and password." +msgstr "колдонуучу атыңызды жана сырсөз киргизиңиз." + +msgid "Change password" +msgstr "Сырсөз өзгөртүү" + +msgid "Please correct the error below." +msgstr "Төмөнкү катаны оңдоңуз." + +msgid "Please correct the errors below." +msgstr "Төмөнкү каталарды оңдоңуз" + +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s үчүн жаңы сырсөз териңиз." + +msgid "Welcome," +msgstr "Кош келиңиз," + +msgid "View site" +msgstr "Сайтты ачуу" + +msgid "Documentation" +msgstr "Түшүндүрмө" + +msgid "Log out" +msgstr "Чыгуу" + +#, python-format +msgid "Add %(name)s" +msgstr "%(name)s кошуу" + +msgid "History" +msgstr "Тарых" + +msgid "View on site" +msgstr "Сайтта көрүү" + +msgid "Filter" +msgstr "Чыпкалоо" + +msgid "Clear all filters" +msgstr "Бүт чыпкаларды алып салуу" + +msgid "Remove from sorting" +msgstr "Ирээттөөдөн алып салуу" + +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "Ирээттөө абзелдүүлүгү: %(priority_number)s" + +msgid "Toggle sorting" +msgstr "Ирээтти алмаштыруу" + +msgid "Delete" +msgstr "Өчүрүү" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s өчүрүү үчүн башка байланышкан " +"обекттерди өчүрүү да талап кылынат. Бирок сиздин буга жеткиңиз жок:" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s өчүрүү үчүн башка байланышкан " +"обекттерди өчүрүү да талап кылат:" + +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Сиз чындап эле %(object_name)s \"%(escaped_object)s\" өчүрүүнү каалайсызбы? " +"Бүт байланышкан нерселер өчүрүлөт:" + +msgid "Objects" +msgstr "Обекттер" + +msgid "Yes, I’m sure" +msgstr "Ооба, мен чындап эле" + +msgid "No, take me back" +msgstr "Жок, мени аркага кайтар" + +msgid "Delete multiple objects" +msgstr "обекттерди өчүр" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"%(objects_name)s өчүрүү үчүн башка байланышкан обекттерди өчүрүү да талап " +"кылат. Бирок сиздин буга жеткиңиз жок:" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"%(objects_name)s өчүрүү үчүн башка байланышкан обекттерди өчүрүү да талап " +"кылат:" + +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"чындап эле %(objects_name)s өчүрүүнү каалайсызбы? Бүт байланышкан нерселер " +"өчүрүлөт:" + +msgid "Delete?" +msgstr "Өчүрөлүбү?" + +#, python-format +msgid " By %(filter_title)s " +msgstr "%(filter_title)s карап" + +msgid "Summary" +msgstr "Жалпысынан" + +msgid "Recent actions" +msgstr "Акыркы аракеттер" + +msgid "My actions" +msgstr "Менин аракеттерим" + +msgid "None available" +msgstr "Мүмкүн эмес" + +msgid "Unknown content" +msgstr "Белгисиз мазмун" + +msgid "" +"Something’s wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Сиздин базаңызды орнотуу боюнча ката кетти. Керектүү база жадыбалдары " +"түзүлгөндүгүн жана тиешелүү колдонуучунун жеткиси барлыгын текшериңиз." + +#, python-format +msgid "" +"You are authenticated as %(username)s, but are not authorized to access this " +"page. Would you like to login to a different account?" +msgstr "" +"Сиз %(username)s катары киргенсиз, бирок сиздин бул баракка жеткиңиз жок. " +"Сиз башка колдонуучу катары киресизби?" + +msgid "Forgotten your password or username?" +msgstr "Колдонуучу атыңыз же сырсөздү унутуп калдыңызбы?" + +msgid "Toggle navigation" +msgstr "Навигацияны алмаштыруу" + +msgid "Date/time" +msgstr "Күн/убакыт" + +msgid "User" +msgstr "Колдонуучу" + +msgid "Action" +msgstr "Аракет" + +msgid "" +"This object doesn’t have a change history. It probably wasn’t added via this " +"admin site." +msgstr "Бул обекттин өзгөрүү тарыхы жок." + +msgid "Show all" +msgstr "Баарын көрсөтүү" + +msgid "Save" +msgstr "Сактоо" + +msgid "Popup closing…" +msgstr "Жалтаң жабылуу..." + +msgid "Search" +msgstr "Издөө" + +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "жыйынтыгы:%(counter)s" + +#, python-format +msgid "%(full_result_count)s total" +msgstr "жалпысынан %(full_result_count)s" + +msgid "Save as new" +msgstr "Жаңы катары сактоо" + +msgid "Save and add another" +msgstr "Сакта жана башкасын кош" + +msgid "Save and continue editing" +msgstr "Сакта жана өзгөртүүнү улант" + +msgid "Save and view" +msgstr "Сактап туруп көрүү" + +msgid "Close" +msgstr "Жабуу" + +#, python-format +msgid "Change selected %(model)s" +msgstr "Тандалган %(model)s өзгөртүү" + +#, python-format +msgid "Add another %(model)s" +msgstr "Башка %(model)s кошуу" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "Тандалган %(model)s обеттерин өчүрүү" + +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Бүгүнкү баалуу убактыңызды Сайт үчүн бөлгөнүңүзгө рахмат." + +msgid "Log in again" +msgstr "Кайрадан кирүү" + +msgid "Password change" +msgstr "Сырсөз өзгөрт" + +msgid "Your password was changed." +msgstr "Сиздин сырсөз өзгөрдү." + +msgid "" +"Please enter your old password, for security’s sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Коопсуздуктан улам эски сырсөздү териңиз, жана биз коошкондугун текшерүү " +"үчүн жаңы сырсөздү эки жолу териңиз." + +msgid "Change my password" +msgstr "Сырсөздү өзгөрт" + +msgid "Password reset" +msgstr "Сырсөздү кыйратуу" + +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" +"Сиздин сырсөз орнотулду. Эми сиз алдыга карай жылып, кирүү аткарсаңыз болот." + +msgid "Password reset confirmation" +msgstr "Сырсөздү кыйратуу тастыктамасы" + +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" +"Тууралыгын жана коошкондугун текшере алышыбыз үчүн сырсөздү эки жолу териңиз." + +msgid "New password:" +msgstr "Жаңы сырсөз" + +msgid "Confirm password:" +msgstr "Сырсөз тастыктоосу:" + +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"Сырсөз кыйратуу шилтемеси жараксыз, мурдатан эле колдонулган болушу мүмкүн. " +"Башка шилтеме сурап көрүңүз." + +msgid "" +"We’ve emailed you instructions for setting your password, if an account " +"exists with the email you entered. You should receive them shortly." +msgstr "" +"Сырсөз тууралуу сизге кат жөнөттүк. Эгер мындай аккаунт бар болсо аны тез " +"арада ала аласыз." + +msgid "" +"If you don’t receive an email, please make sure you’ve entered the address " +"you registered with, and check your spam folder." +msgstr "" +"Эгер сиз екат албасаңыз даректин тууралыган текшериңиз жана спам папкасын " +"текшериңиз." + +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "Сиз %(site_name)s боюнча сырсөз сураган үчүн бул экат келди." + +msgid "Please go to the following page and choose a new password:" +msgstr "Төмөнкү баракка кириңиз да жаңы сырсөз тандаңыз." + +msgid "Your username, in case you’ve forgotten:" +msgstr "Сиздин колдонуучу атыңыз, унутуп калсаңыз керек болот." + +msgid "Thanks for using our site!" +msgstr "Биздин сайтты колдонгонуңуз үчүн рахмат!" + +#, python-format +msgid "The %(site_name)s team" +msgstr "%(site_name)s жамааты" + +msgid "" +"Forgotten your password? Enter your email address below, and we’ll email " +"instructions for setting a new one." +msgstr "Сырсөз унуттуңузбу? едарек териңиз сизге сырсөз боюнча экат жөнөтөбүз." + +msgid "Email address:" +msgstr "едарек:" + +msgid "Reset my password" +msgstr "Сырсөзүмдү кыйрат" + +msgid "All dates" +msgstr "Бүт күндөр" + +#, python-format +msgid "Select %s" +msgstr "%s тандоо" + +#, python-format +msgid "Select %s to change" +msgstr "%s обекттерин өзгөртүү үчүн тандоо" + +#, python-format +msgid "Select %s to view" +msgstr "%s обекттерин көрүү үчүн тандоо" + +msgid "Date:" +msgstr "Күн:" + +msgid "Time:" +msgstr "Убак:" + +msgid "Lookup" +msgstr "Көз чаптыруу" + +msgid "Currently:" +msgstr "Азыркы:" + +msgid "Change:" +msgstr "Өзгөртүү:" diff --git a/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.mo new file mode 100644 index 000000000000..037e5fd78e1b Binary files /dev/null and b/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.po new file mode 100644 index 000000000000..76ca7384a69d --- /dev/null +++ b/django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.po @@ -0,0 +1,260 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020-2021 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-02 11:44+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#, javascript-format +msgid "Available %s" +msgstr "%s даана жеткиликтүү" + +#, javascript-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"Бул жеткиликтүү тизмеси %s даана . Сиз төмөндө кутудан кээ бирлерин \"Тандоо" +"\" баскычын басуу менен тандап алсаңыз болот." + +#, javascript-format +msgid "Type into this box to filter down the list of available %s." +msgstr "Жеткиликтүү %s даана тизмесин чыпкалоо үчүн төмөнкү кутуга жазыңыз." + +msgid "Filter" +msgstr "Чыпкалоо" + +msgid "Choose all" +msgstr "Баарын тандоо" + +#, javascript-format +msgid "Click to choose all %s at once." +msgstr "Бүт %s даананы заматта тандоо үчүн чыкылдатыңыз." + +msgid "Choose" +msgstr "Тандоо" + +msgid "Remove" +msgstr "Алып таштоо" + +#, javascript-format +msgid "Chosen %s" +msgstr "%s даана тандалды" + +#, javascript-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" +"Бул тандалган %s даана. Сиз алардын каалаганын төмөндө кутудан \"Өчүр\" " +"баскычын басуу менен өчүрө аласыз." + +msgid "Remove all" +msgstr "Баарын алып ташта" + +#, javascript-format +msgid "Click to remove all chosen %s at once." +msgstr "Тандалган %s даананын баарын өчүрүү үчүн басыңыз" + +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "%(cnt)sнерседен %(sel)sтандалды" + +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" +"Сиз өзүнчө аймактарда сакталбаган өзгөртүүлөргө ээсиз. Эгер сиз бул аракетти " +"жасасаңыз сакталбаган өзгөрүүлөр текке кетет." + +msgid "" +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " +"action." +msgstr "" +"Сиз аракетти тандадыңыз бирок өзүнчө аймактарды сактай элексиз. Сактоо үчүн " +"ОК ту басыңыз. Сиз аракетти кайталашыңыз керек." + +msgid "" +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " +"button." +msgstr "" +"Сиз аракетти тандадыңыз жана өзүнчө аймактарда өзгөртүү киргизген жоксуз. " +"Сиз Сактоонун ордуна Жөнө баскычын басууңуз керек." + +msgid "Now" +msgstr "Азыр" + +msgid "Midnight" +msgstr "Түнүчү" + +msgid "6 a.m." +msgstr "саарлап саат 6" + +msgid "Noon" +msgstr "Түш" + +msgid "6 p.m." +msgstr "Кэч саат 6" + +#, javascript-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Эскертүү: Сиз серверден %s саат алдыда жүрөсүз." + +#, javascript-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Эскертүү: Сиз серверден %s саат аркада жүрөсүз." + +msgid "Choose a Time" +msgstr "Толук убак танда" + +msgid "Choose a time" +msgstr "Кыска убак танда" + +msgid "Cancel" +msgstr "Жокко чыгар" + +msgid "Today" +msgstr "Бүгүн" + +msgid "Choose a Date" +msgstr "Күн танда" + +msgid "Yesterday" +msgstr "Кечээ" + +msgid "Tomorrow" +msgstr "Эртең" + +msgid "January" +msgstr "Январь" + +msgid "February" +msgstr "Февраль" + +msgid "March" +msgstr "Март" + +msgid "April" +msgstr "Апрель" + +msgid "May" +msgstr "Май" + +msgid "June" +msgstr "Июнь" + +msgid "July" +msgstr "Июль" + +msgid "August" +msgstr "Август" + +msgid "September" +msgstr "Сентябрь" + +msgid "October" +msgstr "Октябрь" + +msgid "November" +msgstr "Ноябрь" + +msgid "December" +msgstr "Декабрь" + +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Янв" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Фев" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Мар" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Апр" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Май" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Июн" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Июл" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Авг" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Сен" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Окт" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Ноя" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Дек" + +msgctxt "one letter Sunday" +msgid "S" +msgstr "Жек" + +msgctxt "one letter Monday" +msgid "M" +msgstr "Дүй" + +msgctxt "one letter Tuesday" +msgid "T" +msgstr "Шей" + +msgctxt "one letter Wednesday" +msgid "W" +msgstr "Шар" + +msgctxt "one letter Thursday" +msgid "T" +msgstr "Бей" + +msgctxt "one letter Friday" +msgid "F" +msgstr "Жума" + +msgctxt "one letter Saturday" +msgid "S" +msgstr "Ише" + +msgid "Show" +msgstr "Көрсөт" + +msgid "Hide" +msgstr "Жашыр" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo index aa09d47ad717..bc907fcd28af 100644 Binary files a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po index 5159d7c7b790..e865dd10a88e 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po @@ -6,14 +6,14 @@ # NullIsNot0 , 2018 # Jannis Leidel , 2011 # Māris Nartišs , 2016 -# NullIsNot0 , 2019 +# NullIsNot0 , 2019-2020 # peterisb , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-07 08:06+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-22 17:27+0000\n" "Last-Translator: NullIsNot0 \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -75,6 +75,12 @@ msgstr "Nav datums" msgid "Has date" msgstr "Ir datums" +msgid "Empty" +msgstr "Tukšs" + +msgid "Not empty" +msgstr "Nav tukšs" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -334,6 +340,19 @@ msgstr "Izvēlēties visus %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Atcelt iezīmēto" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeļi %(name)s lietotnē" + +msgid "Add" +msgstr "Pievienot" + +msgid "View" +msgstr "Apskatīt" + +msgid "You don’t have permission to view or edit anything." +msgstr "Jums nav tiesību neko skatīt vai labot." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -382,6 +401,9 @@ msgstr "Apskatīt lapā" msgid "Filter" msgstr "Filtrs" +msgid "Clear all filters" +msgstr "Notīrīt visus filtrus" + msgid "Remove from sorting" msgstr "Izņemt no kārtošanas" @@ -457,9 +479,6 @@ msgstr "" "Vai esat pārliecināts, ka vēlaties dzēst izvēlētos %(objects_name)s " "objektus? Visi sekojošie objekti un tiem piesaistītie objekti tiks izdzēsti:" -msgid "View" -msgstr "Apskatīt" - msgid "Delete?" msgstr "Dzēst?" @@ -470,16 +489,6 @@ msgstr " Pēc %(filter_title)s " msgid "Summary" msgstr "Kopsavilkums" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modeļi %(name)s lietotnē" - -msgid "Add" -msgstr "Pievienot" - -msgid "You don’t have permission to view or edit anything." -msgstr "Jums nav tiesību neko skatīt vai labot." - msgid "Recent actions" msgstr "Nesenās darbības" @@ -511,6 +520,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Aizmirsi paroli vai lietotājvārdu?" +msgid "Toggle navigation" +msgstr "Pārslēgt navigāciju" + msgid "Date/time" msgstr "Datums/laiks" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo index 61e6e33e7e9d..6fa404d64a9a 100644 Binary files a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po index 4f1b55fe6a8f..eea2c772e52e 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po @@ -3,13 +3,14 @@ # Translators: # NullIsNot0 , 2017 # Jannis Leidel , 2011 +# NullIsNot0 , 2020-2021 # peterisb , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-11-18 08:13+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-25 22:47+0000\n" "Last-Translator: NullIsNot0 \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -88,20 +89,20 @@ msgstr "" "izpildīsiet izvēlēto darbību, šīs izmaiņas netiks saglabātas." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Jūs esat izvēlējies veikt darbību un neesat saglabājis veiktās izmaiņas. " -"Lūdzu nospiežat OK, lai saglabātu. Jums nāksies šo darbību izpildīt vēlreiz." +"Jūs esiet izvēlējies veikt darbību, bet neesiet saglabājis veiktās izmaiņas. " +"Lūdzu nospiediet OK, lai saglabātu. Šo darbību jums nāksies izpildīt vēlreiz." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Jūs esat izvēlējies veikt darbību un neesat izmainījis nevienu lauku. Jūs " -"droši vien meklējat pogu 'Aiziet' nevis 'Saglabāt'." +"Jūs esiet izvēlējies veikt darbību un neesiet mainījis nevienu lauku. Jūs " +"droši vien meklējiet pogu 'Aiziet' nevis 'Saglabāt'." msgid "Now" msgstr "Tagad" @@ -189,6 +190,54 @@ msgstr "novembris" msgid "December" msgstr "decembris" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Mai" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jūn" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jūl" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Aug" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dec" + msgctxt "one letter Sunday" msgid "S" msgstr "Sv" diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo index 5674f69b397d..dfbc8b15653d 100644 Binary files a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po index 09d8dd19375b..2efa5d3228fb 100644 --- a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po @@ -3,16 +3,16 @@ # Translators: # dekomote , 2015 # Jannis Leidel , 2011 -# Vasil Vangelovski , 2016-2017,2019 +# Vasil Vangelovski , 2016-2017,2019,2021 # Vasil Vangelovski , 2013-2015 # Vasil Vangelovski , 2011-2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 01:31+0000\n" -"Last-Translator: Ramiro Morales\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-06-11 17:28+0000\n" +"Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" "MIME-Version: 1.0\n" @@ -21,6 +21,10 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Избриши ги избраните %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно беа избришани %(count)d %(items)s." @@ -32,10 +36,6 @@ msgstr "Не може да се избрише %(name)s" msgid "Are you sure?" msgstr "Сигурни сте?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Избриши ги избраните %(verbose_name_plural)s" - msgid "Administration" msgstr "Администрација" @@ -72,6 +72,12 @@ msgstr "Нема датум" msgid "Has date" msgstr "Има датум" +msgid "Empty" +msgstr "" + +msgid "Not empty" +msgstr "" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -159,11 +165,11 @@ msgstr "" #, python-brace-format msgid "Changed {fields}." -msgstr "Изменето {fields}." +msgstr "Изменети {fields}." #, python-brace-format msgid "Deleted {name} “{object}”." -msgstr "" +msgstr "Избришан {name} “{object}”." msgid "No fields changed." msgstr "Не е изменето ниедно поле." @@ -172,11 +178,11 @@ msgid "None" msgstr "Ништо" msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." -msgstr "" +msgstr "Држете “Control” или “Command” на Mac за да изберете повеќе." #, python-brace-format msgid "The {name} “{obj}” was added successfully." -msgstr "" +msgstr "Успешно беше додадено {name} “{obj}”." msgid "You may edit it again below." msgstr "Можете повторно да го промените подолу." @@ -327,6 +333,19 @@ msgstr "Избери ги сите %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Откажи го изборот" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Модели во %(name)s апликација" + +msgid "Add" +msgstr "Додади" + +msgid "View" +msgstr "Погледни" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -373,6 +392,9 @@ msgstr "Погледни на сајтот" msgid "Filter" msgstr "Филтер" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Отстрани од сортирање" @@ -449,9 +471,6 @@ msgstr "" "Дали сте сигурни дека сакате да го избришете избраниот %(objects_name)s? " "Сите овие објекти и оние поврзани со нив ќе бидат избришани:" -msgid "View" -msgstr "Погледни" - msgid "Delete?" msgstr "Избриши?" @@ -462,16 +481,6 @@ msgstr " Според %(filter_title)s " msgid "Summary" msgstr "Резиме" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Модели во %(name)s апликација" - -msgid "Add" -msgstr "Додади" - -msgid "You don’t have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "Последни акции" @@ -501,6 +510,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Ја заборавивте вашата лозинка или корисничко име?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Датум/час" diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo index dd39d0a9b36d..f75d3d6ae29b 100644 Binary files a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po index 776202c6f726..d96aab9b9cb6 100644 --- a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Aby Thomas , 2014 -# Hrishikesh , 2019 +# Hrishikesh , 2019-2020 # Jannis Leidel , 2011 # JOMON THOMAS LOBO , 2019 # Junaid , 2012 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-03-26 07:56+0000\n" -"Last-Translator: JOMON THOMAS LOBO \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Malayalam (http://www.transifex.com/django/django/language/" "ml/)\n" "MIME-Version: 1.0\n" @@ -74,6 +74,12 @@ msgstr "തിയ്യതിയില്ല " msgid "Has date" msgstr "തിയ്യതിയുണ്ട്" +msgid "Empty" +msgstr "കാലി" + +msgid "Not empty" +msgstr "കാലിയല്ല" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -131,32 +137,32 @@ msgid "log entries" msgstr "ലോഗ് എൻട്രികള്‍" #, python-format -msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" ചേര്‍ത്തു." +msgid "Added “%(object)s”." +msgstr "“%(object)s” ചേർത്തു." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "\"%(object)s\"ല്‍ %(changes)s മാറ്റം വരുത്തി" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "“%(object)s” മാറ്റം വരുത്തി — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "\"%(object)s\" നീക്കം ചെയ്തു." +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "ലോഗ്‌എന്‍ട്രി ഒബ്ജെക്റ്റ്" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr " {name} \"{object}\" ചേർത്തിരിക്കുന്നു ." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "ചേര്‍ത്തു." msgid "and" -msgstr "ഉം" +msgstr "കൂടാതെ" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "" #, python-brace-format @@ -164,8 +170,8 @@ msgid "Changed {fields}." msgstr "" #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr " {name} \"{object}\". ഡിലീറ്റ് ചെയ്തു " +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "ഒരു മാറ്റവുമില്ല." @@ -173,59 +179,54 @@ msgstr "ഒരു മാറ്റവുമില്ല." msgid "None" msgstr "ഒന്നുമില്ല" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" വിജയകരമായി ചേർത്തിരിക്കുന്നു " +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "താഴെ നിങ്ങൾക്കിത് വീണ്ടും എഡിറ്റുചെയ്യാം" #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -" {name} \"{obj}\" വിജയകരമായി ചേർത്തിരിക്കുന്നു . നിങ്ങൾക്ക് പുതിയ ഒരു {name} താഴെ " -"ചേർക്കാവുന്നതാണ് " #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." +msgid "The {name} “{obj}” was changed successfully." msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." -msgstr "ആക്ഷന്‍ നടപ്പിലാക്കേണ്ട വകകള്‍ തെരഞ്ഞെടുക്കണം. ഒന്നും മാറ്റിയിട്ടില്ല." +msgstr "ആക്ഷന്‍ നടപ്പിലാക്കേണ്ട വകകള്‍ തെരഞ്ഞെടുക്കണം. ഒന്നിലും മാറ്റങ്ങൾ വരുത്തിയിട്ടില്ല." msgid "No action selected." msgstr "ആക്ഷനൊന്നും തെരഞ്ഞെടുത്തിട്ടില്ല." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" നീക്കം ചെയ്തു." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" #, python-format @@ -247,7 +248,7 @@ msgstr "ഡേറ്റാബേസ് എറർ." msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി." -msgstr[1] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി." +msgstr[1] "%(count)s %(name)s വിജയകരമായി മാറ്റി" #, python-format msgid "%(total_count)s selected" @@ -296,7 +297,7 @@ msgstr "%(app)s കാര്യനിർവഹണം" msgid "Page not found" msgstr "പേജ് കണ്ടെത്താനായില്ല" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "ക്ഷമിക്കണം, ആവശ്യപ്പെട്ട പേജ് കണ്ടെത്താന്‍ കഴിഞ്ഞില്ല." msgid "Home" @@ -312,11 +313,9 @@ msgid "Server Error (500)" msgstr "സെര്‍വറിൽ എന്തോ പ്രശ്നം (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"എന്തോ പ്രശ്നം സംഭവിച്ചിരിക്കുന്നു. സൈറ്റിന്റെ കാര്യനിർവാഹകരെ ഈമെയിൽ മുഖാന്തരം വിവരം " -"അറിയിച്ചിട്ടുണ്ട്. ക്ഷമയോടെ കത്തിരിക്കുനതിന് നന്ദി." msgid "Run the selected action" msgstr "തെരഞ്ഞെടുത്ത ആക്ഷന്‍ നടപ്പിലാക്കുക" @@ -334,10 +333,25 @@ msgstr "മുഴുവന്‍ %(total_count)s %(module_name)s ഉം തെ msgid "Clear selection" msgstr "തെരഞ്ഞെടുത്തത് റദ്ദാക്കുക." +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s മാതൃകയിലുള്ള" + +msgid "Add" +msgstr "ചേര്‍ക്കുക" + +msgid "View" +msgstr "കാണുക" + +msgid "You don’t have permission to view or edit anything." +msgstr "നിങ്ങൾക്ക് ഒന്നും കാണാനോ തിരുത്താനോ ഉള്ള അനുമതിയില്ല." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." -msgstr "ആദ്യം, യൂസര്‍ നാമവും പാസ് വേര്‍ഡും നല്കണം. പിന്നെ, കൂടുതല്‍ കാര്യങ്ങള്‍ മാറ്റാവുന്നതാണ്." +msgstr "" +"ആദ്യമായി ഒരു യൂസർനെയിമും പാസ്‌‌വേഡും നൽകുക. തുടർന്ന്, നിങ്ങൾക്ക് കൂടുതൽ കാര്യങ്ങളിൽ മാറ്റം " +"വരുത്താവുന്നതാണ്" msgid "Enter a username and password." msgstr "Enter a username and password." @@ -380,6 +394,9 @@ msgstr "View on site" msgid "Filter" msgstr "അരിപ്പ" +msgid "Clear all filters" +msgstr "എല്ലാ ഫിൽറ്ററുകളും ഒഴിവാക്കുക" + msgid "Remove from sorting" msgstr "ക്രമീകരണത്തില്‍ നിന്നും ഒഴിവാക്കുക" @@ -422,8 +439,8 @@ msgstr "" msgid "Objects" msgstr "വസ്തുക്കൾ" -msgid "Yes, I'm sure" -msgstr "അതെ, തീര്‍ച്ചയാണ്" +msgid "Yes, I’m sure" +msgstr "അതെ, എനിക്കുറപ്പാണ്" msgid "No, take me back" msgstr "ഇല്ല, എന്നെ തിരിച്ചെടുക്കൂ" @@ -456,9 +473,6 @@ msgstr "" "തിരഞ്ഞെടുക്കപ്പെട്ട %(objects_name)s നീക്കം ചെയ്യണമെന്നു ഉറപ്പാണോ ? തിരഞ്ഞെടുക്കപ്പെട്ടതും " "അതിനോട് ബന്ധപ്പെട്ടതും ആയ എല്ലാ താഴെപ്പറയുന്ന വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്:" -msgid "View" -msgstr "കാണുക" - msgid "Delete?" msgstr "ഡിലീറ്റ് ചെയ്യട്ടെ?" @@ -469,18 +483,8 @@ msgstr "%(filter_title)s ആൽ" msgid "Summary" msgstr "ചുരുക്കം" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s മാതൃകയിലുള്ള" - -msgid "Add" -msgstr "ചേര്‍ക്കുക" - -msgid "You don't have permission to view or edit anything." -msgstr "നിങ്ങൾക്ക് ഒന്നും കാണാനോ എഡിറ്റുചെയ്യാനോ അനുമതിയില്ല" - msgid "Recent actions" -msgstr "" +msgstr "സമീപകാല പ്രവൃത്തികൾ" msgid "My actions" msgstr "എന്റെ പ്രവർത്തനം" @@ -492,12 +496,10 @@ msgid "Unknown content" msgstr "ഉള്ളടക്കം അറിയില്ല." msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"നിങ്ങളുടെ ഡേറ്റാബേസ് ഇന്‍സ്ടാലേഷനില്‍ എന്തോ പിശകുണ്ട്. ശരിയായ ടേബിളുകള്‍ ഉണ്ടെന്നും ഡേറ്റാബേസ് " -"വായനായോഗ്യമാണെന്നും ഉറപ്പു വരുത്തുക." #, python-format msgid "" @@ -510,6 +512,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "രഹസ്യവാക്കോ ഉപയോക്തൃനാമമോ മറന്നുപോയോ?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "തീയതി/സമയം" @@ -520,11 +525,9 @@ msgid "Action" msgstr "പ്രവർത്തി" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"ഈ വസ്തുവിന്റെ മാറ്റങ്ങളുടെ ചരിത്രം ലഭ്യമല്ല. ഒരുപക്ഷെ ഇത് അഡ്മിന്‍ സൈറ്റ് വഴി ചേര്‍" -"ത്തതായിരിക്കില്ല." msgid "Show all" msgstr "എല്ലാം കാണട്ടെ" @@ -588,11 +591,9 @@ msgid "Your password was changed." msgstr "നിങ്ങളുടെ പാസ് വേര്‍ഡ് മാറ്റിക്കഴിഞ്ഞു." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"സുരക്ഷയ്ക്കായി നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് നല്കുക. പിന്നെ, പുതിയ പാസ് വേര്‍ഡ് രണ്ട് തവണ നല്കുക. " -"(ടയ്പ് ചെയ്തതു ശരിയാണെന്ന് ഉറപ്പാക്കാന്‍)" msgid "Change my password" msgstr "എന്റെ പാസ് വേര്‍ഡ് മാറ്റണം" @@ -627,16 +628,14 @@ msgstr "" "കഴിഞ്ഞതാവാം. പുതിയ ഒരു ലിങ്കിന് അപേക്ഷിക്കൂ." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"ഞങ്ങളുടെ ഇമെയിൽ കിട്ടിയില്ലെങ്കിൽ രജിസ്റ്റർ ചെയ്യാൻ ഉപയോകിച്ച അതെ ഇമെയിൽ വിലാസം തന്നെ " -"ആണോ എന്ന് ഉറപ്പ് വരുത്തുക. ശരിയാണെങ്കിൽ സ്പാം ഫോൾഡറിലും നോക്കുക " #, python-format msgid "" @@ -649,8 +648,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "ദയവായി താഴെ പറയുന്ന പേജ് സന്ദര്‍ശിച്ച് പുതിയ പാസ് വേര്‍ഡ് തെരഞ്ഞെടുക്കുക:" -msgid "Your username, in case you've forgotten:" -msgstr "നിങ്ങള്‍ മറന്നെങ്കില്‍, നിങ്ങളുടെ യൂസര്‍ നാമം, :" +msgid "Your username, in case you’ve forgotten:" +msgstr "" msgid "Thanks for using our site!" msgstr "ഞങ്ങളുടെ സൈറ്റ് ഉപയോഗിച്ചതിന് നന്ദി!" @@ -660,11 +659,9 @@ msgid "The %(site_name)s team" msgstr "%(site_name)s പക്ഷം" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"പാസ് വേര്‍ഡ് മറന്നു പോയോ? നിങ്ങളുടെ ഇമെയിൽ വിലാസം താഴെ എഴുതുക. പാസ് വേർഡ്‌ മാറ്റാനുള്ള " -"നിർദേശങ്ങൾ ഇമെയിലിൽ അയച്ചു തരുന്നതായിരിക്കും." msgid "Email address:" msgstr "ഇമെയിൽ വിലാസം:" diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo index 60bef7df7f00..0abc5e79c0de 100644 Binary files a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po index 803362f8c6d6..964d3557a90e 100644 --- a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-03-09 08:56+0000\n" -"Last-Translator: MUHAMMED RAMEEZ \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-05-13 00:53+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Malayalam (http://www.transifex.com/django/django/language/" "ml/)\n" "MIME-Version: 1.0\n" @@ -84,20 +84,16 @@ msgstr "" "നഷ്ടപ്പെടും." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"നിങ്ങള്‍ ഒരു ആക്ഷന്‍ തെരഞ്ഞെടുത്തിട്ടുണ്ട്. പക്ഷേ, കളങ്ങളിലെ മാറ്റങ്ങള്‍ ഇനിയും സേവ് ചെയ്യാനുണ്ട്. " -"ആദ്യം സേവ്ചെയ്യാനായി OK ക്ലിക് ചെയ്യുക. അതിനു ശേഷം ആക്ഷന്‍ ഒന്നു കൂടി പ്രയോഗിക്കേണ്ടി വരും." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"നിങ്ങള്‍ ഒരു ആക്ഷന്‍ തെരഞ്ഞെടുത്തിട്ടുണ്ട്. കളങ്ങളില്‍ സേവ് ചെയ്യാത്ത മാറ്റങ്ങള്‍ ഇല്ല. നിങ്ങള്‍സേവ് ബട്ടണ്‍ " -"തന്നെയാണോ അതോ ഗോ ബട്ടണാണോ ഉദ്ദേശിച്ചത്." msgid "Now" msgstr "ഇപ്പോള്‍" diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo index 59c0813bbe72..ea77ddde43fd 100644 Binary files a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po index ed32303788d3..3f6445ee4313 100644 --- a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-21 12:21+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-04 13:37+0000\n" "Last-Translator: Jon \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django/django/" "language/nb/)\n" @@ -75,6 +75,12 @@ msgstr "Ingen dato" msgid "Has date" msgstr "Har dato" +msgid "Empty" +msgstr "Tom" + +msgid "Not empty" +msgstr "Ikke tom" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -334,6 +340,19 @@ msgstr "Velg alle %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Nullstill valg" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeller i %(name)s-applikasjonen" + +msgid "Add" +msgstr "Legg til" + +msgid "View" +msgstr "Se" + +msgid "You don’t have permission to view or edit anything." +msgstr "Du har ikke tillatelse til å vise eller endre noe." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -382,6 +401,9 @@ msgstr "Vis på nettsted" msgid "Filter" msgstr "Filtrering" +msgid "Clear all filters" +msgstr "Fjern alle filtre" + msgid "Remove from sorting" msgstr "Fjern fra sortering" @@ -459,9 +481,6 @@ msgstr "" "Er du sikker på vil slette det valgte %(objects_name)s? De følgende " "objektene og deres relaterte objekter vil bli slettet:" -msgid "View" -msgstr "Se" - msgid "Delete?" msgstr "Slette?" @@ -472,16 +491,6 @@ msgstr "Etter %(filter_title)s " msgid "Summary" msgstr "Oppsummering" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modeller i %(name)s-applikasjonen" - -msgid "Add" -msgstr "Legg til" - -msgid "You don’t have permission to view or edit anything." -msgstr "Du har ikke tillatelse til å vise eller endre noe." - msgid "Recent actions" msgstr "Siste handlinger" @@ -513,6 +522,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Glemt brukernavnet eller passordet ditt?" +msgid "Toggle navigation" +msgstr "Veksle navigasjon" + msgid "Date/time" msgstr "Dato/tid" diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo index 5f34eb3aa735..6b1d74e4a1d0 100644 Binary files a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po index 7588b488d573..1e6ddb658b36 100644 --- a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po @@ -3,16 +3,17 @@ # Translators: # Eirik Krogstad , 2014 # Jannis Leidel , 2011 -# Jon , 2015-2016 -# Jon , 2014 -# Jon , 2011-2012 +# Jon, 2015-2016 +# Jon, 2014 +# Jon, 2020-2021 +# Jon, 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-19 16:41+0000\n" -"Last-Translator: Jon \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 14:20+0000\n" +"Last-Translator: Jon\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -85,17 +86,17 @@ msgstr "" "handling, vil dine ulagrede endringer gå tapt." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Du har valgt en handling, men du har ikke lagret dine endringer i " +"Du har valgt en handling, men du har ikke lagret endringene dine i " "individuelle felter enda. Vennligst trykk OK for å lagre. Du må utføre " "handlingen på nytt." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Du har valgt en handling, og har ikke gjort noen endringer i individuelle " @@ -185,6 +186,54 @@ msgstr "November" msgid "December" msgstr "Desember" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Mai" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Aug" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Des" + msgctxt "one letter Sunday" msgid "S" msgstr "S" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo index 131248f04f10..0564585d5cd3 100644 Binary files a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po index 76b5929dbfb6..34f1d16b97d4 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po @@ -9,16 +9,16 @@ # Jannis Leidel , 2011 # Jeffrey Gelens , 2011-2012 # dokterbob , 2015 -# Meteor 0id, 2019 -# Sander Steffann , 2014-2015 +# Meteor0id, 2019-2020 +# 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2014-2015 # Tino de Bruijn , 2011 -# Tonnes , 2017,2019 +# Tonnes , 2017,2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 08:08+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 08:30+0000\n" "Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" @@ -78,6 +78,12 @@ msgstr "Geen datum" msgid "Has date" msgstr "Heeft datum" +msgid "Empty" +msgstr "Leeg" + +msgid "Not empty" +msgstr "Niet leeg" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -346,6 +352,19 @@ msgstr "Alle %(total_count)s %(module_name)s selecteren" msgid "Clear selection" msgstr "Selectie wissen" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modellen in de %(name)s-toepassing" + +msgid "Add" +msgstr "Toevoegen" + +msgid "View" +msgstr "Weergeven" + +msgid "You don’t have permission to view or edit anything." +msgstr "U hebt geen rechten om iets te bekijken of te bewerken." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -395,6 +414,9 @@ msgstr "Weergeven op website" msgid "Filter" msgstr "Filter" +msgid "Clear all filters" +msgstr "Alle filters wissen" + msgid "Remove from sorting" msgstr "Verwijderen uit sortering" @@ -414,9 +436,9 @@ msgid "" "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"Het verwijderen van %(object_name)s '%(escaped_object)s' zal ook " -"gerelateerde objecten verwijderen. U hebt echter geen rechten om de volgende " -"typen objecten te verwijderen:" +"Het verwijderen van %(object_name)s '%(escaped_object)s' zou ook " +"gerelateerde objecten verwijderen, maar uw account heeft geen rechten om de " +"volgende typen objecten te verwijderen:" #, python-format msgid "" @@ -452,9 +474,9 @@ msgid "" "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Het verwijderen van de geselecteerde %(objects_name)s vereist het " -"verwijderen van gerelateerde objecten, maar uw account heeft geen " -"toestemming om de volgende soorten objecten te verwijderen:" +"Het verwijderen van de geselecteerde %(objects_name)s zou ook gerelateerde " +"objecten verwijderen, maar uw account heeft geen rechten om de volgende " +"typen objecten te verwijderen:" #, python-format msgid "" @@ -472,9 +494,6 @@ msgstr "" "Weet u zeker dat u de geselecteerde %(objects_name)s wilt verwijderen? Alle " "volgende objecten en hun aanverwante items zullen worden verwijderd:" -msgid "View" -msgstr "Weergeven" - msgid "Delete?" msgstr "Verwijderen?" @@ -485,16 +504,6 @@ msgstr " Op %(filter_title)s " msgid "Summary" msgstr "Samenvatting" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modellen in de %(name)s-toepassing" - -msgid "Add" -msgstr "Toevoegen" - -msgid "You don’t have permission to view or edit anything." -msgstr "U hebt geen rechten om iets te bekijken of te bewerken." - msgid "Recent actions" msgstr "Recente acties" @@ -527,6 +536,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Wachtwoord of gebruikersnaam vergeten?" +msgid "Toggle navigation" +msgstr "Navigatie aan/uit" + msgid "Date/time" msgstr "Datum/tijd" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo index d8e3570fad3d..814d1e8b0aff 100644 Binary files a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po index 2dd469ca5bf1..8ed513ccea5d 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po @@ -7,16 +7,16 @@ # Ilja Maas , 2015 # Jannis Leidel , 2011 # Jeffrey Gelens , 2011-2012 -# Meteor0id, 2019 -# Sander Steffann , 2015 -# Tonnes , 2019 +# Meteor0id, 2019-2020 +# 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2015 +# Tonnes , 2019-2020 # wunki , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-12-09 16:09+0000\n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-05-13 11:10+0000\n" "Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" @@ -91,17 +91,17 @@ msgstr "" "een actie uitvoert, gaan uw wijzigingen verloren." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "U hebt een actie geselecteerd, maar uw wijzigingen in afzonderlijke velden " -"nog niet opgeslagen. Klik op OK om op te slaan. U dient de actie opnieuw uit " -"te voeren." +"nog niet opgeslagen. Klik op OK om deze op te slaan. U dient de actie " +"opnieuw uit te voeren." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "U hebt een actie geselecteerd, en geen wijzigingen in afzonderlijke velden " diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo index 218951228da3..20d637553076 100644 Binary files a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po index 7ed8d67a700a..3601c18477f1 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po @@ -6,10 +6,11 @@ # Jannis Leidel , 2011 # Janusz Harkot , 2014-2015 # Karol , 2012 -# konryd , 2011 -# konryd , 2011 -# m_aciek , 2016-2019 +# 0d5641585fd67fbdb97037c19ab83e4c_18c98b0 , 2011 +# 0d5641585fd67fbdb97037c19ab83e4c_18c98b0 , 2011 +# m_aciek , 2016-2021 # m_aciek , 2015 +# Mariusz Felisiak , 2020 # Ola Sitarska , 2013 # Ola Sitarska , 2013 # Roman Barczyński, 2014 @@ -18,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-11 14:07+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-06-20 11:10+0000\n" "Last-Translator: m_aciek \n" "Language-Team: Polish (http://www.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" @@ -30,6 +31,10 @@ msgstr "" "%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Usuń wybrane(-nych) %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Pomyślnie usunięto %(count)d %(items)s." @@ -41,10 +46,6 @@ msgstr "Nie można usunąć %(name)s" msgid "Are you sure?" msgstr "Jesteś pewien?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Usuń wybranych %(verbose_name_plural)s" - msgid "Administration" msgstr "Administracja" @@ -81,6 +82,12 @@ msgstr "Brak daty" msgid "Has date" msgstr "Posiada datę" +msgid "Empty" +msgstr "Puste" + +msgid "Not empty" +msgstr "Niepuste" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -94,7 +101,7 @@ msgstr "Akcja:" #, python-format msgid "Add another %(verbose_name)s" -msgstr "Dodaj kolejne %(verbose_name)s" +msgstr "Dodaj kolejne(go)(-ną) %(verbose_name)s" msgid "Remove" msgstr "Usuń" @@ -249,7 +256,7 @@ msgstr "Zmień %s" #, python-format msgid "View %s" -msgstr "Obejrzyj %s" +msgstr "Zobacz %s" msgid "Database error" msgstr "Błąd bazy danych" @@ -257,10 +264,10 @@ msgstr "Błąd bazy danych" #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s %(name)s został pomyślnie zmieniony." -msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione." +msgstr[0] "%(count)s %(name)s został(a)(-ło) pomyślnie zmieniony(-na)(-ne)." +msgstr[1] "%(count)s %(name)s zostały(-li) pomyślnie zmienione(-nieni)." msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych." -msgstr[3] "%(count)s %(name)s zostało pomyślnie zmienionych." +msgstr[3] "%(count)s %(name)s zostało pomyślnie zmienione." #, python-format msgid "%(total_count)s selected" @@ -289,7 +296,7 @@ msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Usunięcie %(class_name)s %(instance)s może wiązać się z usunięciem " +"Usunięcie %(class_name)s %(instance)s może wiązać się z usunięciem " "następujących chronionych obiektów pokrewnych: %(related_objects)s" msgid "Django site admin" @@ -349,6 +356,19 @@ msgstr "Wybierz wszystkie %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Wyczyść wybór" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modele w aplikacji %(name)s" + +msgid "Add" +msgstr "Dodaj" + +msgid "View" +msgstr "Zobacz" + +msgid "You don’t have permission to view or edit anything." +msgstr "Nie masz uprawnień do oglądania ani edycji niczego." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -397,6 +417,9 @@ msgstr "Pokaż na stronie" msgid "Filter" msgstr "Filtruj" +msgid "Clear all filters" +msgstr "Wyczyść wszystkie filtry" + msgid "Remove from sorting" msgstr "Usuń z sortowania" @@ -416,7 +439,7 @@ msgid "" "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"Usunięcie %(object_name)s '%(escaped_object)s' może wiązać się z usunięciem " +"Usunięcie %(object_name)s „%(escaped_object)s” wiązałoby się z usunięciem " "obiektów z nim powiązanych, ale niestety nie posiadasz uprawnień do " "usunięcia obiektów następujących typów:" @@ -425,7 +448,7 @@ msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"Usunięcie %(object_name)s '%(escaped_object)s' może wymagać skasowania " +"Usunięcie %(object_name)s „%(escaped_object)s” wymagałoby skasowania " "następujących chronionych obiektów, które są z nim powiązane:" #, python-format @@ -454,17 +477,17 @@ msgid "" "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Usunięcie %(objects_name)s spowoduje skasowanie obiektów, które są z nim " -"powiązane. Niestety nie posiadasz uprawnień do usunięcia następujących typów " -"obiektów:" +"Usunięcie wybranych(-nego)(-nej) %(objects_name)s spowoduje skasowanie " +"obiektów, które są z nim(i)/nią powiązane. Niestety nie posiadasz uprawnień " +"do usunięcia następujących typów obiektów:" #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"Usunięcie %(objects_name)s wymaga skasowania następujących chronionych " -"obiektów, które są z nim powiązane:" +"Usunięcie wybranych(-nego)(-nej) %(objects_name)s wymaga skasowania " +"następujących chronionych obiektów, które są z nim(i)/nią powiązane:" #, python-format msgid "" @@ -474,9 +497,6 @@ msgstr "" "Czy chcesz skasować zaznaczone %(objects_name)s? Następujące obiekty oraz " "obiekty od nich zależne zostaną skasowane:" -msgid "View" -msgstr "Obejrzyj" - msgid "Delete?" msgstr "Usunąć?" @@ -487,16 +507,6 @@ msgstr " Według pola %(filter_title)s " msgid "Summary" msgstr "Podsumowanie" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modele w aplikacji %(name)s" - -msgid "Add" -msgstr "Dodaj" - -msgid "You don’t have permission to view or edit anything." -msgstr "Nie masz uprawnień do oglądania ani edycji niczego." - msgid "Recent actions" msgstr "Ostatnie działania" @@ -529,6 +539,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Nie pamiętasz swojego hasła lub nazwy użytkownika?" +msgid "Toggle navigation" +msgstr "Przełącz nawigację" + msgid "Date/time" msgstr "Data/czas" diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo index a7f3ad9f06f7..8cb35016feb6 100644 Binary files a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po index 9125a94ed4fc..e2763f2b76f5 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po @@ -4,17 +4,18 @@ # angularcircle, 2011 # Jannis Leidel , 2011 # Janusz Harkot , 2014-2015 -# konryd , 2011 -# m_aciek , 2016,2018 +# 0d5641585fd67fbdb97037c19ab83e4c_18c98b0 , 2011 +# m_aciek , 2016,2018,2020 +# Mariusz Felisiak , 2021 # Roman Barczyński, 2012 # Tomasz Kajtoch , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2018-12-21 22:38+0000\n" -"Last-Translator: m_aciek \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-19 11:03+0000\n" +"Last-Translator: Mariusz Felisiak \n" "Language-Team: Polish (http://www.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,16 +91,16 @@ msgstr "" "te zostaną utracone." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Wybrano akcję, lecz część zmian w polach nie została zachowana. Kliknij OK, " "aby zapisać. Aby wykonać akcję, należy ją ponownie uruchomić." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Wybrano akcję, lecz nie dokonano żadnych zmian w polach. Prawdopodobnie " @@ -209,6 +210,54 @@ msgstr "Listopad" msgid "December" msgstr "Grudzień" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Sty" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Lut" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Kwi" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Maj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Cze" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Lip" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Sie" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Wrz" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Paź" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Lis" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Gru" + msgctxt "one letter Sunday" msgid "S" msgstr "N" diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo index 730ab99f7f65..dfc9541851e9 100644 Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po index 2e40b70f38ab..0adf2315b4c6 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po @@ -24,6 +24,7 @@ # Otávio Reis , 2018 # Raysa Dutra, 2016 # R.J Lelis , 2019 +# Samuel Nogueira Bacelar , 2020 # Sergio Garcia , 2015 # Vinícius Damaceno , 2019 # Vinícius Muniz de Melo , 2019 @@ -31,9 +32,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-12-19 17:58+0000\n" -"Last-Translator: Vinícius Muniz de Melo \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-22 14:07+0000\n" +"Last-Translator: Samuel Nogueira Bacelar \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -93,6 +94,12 @@ msgstr "Sem data" msgid "Has date" msgstr "Tem data" +msgid "Empty" +msgstr "Vazio" + +msgid "Not empty" +msgstr "Não está vazio" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -358,6 +365,19 @@ msgstr "Selecionar todos %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Limpar seleção" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modelos na aplicação %(name)s" + +msgid "Add" +msgstr "Adicionar" + +msgid "View" +msgstr "Visualizar" + +msgid "You don’t have permission to view or edit anything." +msgstr "Você não tem permissão para ver ou editar nada." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -406,6 +426,9 @@ msgstr "Ver no site" msgid "Filter" msgstr "Filtro" +msgid "Clear all filters" +msgstr "Limpar todos os filtros" + msgid "Remove from sorting" msgstr "Remover da ordenação" @@ -483,9 +506,6 @@ msgstr "" "Tem certeza de que deseja apagar o %(objects_name)s selecionado? Todos os " "seguintes objetos e seus itens relacionados serão removidos:" -msgid "View" -msgstr "Visualizar" - msgid "Delete?" msgstr "Apagar?" @@ -496,16 +516,6 @@ msgstr "Por %(filter_title)s " msgid "Summary" msgstr "Resumo" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modelos na aplicação %(name)s" - -msgid "Add" -msgstr "Adicionar" - -msgid "You don’t have permission to view or edit anything." -msgstr "Você não tem permissão para ver ou editar nada." - msgid "Recent actions" msgstr "Ações recentes" @@ -538,6 +548,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Esqueceu sua senha ou nome de usuário?" +msgid "Toggle navigation" +msgstr "Alternar navegação" + msgid "Date/time" msgstr "Data/hora" diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo index f499f4fe940d..813a169a6dc0 100644 Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po index a5a872bd9d52..565b6ac70919 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -7,14 +7,16 @@ # semente, 2012 # Jannis Leidel , 2011 # Lucas Infante , 2015 +# Rafael Fontenelle , 2021 # Renata Barbosa Almeida , 2016 +# Samuel Nogueira Bacelar , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Tarsis Azevedo \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-17 05:53+0000\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -87,20 +89,21 @@ msgstr "" "executar uma ação suas alterações não salvas serão perdidas." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Você selecionou uma ação, mas você não salvou as alterações de cada campo " -"ainda. Clique em OK para salvar. Você vai precisar executar novamente a ação." +"Você selecionou uma ação, mas você ainda não salvou suas alterações nos " +"campos individuais. Por favor clique OK para salvar. você precisará de rodar " +"novamente a ação." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Você selecionou uma ação, e você não fez alterações em campos individuais. " -"Você provavelmente está procurando o botão Ir ao invés do botão Salvar." +"Você selecionou uma ação sem fazer mudanças nos campos individuais. Você " +"provavelmente está procurando pelo botão Go ao invés do botão Save." msgid "Now" msgstr "Agora" @@ -186,6 +189,54 @@ msgstr "Novembro" msgid "December" msgstr "Dezembro" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Fev" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Abr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Mai" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Ago" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Set" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Out" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dez" + msgctxt "one letter Sunday" msgid "S" msgstr "D" diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo index de836e713341..78e6b31f4b19 100644 Binary files a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po index a52959bc54ec..db64193b30d1 100644 --- a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po @@ -4,16 +4,18 @@ # Bogdan Mateescu, 2018-2019 # Daniel Ursache-Dogariu, 2011 # Denis Darii , 2011,2014 +# Eugenol Man , 2020 # Ionel Cristian Mărieș , 2012 # Jannis Leidel , 2011 +# Mihai Fotea , 2020 # Razvan Stefanescu , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-18 12:02+0000\n" -"Last-Translator: Bogdan Mateescu\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 11:07+0000\n" +"Last-Translator: Eugenol Man \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -25,14 +27,14 @@ msgstr "" #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d %(items)s eliminate cu succes." +msgstr "%(count)d %(items)s șterse cu succes." #, python-format msgid "Cannot delete %(name)s" msgstr "Nu se poate șterge %(name)s" msgid "Are you sure?" -msgstr "Sigur?" +msgstr "Ești sigur?" #, python-format msgid "Delete selected %(verbose_name_plural)s" @@ -74,13 +76,19 @@ msgstr "Fără dată" msgid "Has date" msgstr "Are o dată" +msgid "Empty" +msgstr "Gol" + +msgid "Not empty" +msgstr "Nu este gol" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Introduceți vă rog un %(username)s și o parolă pentru un cont de membru. De " -"remarcat că ambele țin cont de capitalizare." +"Introduceți vă rog un %(username)s și parola corectă pentru un cont de " +"membru. De remarcat că ambele pot conține majuscule." msgid "Action:" msgstr "Acțiune:" @@ -131,23 +139,23 @@ msgid "log entries" msgstr "intrări jurnal" #, python-format -msgid "Added \"%(object)s\"." -msgstr "S-au adăugat \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "Adăugat %(object)s" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "S-au schimbat \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Schimbat “%(object)s” — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "S-au șters \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "Șters “%(object)s.”" msgid "LogEntry Object" msgstr "Obiect LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "S-a adăugat {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "Adăugat {name} “{object}”." msgid "Added." msgstr "Adăugat." @@ -156,16 +164,16 @@ msgid "and" msgstr "și" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "S-au schimbat {fields} pentru {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "{fields} schimbat pentru {name} “{object}”." #, python-brace-format msgid "Changed {fields}." msgstr "S-au schimbat {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "S-a șters {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "Șters {name} “{object}”." msgid "No fields changed." msgstr "Niciun câmp modificat." @@ -173,50 +181,39 @@ msgstr "Niciun câmp modificat." msgid "None" msgstr "Nimic" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Ține apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai " -"mult de unul." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" a fost adăugat cu succes." +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "O poți edita din nou mai jos." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"{name} \"{obj}\" a fost adăugat cu succes. Poți adăuga alt {name} mai jos." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" a fost modificat cu succes. Poți să îl editezi în " -"continuare mai jos." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" a fost adăugat cu succes. Poți să îl editezi în continuare " -"mai jos." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"{name} \"{obj}\" a fost modificat cu succes. Poți adăuga alt {name} mai jos." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" a fost schimbat cu succes." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -229,12 +226,12 @@ msgid "No action selected." msgstr "Nicio acțiune selectată." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" eliminat(ă) cu succes." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s cu ID \"%(key)s\" inexistent. Posibil să fi fost șters?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -306,8 +303,8 @@ msgstr "administrare %(app)s" msgid "Page not found" msgstr "Pagină inexistentă" -msgid "We're sorry, but the requested page could not be found." -msgstr "Ne pare rău, dar pagina solicitată nu a putut fi găsită." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Din păcate nu am găsit pagina solicitată" msgid "Home" msgstr "Acasă" @@ -322,11 +319,9 @@ msgid "Server Error (500)" msgstr "Eroare server (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"A apărut o eroare. A fost raportată către administratorii site-ului prin " -"email și ar trebui să fie reparată în scurt timp. Mulțumesc pentru răbdare." msgid "Run the selected action" msgstr "Pornește acțiunea selectată" @@ -344,12 +339,23 @@ msgstr "Selectați toate %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Deselectați" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modele în aplicația %(name)s" + +msgid "Add" +msgstr "Adaugă" + +msgid "View" +msgstr "Vizualizează" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Introduceți mai întâi un nume de utilizator și o parolă. Apoi veți putea " -"modifica mai multe opțiuni ale utilizatorului." msgid "Enter a username and password." msgstr "Introduceți un nume de utilizator și o parolă." @@ -393,6 +399,9 @@ msgstr "Vizualizează pe site" msgid "Filter" msgstr "Filtru" +msgid "Clear all filters" +msgstr "Șterge toate filtrele" + msgid "Remove from sorting" msgstr "Elimină din sortare" @@ -435,8 +444,8 @@ msgstr "" msgid "Objects" msgstr "Obiecte" -msgid "Yes, I'm sure" -msgstr "Da, cu siguranță" +msgid "Yes, I’m sure" +msgstr "Da, sunt sigur" msgid "No, take me back" msgstr "Nu, vreau să mă întorc" @@ -470,9 +479,6 @@ msgstr "" "Sigur doriţi să ștergeți %(objects_name)s conform selecției? Toate obiectele " "următoare alături de cele asociate lor vor fi șterse:" -msgid "View" -msgstr "Vizualizează" - msgid "Delete?" msgstr "Elimină?" @@ -483,16 +489,6 @@ msgstr "După %(filter_title)s " msgid "Summary" msgstr "Sumar" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modele în aplicația %(name)s" - -msgid "Add" -msgstr "Adaugă" - -msgid "You don't have permission to view or edit anything." -msgstr "Nu aveți permisiunea de a edita sau vizualiza nimic." - msgid "Recent actions" msgstr "Acțiuni recente" @@ -506,13 +502,10 @@ msgid "Unknown content" msgstr "Conținut necunoscut" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Există o problema cu baza de date. Verificați dacă tabelele necesare din " -"baza de date au fost create și verificați dacă baza de date poate fi citită " -"de utilizatorul potrivit." #, python-format msgid "" @@ -525,6 +518,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Ați uitat parola sau utilizatorul ?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Dată/oră" @@ -535,11 +531,9 @@ msgid "Action" msgstr "Acțiune" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat " -"prin intermediul acestui sit de administrare." msgid "Show all" msgstr "Arată totul" @@ -604,11 +598,11 @@ msgid "Your password was changed." msgstr "Parola a fost schimbată." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Din motive de securitate, introduceți parola veche, apoi de două ori parola " -"nouă, pentru a putea verifica dacă ați scris-o corect. " +"Vă rog introduceți parola veche, pentru securitate, apoi introduceți parola " +"nouă de doua ori pentru a verifica dacă a fost scrisă corect. " msgid "Change my password" msgstr "Schimbă-mi parola" @@ -645,19 +639,18 @@ msgstr "" "fost deja utilizat. Solicitați o nouă resetare a parolei." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"V-am transmis pe email instrucțiunile pentru setarea unei parole noi, dacă " -"există un cont cu adresa email introdusă. Ar trebui să le primiți în scurt " -"timp." +"Am trimis instrucțiuni pentru a seta parola, daca există un cont cu email-ul " +"introdus. O sa-l primiți cât de curând." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Dacă nu primiți un email, asigurați-vă că ați introdus adresa cu care v-ați " -"înregistrat și verificați directorul spam." +"Dacă nu ați primit un email, verificați vă rog dacă ați introdus adresa cu " +"care v-ați înregistrat și verificați si folderul Spam." #, python-format msgid "" @@ -670,8 +663,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Mergeți la următoarea pagină și alegeți o parolă nouă:" -msgid "Your username, in case you've forgotten:" -msgstr "Numele de utilizator, în caz că l-ați uitat:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Numele tău de utilizator, în caz că l-ai uitat:" msgid "Thanks for using our site!" msgstr "Mulțumiri pentru utilizarea sitului nostru!" @@ -681,11 +674,11 @@ msgid "The %(site_name)s team" msgstr "Echipa %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Ați uitat parola? Introduceți adresa email mai jos și veți primi " -"instrucțiuni pentru setarea unei noi parole." +"Ați uitat parola ? Introduceți adresa de email mai jos și vă vom trimite " +"instrucțiuni pentru o parolă nouă." msgid "Email address:" msgstr "Adresă e-mail:" diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo index b1b5dffd9481..59f694e3a8c4 100644 Binary files a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po index 11127e87e68b..e681dde5b868 100644 --- a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po @@ -4,6 +4,7 @@ # Bogdan Mateescu, 2018-2019 # Daniel Ursache-Dogariu, 2011 # Denis Darii , 2011 +# Eugenol Man , 2020 # Ionel Cristian Mărieș , 2012 # Jannis Leidel , 2011 # razvan ionescu , 2015 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-04-18 17:06+0000\n" -"Last-Translator: Bogdan Mateescu\n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-07-15 11:16+0000\n" +"Last-Translator: Eugenol Man \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -91,21 +92,20 @@ msgstr "" "o acțiune, modificările nesalvate vor fi pierdute." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Aţi selectat o acţiune, dar nu aţi salvat încă modificările la câmpuri " -"individuale. Faceţi clic pe OK pentru a salva. Va trebui să executați " -"acțiunea din nou." +"Ai selectat o acțiune dar nu ai salvat modificările făcute în câmpuri " +"individuale. Te rugăm apasa Ok pentru a salva. Va trebui sa reiei acțiunea." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Ați selectat o acţiune și nu ațţi făcut modificări în cîmpuri individuale. " -"Probabil căutați butonul Go, în loc de Salvează." +"Ai selectat o acțiune și nu ai făcut modificări. Probabil că dorești butonul " +"de Go mai putin cel de Salvează." msgid "Now" msgstr "Acum" diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo index c11def1d49b9..72c8ce616afc 100644 Binary files a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po index e27b05c04d99..f9e671dcf847 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po @@ -5,8 +5,10 @@ # Denis Darii , 2011 # Dimmus , 2011 # Eugene , 2016-2017 +# crazyzubr , 2020 # Sergey , 2016 # Jannis Leidel , 2011 +# SeryiMysh , 2020 # Алексей Борискин , 2012-2015 # Дмитрий , 2019 # Дмитрий Шатера , 2018 @@ -14,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-14 12:41+0000\n" -"Last-Translator: Дмитрий \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-21 09:32+0000\n" +"Last-Translator: crazyzubr \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -78,6 +80,12 @@ msgstr "Дата не указана" msgid "Has date" msgstr "Дата указана" +msgid "Empty" +msgstr "Пусто" + +msgid "Not empty" +msgstr "Не пусто" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -135,23 +143,23 @@ msgid "log entries" msgstr "записи в журнале" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Добавлено \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "Добавлено “%(object)s“." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Изменено \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Изменено “%(object)s“ - %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Удалено \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "Удалено “%(object)s.“" msgid "LogEntry Object" msgstr "Запись в журнале" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Добавлен {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "Добавлен {name} “{object}“." msgid "Added." msgstr "Добавлено." @@ -160,16 +168,16 @@ msgid "and" msgstr "и" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Изменено {fields} у {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "Изменено {fields} у {name} “{object}“." #, python-brace-format msgid "Changed {fields}." msgstr "Изменено {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Удален {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "Удален {name} “{object}“." msgid "No fields changed." msgstr "Ни одно поле не изменено." @@ -177,50 +185,45 @@ msgstr "Ни одно поле не изменено." msgid "None" msgstr "Нет" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Удерживайте \"Control\" (или \"Command\" на Mac), чтобы выбрать несколько " +"Удерживайте “Control“ (или “Command“ на Mac), чтобы выбрать несколько " "значений." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" было успешно добавлено." +msgid "The {name} “{obj}” was added successfully." +msgstr "{name} \"{obj}\" был успешно добавлен." msgid "You may edit it again below." msgstr "Вы можете снова изменить этот объект ниже." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"{name} \"{obj}\" был успешно добавлен. Вы можете добавить еще один {name} " -"ниже." +"{name} “{obj}“ был успешно добавлен. Вы можете добавить еще один {name} ниже." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" был изменен успешно. Вы можете отредактировать его снова " -"ниже." +"{name} “{obj}“ был изменен успешно. Вы можете отредактировать его снова ниже." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" был успешно добавлен. Вы можете отредактировать его еще раз " +"{name} “{obj}“ был успешно добавлен. Вы можете отредактировать его еще раз " "ниже." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "{name} \"{obj}\" был изменен. Вы можете добавить еще один {name} ниже." +msgstr "{name} “{obj}“ был изменен. Вы можете добавить еще один {name} ниже." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" был изменен." +msgid "The {name} “{obj}” was changed successfully." +msgstr "{name} “{obj}“ был успешно изменен." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -233,12 +236,12 @@ msgid "No action selected." msgstr "Действие не выбрано." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" был успешно удален." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "%(name)s “%(obj)s“ был успешно удален." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s с ID \"%(key)s\" не существует. Возможно оно было удалено?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "%(name)s с ID “%(key)s“ не существует. Возможно оно было удалено?" #, python-format msgid "Add %s" @@ -312,7 +315,7 @@ msgstr "Администрирование приложения «%(app)s»" msgid "Page not found" msgstr "Страница не найдена" -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "К сожалению, запрашиваемая вами страница не найдена." msgid "Home" @@ -328,7 +331,7 @@ msgid "Server Error (500)" msgstr "Ошибка сервера (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "Произошла ошибка. О ней сообщено администраторам сайта по электронной почте, " @@ -350,8 +353,21 @@ msgstr "Выбрать все %(module_name)s (%(total_count)s)" msgid "Clear selection" msgstr "Снять выделение" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Модели в приложении %(name)s" + +msgid "Add" +msgstr "Добавить" + +msgid "View" +msgstr "Просмотреть" + +msgid "You don’t have permission to view or edit anything." +msgstr "У вас недостаточно полномочий для просмотра или изменения чего либо." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" "Сначала введите имя пользователя и пароль. Затем вы сможете ввести больше " @@ -398,6 +414,9 @@ msgstr "Смотреть на сайте" msgid "Filter" msgstr "Фильтр" +msgid "Clear all filters" +msgstr "Сбросить все фильтры" + msgid "Remove from sorting" msgstr "Удалить из сортировки" @@ -440,7 +459,7 @@ msgstr "" msgid "Objects" msgstr "Объекты" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Да, я уверен" msgid "No, take me back" @@ -474,9 +493,6 @@ msgstr "" "Вы уверены, что хотите удалить %(objects_name)s? Все следующие объекты и " "связанные с ними элементы будут удалены:" -msgid "View" -msgstr "Просмотреть" - msgid "Delete?" msgstr "Удалить?" @@ -487,16 +503,6 @@ msgstr "%(filter_title)s" msgid "Summary" msgstr "Краткая статистика" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Модели в приложении %(name)s" - -msgid "Add" -msgstr "Добавить" - -msgid "You don't have permission to view or edit anything." -msgstr "У вас недостаточно полномочий для просмотра или изменения чего либо." - msgid "Recent actions" msgstr "Последние действия" @@ -510,7 +516,7 @@ msgid "Unknown content" msgstr "Неизвестный тип" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -530,6 +536,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Забыли свой пароль или имя пользователя?" +msgid "Toggle navigation" +msgstr "Переключить навигацию" + msgid "Date/time" msgstr "Дата и время" @@ -540,7 +549,7 @@ msgid "Action" msgstr "Действие" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" "Данный объект не имеет истории изменений. Возможно, он был добавлен не через " @@ -610,7 +619,7 @@ msgid "Your password was changed." msgstr "Ваш пароль был изменен." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" "В целях безопасности, пожалуйста, введите свой старый пароль, затем введите " @@ -649,7 +658,7 @@ msgstr "" "Пожалуйста, попробуйте восстановить пароль еще раз." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "Мы отправили вам инструкцию по установке нового пароля на указанный адрес " @@ -657,7 +666,7 @@ msgstr "" "получить ее в ближайшее время." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "Если вы не получили письмо, пожалуйста, убедитесь, что вы ввели адрес с " @@ -675,7 +684,7 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Пожалуйста, перейдите на эту страницу и введите новый пароль:" -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "Ваше имя пользователя (на случай, если вы его забыли):" msgid "Thanks for using our site!" @@ -686,7 +695,7 @@ msgid "The %(site_name)s team" msgstr "Команда сайта %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" "Забыли пароль? Введите свой адрес электронной почты ниже, и мы вышлем вам " diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo index 4a51b2f5f1d5..fe63491eb923 100644 Binary files a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po index 281cd5188987..478d770bb54b 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po @@ -1,20 +1,23 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2020 # Denis Darii , 2011 # Dimmus , 2011 # Eugene , 2012 # Eugene , 2016 +# crazyzubr , 2020 # Jannis Leidel , 2011 +# Panasoft, 2021 # Алексей Борискин , 2012,2014-2015 # Андрей Щуров , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Eugene \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-16 22:55+0000\n" +"Last-Translator: Panasoft\n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -92,8 +95,8 @@ msgstr "" "вы запустите действие, несохраненные изменения будут потеряны." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" "Вы выбрали действие, но еще не сохранили изменения, внесенные в некоторых " @@ -101,13 +104,13 @@ msgstr "" "сохранения вам придется запустить действие еще раз." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Вы выбрали действие и не внесли изменений в данные. Возможно, вы хотели " "воспользоваться кнопкой \"Выполнить\", а не кнопкой \"Сохранить\". Если это " -"так, то нажмите \"Отмена\", чтобы вернуться в интерфейс редактирования. " +"так, то нажмите \"Отмена\", чтобы вернуться в интерфейс редактирования." msgid "Now" msgstr "Сейчас" @@ -201,6 +204,54 @@ msgstr "Ноябрь" msgid "December" msgstr "Декабрь" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Янв" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Фев" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Мар" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Апр" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Май" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Июн" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Июл" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Авг" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Сен" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Окт" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Ноя" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Дек" + msgctxt "one letter Sunday" msgid "S" msgstr "В" diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo index d7a5ba377792..f0244f32029b 100644 Binary files a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po index 3e9db2405e7d..a0d08310dc38 100644 --- a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # # Translators: # Jannis Leidel , 2011 -# Juraj Bubniak , 2012-2013 +# 18f25ad6fa9930fc67cb11aca9d16a27, 2012-2013 # Marian Andre , 2013-2015,2017 # Martin Kosír, 2011 # Martin Tóth , 2017 +# Peter Stríž , 2020 # Zbynek Drlik , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-06-10 07:35+0000\n" -"Last-Translator: Zbynek Drlik \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2020-12-14 18:32+0000\n" +"Last-Translator: Peter Stríž \n" "Language-Team: Slovak (http://www.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,6 +23,10 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n " ">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Zmazať označené %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Úspešne zmazaných %(count)d %(items)s." @@ -33,10 +38,6 @@ msgstr "Nedá sa vymazať %(name)s" msgid "Are you sure?" msgstr "Ste si istý?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Zmazať označené %(verbose_name_plural)s" - msgid "Administration" msgstr "Správa" @@ -73,6 +74,12 @@ msgstr "Bez dátumu" msgid "Has date" msgstr "S dátumom" +msgid "Empty" +msgstr "Prázdny" + +msgid "Not empty" +msgstr "Obsadený" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -92,13 +99,13 @@ msgid "Remove" msgstr "Odstrániť" msgid "Addition" -msgstr "" +msgstr "Pridávanie" msgid "Change" msgstr "Zmeniť" msgid "Deletion" -msgstr "" +msgstr "Mazanie" msgid "action time" msgstr "čas akcie" @@ -130,22 +137,22 @@ msgid "log entries" msgstr "položky záznamu" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "Pridané \"%(object)s\"." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" msgstr "Zmenené \"%(object)s\" - %(changes)s " #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Odstránené \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "Zmazaný %(object)s" msgid "LogEntry Object" msgstr "Objekt LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "Pridaný {name} \"{object}\"." msgid "Added." @@ -155,7 +162,7 @@ msgid "and" msgstr "a" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "Zmenený {fields} pre {name} \"{object}\"." #, python-brace-format @@ -163,7 +170,7 @@ msgid "Changed {fields}." msgstr "Zmenené {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "Zmazaný {name} \"{object}\"." msgid "No fields changed." @@ -172,52 +179,41 @@ msgstr "Polia nezmenené." msgid "None" msgstr "Žiadne" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command" -"\" na počítači Mac." +"Ak chcete vybrať viac ako jednu položku na Mac, podržte \"Control\", alebo " +"\"Command\"" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "Objekt {name} \"{obj}\" bol úspešne pridaný." msgid "You may edit it again below." -msgstr "" +msgstr "Nižšie môžete začať znovu editovať " #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Objekt {name} \"{obj}\" bol úspešne pridaný. Môžete pridať ďaľší {name} " -"nižšie." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"Objekt {name} \"{obj}\" bol úspešne zmenený. Ďalšie zmeny môžete urobiť " -"nižšie." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." msgstr "" -"Objekt {name} \"{obj}\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť " -"nižšie." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Objekt {name} \"{obj}\" bol úspešne pridaný. Môžete pridať ďaľší {name} " -"nižšie." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "Objekt {name} \"{obj}\" bol úspešne pridaný." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -230,13 +226,12 @@ msgid "No action selected." msgstr "Nebola vybraná žiadna akcia." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -"Položka %(name)s s ID \"%(key)s\" neexistuje - pravdepodobne je vymazaná?" #, python-format msgid "Add %s" @@ -248,7 +243,7 @@ msgstr "Zmeniť %s" #, python-format msgid "View %s" -msgstr "" +msgstr "Zobraziť%s" msgid "Database error" msgstr "Chyba databázy" @@ -310,8 +305,8 @@ msgstr "%(app)s správa" msgid "Page not found" msgstr "Stránka nenájdená" -msgid "We're sorry, but the requested page could not be found." -msgstr "Ľutujeme, ale požadovanú stránku nie je možné nájsť." +msgid "We’re sorry, but the requested page could not be found." +msgstr "" msgid "Home" msgstr "Domov" @@ -326,11 +321,9 @@ msgid "Server Error (500)" msgstr "Chyba servera (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Došlo k chybe. Chyba bola nahlásená správcovi webu prostredníctvom e-mailu a " -"zanedlho by mala byť odstránená. Ďakujeme za vašu trpezlivosť." msgid "Run the selected action" msgstr "Vykonať vybranú akciu" @@ -348,12 +341,23 @@ msgstr "Vybrať všetkých %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Zrušiť výber" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modely v %(name)s aplikácii" + +msgid "Add" +msgstr "Pridať" + +msgid "View" +msgstr "Zobraziť" + +msgid "You don’t have permission to view or edit anything." +msgstr "Nemáte právo na zobrazenie alebo vykonávanie zmien." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Najskôr zadajte používateľské meno a heslo. Potom budete môcť upraviť viac " -"používateľských nastavení." msgid "Enter a username and password." msgstr "Zadajte používateľské meno a heslo." @@ -396,6 +400,9 @@ msgstr "Pozrieť na stránke" msgid "Filter" msgstr "Filtrovať" +msgid "Clear all filters" +msgstr "Zrušiť všetky filtre" + msgid "Remove from sorting" msgstr "Odstrániť z triedenia" @@ -438,7 +445,7 @@ msgstr "" msgid "Objects" msgstr "Objekty" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Áno, som si istý" msgid "No, take me back" @@ -473,9 +480,6 @@ msgstr "" "Ste si isty, že chcete vymazať označené %(objects_name)s? Vymažú sa všetky " "nasledujúce objekty a ich súvisiace položky:" -msgid "View" -msgstr "" - msgid "Delete?" msgstr "Zmazať?" @@ -486,16 +490,6 @@ msgstr "Podľa %(filter_title)s " msgid "Summary" msgstr "Súhrn" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modely v %(name)s aplikácii" - -msgid "Add" -msgstr "Pridať" - -msgid "You don't have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "Posledné akcie" @@ -509,13 +503,10 @@ msgid "Unknown content" msgstr "Neznámy obsah" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Niečo nie je v poriadku s vašou inštaláciou databázy. Uistite sa, že boli " -"vytvorené potrebné databázové tabuľky a taktiež skontrolujte, či príslušný " -"používateľ môže databázu čítať." #, python-format msgid "" @@ -528,6 +519,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Zabudli ste heslo alebo používateľské meno?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Dátum a čas" @@ -538,11 +532,9 @@ msgid "Action" msgstr "Akcia" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Tento objekt nemá zoznam zmien. Pravdepodobne nebol pridaný prostredníctvom " -"tejto správcovskej stránky." msgid "Show all" msgstr "Zobraziť všetky" @@ -608,11 +600,9 @@ msgid "Your password was changed." msgstr "Vaše heslo bolo zmenené." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Z bezpečnostných dôvodov zadajte staré heslo a potom nové heslo dvakrát, aby " -"sme mohli overiť, že ste ho zadali správne." msgid "Change my password" msgstr "Zmeniť moje heslo" @@ -646,18 +636,14 @@ msgstr "" "použitý. Prosím, požiadajte znovu o obnovu hesla." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Čoskoro by ste mali dostať inštrukcie pre nastavenie hesla, ak existuje " -"konto s emailom, ktorý ste zadali. " msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Ak ste nedostali email, uistite sa, že ste zadali adresu, s ktorou ste sa " -"registrovali a skontrolujte svoj spamový priečinok." #, python-format msgid "" @@ -670,8 +656,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Prosím, choďte na túto stránku a zvoľte si nové heslo:" -msgid "Your username, in case you've forgotten:" -msgstr "Vaše používateľské meno, pre prípad, že ste ho zabudli:" +msgid "Your username, in case you’ve forgotten:" +msgstr "Ak ste náhodou zabudli, vaše používateľské meno je:" msgid "Thanks for using our site!" msgstr "Ďakujeme, že používate našu stránku!" @@ -681,11 +667,9 @@ msgid "The %(site_name)s team" msgstr "Tím %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Zabudli ste heslo? Zadajte svoju e-mailovú adresu a my vám pošleme " -"inštrukcie pre nastavenie nového hesla." msgid "Email address:" msgstr "E-mailová adresa:" @@ -706,7 +690,7 @@ msgstr "Vybrať \"%s\" na úpravu" #, python-format msgid "Select %s to view" -msgstr "" +msgstr "Pre zobrazenie %s zvolte" msgid "Date:" msgstr "Dátum:" diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo index 111a4737b7ba..e9ea005a6623 100644 Binary files a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po index 40a8214c43a6..aac5afe52795 100644 --- a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Besnik , 2011,2015 -# Besnik , 2015,2018-2019 +# Besnik Bleta , 2011,2015 +# Besnik Bleta , 2020 +# Besnik Bleta , 2015,2018-2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 09:47+0000\n" -"Last-Translator: Besnik \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-14 22:38+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Albanian (http://www.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -69,6 +70,12 @@ msgstr "Pa datë" msgid "Has date" msgstr "Ka datë" +msgid "Empty" +msgstr "E zbrazët" + +msgid "Not empty" +msgstr "Jo e zbrazët" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -330,7 +337,20 @@ msgid "Select all %(total_count)s %(module_name)s" msgstr "Përzgjidhni krejt %(total_count)s %(module_name)s" msgid "Clear selection" -msgstr "Pastroje përzgjedhjen" +msgstr "Spastroje përzgjedhjen" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modele te aplikacioni %(name)s" + +msgid "Add" +msgstr "Shtoni" + +msgid "View" +msgstr "Shiheni" + +msgid "You don’t have permission to view or edit anything." +msgstr "S’keni leje të shihni apo të përpunoni gjë." msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " @@ -381,6 +401,9 @@ msgstr "Shiheni në sajt" msgid "Filter" msgstr "Filtër" +msgid "Clear all filters" +msgstr "Spastroji krejt filtrat" + msgid "Remove from sorting" msgstr "Hiqe prej renditjeje" @@ -458,9 +481,6 @@ msgstr "" "Jeni i sigurt se doni të fshihen %(objects_name)s e përzgjedhur? Krejt " "objektet vijues dhe gjëra të lidhura me ta do të fshihen:" -msgid "View" -msgstr "Shiheni" - msgid "Delete?" msgstr "Të fshihet?" @@ -471,16 +491,6 @@ msgstr " Nga %(filter_title)s " msgid "Summary" msgstr "Përmbledhje" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modele te aplikacioni %(name)s" - -msgid "Add" -msgstr "Shtoni" - -msgid "You don’t have permission to view or edit anything." -msgstr "S’keni leje të shihni apo të përpunoni gjë." - msgid "Recent actions" msgstr "Veprime së fundi" @@ -513,6 +523,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Harruat fjalëkalimin ose emrin tuaj të përdoruesit?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Datë/kohë" diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo index 230c8a99da03..3feecc2edeae 100644 Binary files a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po index 163c24117cad..fe02462188ba 100644 --- a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Besnik , 2011-2012,2015 -# Besnik , 2015,2017 +# Besnik Bleta , 2011-2012,2015 +# Besnik Bleta , 2020-2021 +# Besnik Bleta , 2015,2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2017-11-29 22:17+0000\n" -"Last-Translator: Besnik \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 13:33+0000\n" +"Last-Translator: Besnik Bleta \n" "Language-Team: Albanian (http://www.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -84,17 +85,17 @@ msgstr "" "kryeni një veprim, ndryshimet e paruajtura do të humbin." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Keni përzgjedhur një veprim, por nuk keni ruajtur ende ndryshimet që bëtë te " +"Keni përzgjedhur një veprim, por s’keni ruajtur ende ndryshimet që bëtë te " "fusha individuale. Ju lutemi, klikoni OK që të bëhet ruajtja. Do t’ju duhet " "ta ribëni veprimin." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" "Keni përzgjedhur një veprim, dhe nuk keni bërë ndonjë ndryshim te fusha " @@ -185,6 +186,54 @@ msgstr "Nëntor" msgid "December" msgstr "Dhjetor" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Shk" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Pri" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Maj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Qer" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Kor" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Gus" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Sht" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Tet" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Nën" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Dhje" + msgctxt "one letter Sunday" msgid "S" msgstr "D" diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo index 16d4e9db2944..ae2b979943de 100644 Binary files a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po index ad5c35dc15f6..246d8b1c085d 100644 --- a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Branko Kokanovic , 2018 -# Igor Jerosimić, 2019 +# Igor Jerosimić, 2019,2021 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-06-27 19:30+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 18:04+0000\n" "Last-Translator: Igor Jerosimić\n" "Language-Team: Serbian (http://www.transifex.com/django/django/language/" "sr/)\n" @@ -21,6 +21,10 @@ msgstr "" "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" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Бриши означене објекте класе %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно обрисано: %(count)d %(items)s." @@ -32,10 +36,6 @@ msgstr "Несуспело брисање %(name)s" msgid "Are you sure?" msgstr "Да ли сте сигурни?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Бриши означене објекте класе %(verbose_name_plural)s" - msgid "Administration" msgstr "Администрација" @@ -72,6 +72,12 @@ msgstr "Нема датума" msgid "Has date" msgstr "Има датум" +msgid "Empty" +msgstr "Празно" + +msgid "Not empty" +msgstr "Није празно" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -129,23 +135,23 @@ msgid "log entries" msgstr "записи у логовима" #, python-format -msgid "Added \"%(object)s\"." -msgstr "Додат објекат класе „%(object)s“." +msgid "Added “%(object)s”." +msgstr "" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Промењен објекат класе „%(object)s“ - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "Уклоњен објекат класе „%(object)s“." +msgid "Deleted “%(object)s.”" +msgstr "" msgid "LogEntry Object" msgstr "Објекат уноса лога" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "Додат објекат {name} \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "" msgid "Added." msgstr "Додато." @@ -154,16 +160,16 @@ msgid "and" msgstr "и" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Измењена поља {fields} за {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "" #, python-brace-format msgid "Changed {fields}." msgstr "Измењена поља {fields}." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "Обрисан објекат {name} \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "" msgid "No fields changed." msgstr "Без измена у пољима." @@ -171,48 +177,39 @@ msgstr "Без измена у пољима." msgid "None" msgstr "Ништа" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Држите „Control“, или „Command“ на Mac-у да бисте обележили више од једне " -"ставке." #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "Објекат {name} \"{obj}\" успешно додат." +msgid "The {name} “{obj}” was added successfully." +msgstr "" msgid "You may edit it again below." msgstr "Можете га изменити опет испод" #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "" -"Објекат {name} \"{obj}\" успешно додат. Можете додати још један {name} испод." #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +"The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -"Објекат {name} \"{obj}\" успешно измењен. Можете га опет изменити испод." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "Објекат {name} \"{obj}\" успешно додат. Испод га можете изменити." +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -"Објекат {name} \"{obj}\" успешно измењен. Можете додати још један {name} " -"испод." #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "Објекат {name} \"{obj}\" успешно измењен." +msgid "The {name} “{obj}” was changed successfully." +msgstr "" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -225,12 +222,12 @@ msgid "No action selected." msgstr "Није изабрана ниједна акција." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Објекат „%(obj)s“ класе %(name)s успешно је обрисан." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "%(name)s са идентификацијом \"%(key)s\" не постоји. Можда је избрисан?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -302,8 +299,8 @@ msgstr "%(app)s администрација" msgid "Page not found" msgstr "Страница није пронађена" -msgid "We're sorry, but the requested page could not be found." -msgstr "Жао нам је, тражена страница није пронађена." +msgid "We’re sorry, but the requested page could not be found." +msgstr "" msgid "Home" msgstr "Почетна" @@ -318,11 +315,9 @@ msgid "Server Error (500)" msgstr "Грешка на серверу (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Десила се грешка. Пријављена је администраторима сајта преко е-поште и " -"требало би да ускоро буде исправљена. Хвала Вам на стрпљењу." msgid "Run the selected action" msgstr "Покрени одабрану радњу" @@ -340,12 +335,23 @@ msgstr "Изабери све %(module_name)s од %(total_count)s укупно. msgid "Clear selection" msgstr "Поништи избор" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Модели у апликацији %(name)s" + +msgid "Add" +msgstr "Додај" + +msgid "View" +msgstr "Преглед" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Прво унесите корисничко име и лозинку. Потом ћете моћи да мењате још " -"корисничких подешавања." msgid "Enter a username and password." msgstr "Унесите корисничко име и лозинку" @@ -388,6 +394,9 @@ msgstr "Преглед на сајту" msgid "Filter" msgstr "Филтер" +msgid "Clear all filters" +msgstr "Обриши све филтере" + msgid "Remove from sorting" msgstr "Избаци из сортирања" @@ -430,7 +439,7 @@ msgstr "" msgid "Objects" msgstr "Објекти" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "Да, сигуран сам" msgid "No, take me back" @@ -465,9 +474,6 @@ msgstr "" "Да ли сте сигурни да желите да избришете изабране %(objects_name)s? Сви " "следећи објекти и објекти са њима повезани ће бити избрисани:" -msgid "View" -msgstr "Преглед" - msgid "Delete?" msgstr "Брисање?" @@ -478,16 +484,6 @@ msgstr " %(filter_title)s " msgid "Summary" msgstr "Сумарно" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Модели у апликацији %(name)s" - -msgid "Add" -msgstr "Додај" - -msgid "You don't have permission to view or edit anything." -msgstr "Немате дозвола да погледате или измените ништа." - msgid "Recent actions" msgstr "Скорашње акције" @@ -501,12 +497,10 @@ msgid "Unknown content" msgstr "Непознат садржај" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Нешто није уреду са вашом базом података. Проверите да ли постоје " -"одговарајуће табеле и да ли одговарајући корисник има приступ бази." #, python-format msgid "" @@ -519,6 +513,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Заборавили сте лозинку или корисничко име?" +msgid "Toggle navigation" +msgstr "Укључи/искључи мени" + msgid "Date/time" msgstr "Датум/време" @@ -529,11 +526,9 @@ msgid "Action" msgstr "Радња" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Овај објекат нема забележен историјат измена. Вероватно није додат кроз овај " -"сајт за администрацију." msgid "Show all" msgstr "Прикажи све" @@ -598,11 +593,9 @@ msgid "Your password was changed." msgstr "Ваша лозинка је измењена." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Из безбедносних разлога прво унесите своју стару лозинку, а нову затим " -"унесите два пута да бисмо могли да проверимо да ли сте је правилно унели." msgid "Change my password" msgstr "Измени моју лозинку" @@ -637,18 +630,14 @@ msgstr "" "искоришћен. Поново затражите ресетовање лозинке." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Послали смо Вам упутства за постављање лозинке, уколико налог са овом " -"адресом постоји. Требало би да их добијете ускоро." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"Ако не добијете поруку, проверите да ли сте унели добру адресу са којом сте " -"се и регистровали и проверите спам фасциклу." #, python-format msgid "" @@ -661,8 +650,8 @@ msgstr "" msgid "Please go to the following page and choose a new password:" msgstr "Идите на следећу страницу и поставите нову лозинку." -msgid "Your username, in case you've forgotten:" -msgstr "Уколико сте заборавили, ваше корисничко име:" +msgid "Your username, in case you’ve forgotten:" +msgstr "" msgid "Thanks for using our site!" msgstr "Хвала што користите наш сајт!" @@ -672,11 +661,9 @@ msgid "The %(site_name)s team" msgstr "Екипа сајта %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"Заборавили сте лозинку? Унесите адресу е-поште испод и послаћемо Вам на њу " -"упутства за постављање нове лозинке." msgid "Email address:" msgstr "Адреса е-поште:" diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo index 3c6ee7f7a7b8..e7c332517921 100644 Binary files a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po index 325f7f4be368..947d6fd9e2d4 100644 --- a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po @@ -2,15 +2,16 @@ # # Translators: # Branko Kokanovic , 2018 +# Igor Jerosimić, 2021 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2018-01-30 10:24+0000\n" -"Last-Translator: Branko Kokanovic \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 16:56+0000\n" +"Last-Translator: Igor Jerosimić\n" "Language-Team: Serbian (http://www.transifex.com/django/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -84,16 +85,21 @@ msgstr "" "Имате несачиване измене. Ако покренете акцију, измене ће бити изгубљене." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." -msgstr "Изабрали сте акцију али нисте сачували промене поља." +msgstr "" +"Изабрали сте акцију, али нисте сачували ваше промене у појединачна поља. " +"Кликните на OK да сачувате промене. Биће неопходно да поново покренете " +"акцију." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." -msgstr "Изабрали сте акцију али нисте изменили ни једно поље." +msgstr "" +"Изабрали сте акцију и нисте направили ниједну промену на појединачним " +"пољима. Вероватно тражите Крени дугме уместо Сачувај." msgid "Now" msgstr "Тренутно време" @@ -181,6 +187,54 @@ msgstr "Новембар" msgid "December" msgstr "Децембар" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "јан" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "феб" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "март" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "апр" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "мај" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "јун" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "јул" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "авг" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "сеп" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "окт" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "нов" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "дец" + msgctxt "one letter Sunday" msgid "S" msgstr "Н" diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo index 5cc9a7aefc55..af577b2432ab 100644 Binary files a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po index 1290502735e8..4414514c1803 100644 --- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Igor Jerosimić, 2019 +# Igor Jerosimić, 2019,2021 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-06-27 19:12+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 17:00+0000\n" "Last-Translator: Igor Jerosimić\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/django/django/" "language/sr@latin/)\n" @@ -84,16 +84,21 @@ msgstr "" "Imate nesačivane izmene. Ako pokrenete akciju, izmene će biti izgubljene." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." -msgstr "Izabrali ste akciju ali niste sačuvali promene polja." +msgstr "" +"Izabrali ste akciju, ali niste sačuvali vaše promene u pojedinačna polja. " +"Kliknite na OK da sačuvate promene. Biće neophodno da ponovo pokrenete " +"akciju." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." -msgstr "Izabrali ste akciju ali niste izmenili ni jedno polje." +msgstr "" +"Izabrali ste akciju i niste napravili nijednu promenu na pojedinačnim " +"poljima. Verovatno tražite Kreni dugme umesto Sačuvaj." msgid "Now" msgstr "Trenutno vreme" @@ -181,6 +186,54 @@ msgstr "Novembar" msgid "December" msgstr "Decembar" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "jan" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "feb" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "mart" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "apr" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "maj" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "jun" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "jul" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "avg" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "sep" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "okt" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "nov" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "dec" + msgctxt "one letter Sunday" msgid "S" msgstr "N" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo index 3811a5f5c04a..3acb958de6c4 100644 Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po index 940bfc9e6f8d..6d656d36e97c 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po @@ -7,6 +7,7 @@ # Cybjit , 2012 # Henrik Palmlund Wahlgren , 2019 # Jannis Leidel , 2011 +# Johan Rohdin, 2021 # Jonathan Lindén, 2015 # Jonathan Lindén, 2014 # metteludwig , 2019 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-18 14:26+0000\n" -"Last-Translator: metteludwig \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-01 12:33+0000\n" +"Last-Translator: Johan Rohdin\n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -28,6 +29,10 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Ta bort markerade %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Tog bort %(count)d %(items)s" @@ -39,10 +44,6 @@ msgstr "Kan inte ta bort %(name)s" msgid "Are you sure?" msgstr "Är du säker?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Ta bort markerade %(verbose_name_plural)s" - msgid "Administration" msgstr "Administration" @@ -79,6 +80,12 @@ msgstr "Inget datum" msgid "Has date" msgstr "Har datum" +msgid "Empty" +msgstr "" + +msgid "Not empty" +msgstr "" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -240,7 +247,7 @@ msgstr "Ändra %s" #, python-format msgid "View %s" -msgstr "Visa 1%s" +msgstr "Visa %s" msgid "Database error" msgstr "Databasfel" @@ -318,7 +325,7 @@ msgid "" "email and should be fixed shortly. Thanks for your patience." msgstr "" "Ett fel har inträffat. Felet är rapporterat till sidans administratörer via " -"e-post, och borde åtgärdas skyndsamt. Tack för ditt tålamod." +"e-post och bör vara åtgärdat inom kort. Tack för ditt tålamod." msgid "Run the selected action" msgstr "Kör markerade operationer" @@ -336,6 +343,19 @@ msgstr "Välj alla %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Rensa urval" +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeller i applikationen %(name)s" + +msgid "Add" +msgstr "Lägg till" + +msgid "View" +msgstr "Visa" + +msgid "You don’t have permission to view or edit anything." +msgstr "Du har inte tillåtelse att se eller ändra någonting." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -384,6 +404,9 @@ msgstr "Visa på webbplats" msgid "Filter" msgstr "Filtrera" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Ta bort från sortering" @@ -461,9 +484,6 @@ msgstr "" "Är du säker på att du vill ta bort valda %(objects_name)s? Alla följande " "objekt samt relaterade objekt kommer att tas bort: " -msgid "View" -msgstr "Visa" - msgid "Delete?" msgstr "Radera?" @@ -474,16 +494,6 @@ msgstr " På %(filter_title)s " msgid "Summary" msgstr "Översikt" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Modeller i applikationen %(name)s" - -msgid "Add" -msgstr "Lägg till" - -msgid "You don’t have permission to view or edit anything." -msgstr "Du har inte tillåtelse att se eller ändra någonting." - msgid "Recent actions" msgstr "Senaste Händelser" @@ -516,6 +526,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Har du glömt lösenordet eller användarnamnet?" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "Datum tid" @@ -694,7 +707,7 @@ msgstr "Välj %s att ändra" #, python-format msgid "Select %s to view" -msgstr "Välj 1%s för visning" +msgstr "Välj %s för visning" msgid "Date:" msgstr "Datum:" diff --git a/django/contrib/admin/locale/tg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..34085cb0f09a Binary files /dev/null and b/django/contrib/admin/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/tg/LC_MESSAGES/django.po b/django/contrib/admin/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..dee2872666c2 --- /dev/null +++ b/django/contrib/admin/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,699 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Mariusz Felisiak , 2020 +# Surush Sufiew , 2020 +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-30 18:53+0000\n" +"Last-Translator: Mariusz Felisiak \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Муваффақона нест сохтед %(count)d %(items)s." + +#, python-format +msgid "Cannot delete %(name)s" +msgstr "Нест карда нашуд %(name)s" + +msgid "Are you sure?" +msgstr "Шумо рози ҳастед ?" + +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Нест сохтани интихобшудаҳо %(verbose_name_plural)s" + +msgid "Administration" +msgstr "Маъмурият" + +msgid "All" +msgstr "Ҳама" + +msgid "Yes" +msgstr "Ҳа" + +msgid "No" +msgstr "Не" + +msgid "Unknown" +msgstr "Номуайян" + +msgid "Any date" +msgstr "Санаи бефарқ" + +msgid "Today" +msgstr "Имрӯз" + +msgid "Past 7 days" +msgstr "7 рӯзи охир" + +msgid "This month" +msgstr "Моҳи ҷорӣ" + +msgid "This year" +msgstr "Соли ҷорӣ" + +msgid "No date" +msgstr "Сана ишора нашудааст" + +msgid "Has date" +msgstr "Сана ишора шудааст" + +msgid "Empty" +msgstr "Холӣ" + +msgid "Not empty" +msgstr "Холӣ нест" + +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" +"Хоҳиш менамоем %(username)s ва рамзро дуруст ворид созед. Ҳарду майдон " +"метавонанд духура бошанд." + +msgid "Action:" +msgstr "Амал:" + +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Боз якто %(verbose_name)s илова кардан" + +msgid "Remove" +msgstr "Нест кардан" + +msgid "Addition" +msgstr "Иловакунӣ" + +msgid "Change" +msgstr "Тағйир додан" + +msgid "Deletion" +msgstr "Несткунӣ" + +msgid "action time" +msgstr "вақти амал" + +msgid "user" +msgstr "истифодабаранда" + +msgid "content type" +msgstr "намуди контент" + +msgid "object id" +msgstr "идентификатори объект" + +#. Translators: 'repr' means representation +#. (https://docs.python.org/library/functions.html#repr) +msgid "object repr" +msgstr "намоиши объект" + +msgid "action flag" +msgstr "намуди амал" + +msgid "change message" +msgstr "хабар оиди тағйирот" + +msgid "log entry" +msgstr "қайд дар дафтар" + +msgid "log entries" +msgstr "қайдҳо дар дафтар" + +#, python-format +msgid "Added “%(object)s”." +msgstr "Илова шуд \"%(object)s\"" + +#, python-format +msgid "Changed “%(object)s” — %(changes)s" +msgstr "" + +#, python-format +msgid "Deleted “%(object)s.”" +msgstr "" + +msgid "LogEntry Object" +msgstr "Қайд дар дафтар" + +#, python-brace-format +msgid "Added {name} “{object}”." +msgstr "" + +msgid "Added." +msgstr "Илова шуд." + +msgid "and" +msgstr "ва" + +#, python-brace-format +msgid "Changed {fields} for {name} “{object}”." +msgstr "" + +#, python-brace-format +msgid "Changed {fields}." +msgstr "Тағйир ёфт {fields}." + +#, python-brace-format +msgid "Deleted {name} “{object}”." +msgstr "" + +msgid "No fields changed." +msgstr "Ягон майдон тағйир наёфт." + +msgid "None" +msgstr "Не" + +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "" + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully." +msgstr "" + +msgid "You may edit it again below." +msgstr "Шумо метавонед ин объектро дар поён аз нав тағйир диҳед." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "" + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "" + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "" + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may add another {name} " +"below." +msgstr "" + +#, python-brace-format +msgid "The {name} “{obj}” was changed successfully." +msgstr "" + +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" +"Барои иҷрои амал лозим аст, ки объектро интихоб намоед. Тағйирот барои " +"объектҳо ворид нашуданд " + +msgid "No action selected." +msgstr "Ҳеҷ амал инихоб нашудааст." + +#, python-format +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "" + +#, python-format +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "" + +#, python-format +msgid "Add %s" +msgstr "Илова кардан %s" + +#, python-format +msgid "Change %s" +msgstr "Тағйир додан %s" + +#, python-format +msgid "View %s" +msgstr "Азназаргузаронӣ %s" + +msgid "Database error" +msgstr "Мушкилӣ дар базаи додаҳо" + +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "Интихоб карда шуд 0 аз %(cnt)s " + +#, python-format +msgid "Change history: %s" +msgstr "Таърихи вориди тағйирот: %s" + +#. Translators: Model verbose name and instance representation, +#. suitable to be an item in a list. +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" +"Несткунии объекти %(instance)s намуди %(class_name)s талаб мекунад, ки " +"объектҳои алоқамандшудаизерин низ нест карда шаванд: %(related_objects)s" + +msgid "Django site admin" +msgstr "Сомонаи маъмурии Django" + +msgid "Django administration" +msgstr "Маъмурияти Django" + +msgid "Site administration" +msgstr "Маъмурияти сомона" + +msgid "Log in" +msgstr "Ворид шудан" + +#, python-format +msgid "%(app)s administration" +msgstr "Маъмурияти барномаи «%(app)s»" + +msgid "Page not found" +msgstr "Саҳифа ёфт нашуд" + +msgid "We’re sorry, but the requested page could not be found." +msgstr "" + +msgid "Home" +msgstr "Асосӣ" + +msgid "Server error" +msgstr "Мушкилӣ дар сервер" + +msgid "Server error (500)" +msgstr "Мушкилӣ дар сервер (500)" + +msgid "Server Error (500)" +msgstr "Мушкилӣ дар сервер (500)" + +msgid "" +"There’s been an error. It’s been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" + +msgid "Run the selected action" +msgstr "Иҷрои амалҳои ихтихобшуда" + +msgid "Go" +msgstr "Иҷро кардан" + +msgid "Click here to select the objects across all pages" +msgstr "Барои интихоби объектҳо дар ҳамаи саҳифаҳо, инҷоро пахш намоед" + +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "Интихоби ҳамаи %(module_name)s (%(total_count)s)" + +msgid "Clear selection" +msgstr "Бекоркунии интихоб" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "Моелҳои барномаи %(name)s" + +msgid "Add" +msgstr "Илова кардан" + +msgid "View" +msgstr "Азназаргузаронӣ" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + +msgid "" +"First, enter a username and password. Then, you’ll be able to edit more user " +"options." +msgstr "" + +msgid "Enter a username and password." +msgstr "Ном ва рамзро ворид созед." + +msgid "Change password" +msgstr "Тағйир додани рамз" + +msgid "Please correct the error below." +msgstr "Хоҳишмандем, хатогии зеринро ислоҳ кунед." + +msgid "Please correct the errors below." +msgstr "Хоҳишмандем, хатогиҳои зеринро ислоҳ кунед." + +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "Рамзи навро ворид созед %(username)s." + +msgid "Welcome," +msgstr "Марҳамат," + +msgid "View site" +msgstr "Гузариш ба сомона" + +msgid "Documentation" +msgstr "Ҳуҷҷатнигорӣ" + +msgid "Log out" +msgstr "Баромад" + +#, python-format +msgid "Add %(name)s" +msgstr "Дохил кардани %(name)s" + +msgid "History" +msgstr "Таърих" + +msgid "View on site" +msgstr "Дар сомона дидан" + +msgid "Filter" +msgstr "Поло(Filter)" + +msgid "Clear all filters" +msgstr "" + +msgid "Remove from sorting" +msgstr "Аз қайди навъҳо баровардан" + +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "Бартарии навъҳо: %(priority_number)s" + +msgid "Toggle sorting" +msgstr "Навъҷудокунӣ дар дигар раванд" + +msgid "Delete" +msgstr "Нест кардан" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"Нест кардани %(object_name)s '%(escaped_object)s' ба нестсозии объектҳои ба " +"он алоқаманд оварда мерасонад, аммо'ҳисоби корбарӣ'-и (аккаунт) шумо иҷозати " +"нестсозии объектҳои зеринро надорад:" + +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Нестсозии %(object_name)s '%(escaped_object)s' талаб менамояд, ки " +"объектҳоиалоқаманди муҳофизатии зерин нест карда шаванд:" + +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Шумо боварӣ доред, ки ин элементҳо нест карда шаванд: %(object_name)s " +"\"%(escaped_object)s\"? Ҳамаи объектҳои алоқаманди зерин низ нест карда " +"мешаванд:" + +msgid "Objects" +msgstr "Объектҳо" + +msgid "Yes, I’m sure" +msgstr "" + +msgid "No, take me back" +msgstr "Не, баргаштан" + +msgid "Delete multiple objects" +msgstr "Нестсозии якчанд объектҳо" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Нест кардани %(objects_name)s ба нестсозии объектҳои ба он алоқаманд оварда " +"мерасонад, аммо'ҳисоби корбарӣ'-и (аккаунт) шумо иҷозати нестсозии объектҳои " +"зеринро надорад:" + +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Нестсозии %(objects_name)s талаб менамояд, ки объектҳоиалоқаманди " +"муҳофизатии зерин нест карда шаванд:" + +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"Шумо боварӣ доред, ки ин элементҳо нест карда шаванд: %(objects_name)s? " +"Ҳамаи объектҳои алоқаманди зерин низ нест карда мешаванд:" + +msgid "Delete?" +msgstr "Нест кардан?" + +#, python-format +msgid " By %(filter_title)s " +msgstr "%(filter_title)s" + +msgid "Summary" +msgstr "Мухтасар" + +msgid "Recent actions" +msgstr "Амалҳои охирин" + +msgid "My actions" +msgstr "Амалҳои ман" + +msgid "None available" +msgstr "Дастнорас" + +msgid "Unknown content" +msgstr "Шакли номуайян" + +msgid "" +"Something’s wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#, python-format +msgid "" +"You are authenticated as %(username)s, but are not authorized to access this " +"page. Would you like to login to a different account?" +msgstr "" +"Шумо ба система ҳамчун %(username)s, ворид шудед, вале салоҳияти шумобарои " +"азназаргузарониисаҳифаи мазкур нокифоя аст. Шояд шумо мехоҳед бо истифода аз " +"дигар 'ҳисоби корбарӣ' вориди система шавед." + +msgid "Forgotten your password or username?" +msgstr "Рамз ё номро фаромӯш кардед?" + +msgid "Toggle navigation" +msgstr "" + +msgid "Date/time" +msgstr "Сана ва вақт" + +msgid "User" +msgstr "Истифодабар" + +msgid "Action" +msgstr "Амал" + +msgid "" +"This object doesn’t have a change history. It probably wasn’t added via this " +"admin site." +msgstr "" + +msgid "Show all" +msgstr "Ҳамаро нишон додан" + +msgid "Save" +msgstr "Ҳифз кардан" + +msgid "Popup closing…" +msgstr "Равзанаи иловагӣ пӯшида мешавад..." + +msgid "Search" +msgstr "Ёфтан" + +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "%(full_result_count)s total" +msgstr "%(full_result_count)s ҳамаги" + +msgid "Save as new" +msgstr "Ҳамчун объекти нав ҳифз кардан" + +msgid "Save and add another" +msgstr "Ҳифз кардан ва объекти дигар илова кардан" + +msgid "Save and continue editing" +msgstr "Ҳифз кардан ва танзимотро давом додан" + +msgid "Save and view" +msgstr "Ҳифз кардан ва аз назар гузаронидан" + +msgid "Close" +msgstr "Пӯшидан" + +#, python-format +msgid "Change selected %(model)s" +msgstr "Объекти интихобшударо тағйир додан: \"%(model)s\"" + +#, python-format +msgid "Add another %(model)s" +msgstr "Воридсозии боз як объекти \"%(model)s\"" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "Объекти зерини интихобшударо нест кардан \"%(model)s\"" + +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Барои вақти дар ин сомона сарф кардаатон миннатдорем." + +msgid "Log in again" +msgstr "Аз нав ворид шудан" + +msgid "Password change" +msgstr "Тағйири рамз" + +msgid "Your password was changed." +msgstr "Рамзи шумо тағйир дода шуд." + +msgid "" +"Please enter your old password, for security’s sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +msgid "Change my password" +msgstr "Тағйири рамзи ман" + +msgid "Password reset" +msgstr "Барқароркунии рамз" + +msgid "Your password has been set. You may go ahead and log in now." +msgstr "Рамзи шумо ҳифз шуд. Акнун шумо метавонед ворид шавед." + +msgid "Password reset confirmation" +msgstr "Барқароркунии рамз тасдиқ карда шуд." + +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" +"Хоҳиш мекунем рамзи нави худро ду маротиба(бояд ҳарду мувофиқат кунанд) " +"дохил кунед." + +msgid "New password:" +msgstr "Рамзи нав:" + +msgid "Confirm password:" +msgstr "Рамзи тасдиқӣ:" + +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"Суроға барои барқароркунии рамз нодуруст аст. Эҳтимол алакай як маротиба " +"истифода шудааст.Амали барқароркунии рамзро такрор намоед." + +msgid "" +"We’ve emailed you instructions for setting your password, if an account " +"exists with the email you entered. You should receive them shortly." +msgstr "" + +msgid "" +"If you don’t receive an email, please make sure you’ve entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" +"Шумо ин матубро гирифтед барои он, ки аз сомонаи %(site_name)s, ки бо ин " +"почтаи электронӣ алоқаманд аст,ба мо дархост барои барқароркунии рамз қабул " +"шуд." + +msgid "Please go to the following page and choose a new password:" +msgstr "Хоҳишмандем ба ин саҳифа гузаред ва рамзи навро ворид созед:" + +msgid "Your username, in case you’ve forgotten:" +msgstr "" + +msgid "Thanks for using our site!" +msgstr "Барои аз сомонаи мо истифода карданатон сипосгузорем!" + +#, python-format +msgid "The %(site_name)s team" +msgstr "Гурӯҳи ташкили %(site_name)s" + +msgid "" +"Forgotten your password? Enter your email address below, and we’ll email " +"instructions for setting a new one." +msgstr "" + +msgid "Email address:" +msgstr "Суроғаи почтаи электронӣ:" + +msgid "Reset my password" +msgstr "Барқароркунии рамзи ман" + +msgid "All dates" +msgstr "Ҳама санаҳо" + +#, python-format +msgid "Select %s" +msgstr "Интихоб кунед %s" + +#, python-format +msgid "Select %s to change" +msgstr "Интихоби %s барои тағйирот ворид сохтан " + +#, python-format +msgid "Select %s to view" +msgstr "Интихоби %s барои азназаргузаронӣ" + +msgid "Date:" +msgstr "Сана:" + +msgid "Time:" +msgstr "Вақт:" + +msgid "Lookup" +msgstr "Ҷустуҷӯ" + +msgid "Currently:" +msgstr "Ҷорӣ:" + +msgid "Change:" +msgstr "Тағйир додан:" diff --git a/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.mo new file mode 100644 index 000000000000..2c0655198bdb Binary files /dev/null and b/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.po new file mode 100644 index 000000000000..b5f4fdb4280e --- /dev/null +++ b/django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.po @@ -0,0 +1,222 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"PO-Revision-Date: 2020-05-15 01:22+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, javascript-format +msgid "Available %s" +msgstr "Дастрас %s" + +#, javascript-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"Ин руйхати %s - ҳои дастрас. Шумо метавонед якчандто аз инҳоро дар " +"майдонипоён бо пахши тугмаи \\'Интихоб кардан'\\ интихоб намоед." + +#, javascript-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" +"Барои баровардани рӯйхати %s. -ҳои дастрас, ба воридсозии матни лозима шурӯъ " +"кунед" + +msgid "Filter" +msgstr "Поло" + +msgid "Choose all" +msgstr "Интихоби кулл" + +#, javascript-format +msgid "Click to choose all %s at once." +msgstr "Барои якбора интихоб намудани кулли %s инҷоро пахш намоед." + +msgid "Choose" +msgstr "интихоб кардан" + +msgid "Remove" +msgstr "Нест кардан" + +#, javascript-format +msgid "Chosen %s" +msgstr "%s -ҳои интихобшуда" + +#, javascript-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" +"Ин руйхати %s - ҳои интихобшуда. Шумо метавонед якчандто аз инҳоро дар " +"майдонипоён бо пахши тугмаи \\'Нест кардан'\\ нест созед." + +msgid "Remove all" +msgstr "Нест кардан ба таври кулл" + +#, javascript-format +msgid "Click to remove all chosen %s at once." +msgstr "Пахш кунед барои якбора нест кардани ҳамаи %s." + +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" +"Тағйиротҳои ҳифзнакардашуда дар майдони таҳрир мавҷуданд. Агаршумо иҷрои " +"амалро давом диҳед, онҳо нест хоҳанд шуд." + +msgid "" +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " +"action." +msgstr "" +"Шумо амалро интихоб намудед, вале ҳануз тағйиротҳои ворид кардашуда ҳифз " +"нашудаанд.\"\n" +"\"Барои ҳифз намудани онҳо ба тугмаи 'ОК' пахш намоед.\"\n" +"\"Сипас шуморо лозим меояд, ки амалро такроран иҷро намоед" + +msgid "" +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " +"button." +msgstr "" +"\"Шумо амалрор интихоб намудед, вале тағйирот ворид насохтед.\"\n" +"\"Эҳтимол шумо мехостед ба ҷои тугмаи \\'Ҳифз кардан'\\, аз тугмаи \\'Иҷро " +"кардан'\\ истифода намоед.\"\n" +"\"Агар чунин бошад, он гоҳ тугмаи \\'Инкор'\\ пахш кунед, то ки ба майдони " +"таҳриркунӣ баргардед.\"" + +msgid "Now" +msgstr "Ҳозир" + +msgid "Midnight" +msgstr "Нисфишабӣ" + +msgid "6 a.m." +msgstr "6-и саҳар" + +msgid "Noon" +msgstr "Нисфирӯзӣ" + +msgid "6 p.m." +msgstr "6-и бегоҳӣ" + +#, javascript-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#, javascript-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +msgid "Choose a Time" +msgstr "Вақтро интихоб кунед" + +msgid "Choose a time" +msgstr "Вақтро интихоб кунед" + +msgid "Cancel" +msgstr "Инкор" + +msgid "Today" +msgstr "Имрӯз" + +msgid "Choose a Date" +msgstr "Санаро интихоб кунед" + +msgid "Yesterday" +msgstr "Дирӯз" + +msgid "Tomorrow" +msgstr "Фардо" + +msgid "January" +msgstr "Январ" + +msgid "February" +msgstr "Феврал" + +msgid "March" +msgstr "Март" + +msgid "April" +msgstr "Апрел" + +msgid "May" +msgstr "Май" + +msgid "June" +msgstr "Июн" + +msgid "July" +msgstr "Июл" + +msgid "August" +msgstr "Август" + +msgid "September" +msgstr "Сентябр" + +msgid "October" +msgstr "Октябр" + +msgid "November" +msgstr "Ноябр" + +msgid "December" +msgstr "Декабр" + +msgctxt "one letter Sunday" +msgid "S" +msgstr "Я" + +msgctxt "one letter Monday" +msgid "M" +msgstr "Д" + +msgctxt "one letter Tuesday" +msgid "T" +msgstr "С" + +msgctxt "one letter Wednesday" +msgid "W" +msgstr "Ч" + +msgctxt "one letter Thursday" +msgid "T" +msgstr "П" + +msgctxt "one letter Friday" +msgid "F" +msgstr "Ҷ" + +msgctxt "one letter Saturday" +msgid "S" +msgstr "Ш" + +msgid "Show" +msgstr "Нишон додан" + +msgid "Hide" +msgstr "Пинҳон кардан" diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo index f252fba72b7c..f1a96bdbcfc7 100644 Binary files a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po index 0f9d3f8c9138..f7b9195ce662 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# BouRock, 2015-2019 +# BouRock, 2015-2020 # BouRock, 2014-2015 # Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2012 @@ -10,12 +10,13 @@ # Jannis Leidel , 2011 # Mesut Can Gürle , 2013 # Murat Sahin , 2011 +# Yigit Guler , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 07:45+0000\n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-07-15 08:30+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -76,6 +77,12 @@ msgstr "Tarih yok" msgid "Has date" msgstr "Tarih var" +msgid "Empty" +msgstr "Boş" + +msgid "Not empty" +msgstr "Boş değil" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -323,7 +330,7 @@ msgid "" "email and should be fixed shortly. Thanks for your patience." msgstr "" "Bir hata oluştu. Site yöneticilerine e-posta yoluyla bildirildi ve kısa süre " -"içinde düzeltilmelidir. Sabrınız için teşekkür ederiz." +"içinde düzeltilecektir. Sabrınız için teşekkür ederiz." msgid "Run the selected action" msgstr "Seçilen eylemi çalıştır" @@ -341,6 +348,19 @@ msgstr "Tüm %(total_count)s %(module_name)s nesnelerini seç" msgid "Clear selection" msgstr "Seçimi temizle" +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s uygulamasındaki modeller" + +msgid "Add" +msgstr "Ekle" + +msgid "View" +msgstr "Göster" + +msgid "You don’t have permission to view or edit anything." +msgstr "Hiçbir şeyi düzenlemek ve göstermek için izne sahip değilsiniz." + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -389,6 +409,9 @@ msgstr "Sitede görüntüle" msgid "Filter" msgstr "Süz" +msgid "Clear all filters" +msgstr "Tüm süzgeçleri temizle" + msgid "Remove from sorting" msgstr "Sıralamadan kaldır" @@ -466,9 +489,6 @@ msgstr "" "Seçilen %(objects_name)s nesnelerini silmek istediğinize emin misiniz? " "Aşağıdaki nesnelerin tümü ve onların ilgili öğeleri silinecektir:" -msgid "View" -msgstr "Göster" - msgid "Delete?" msgstr "Silinsin mi?" @@ -479,16 +499,6 @@ msgstr " %(filter_title)s süzgecine göre" msgid "Summary" msgstr "Özet" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s uygulamasındaki modeller" - -msgid "Add" -msgstr "Ekle" - -msgid "You don’t have permission to view or edit anything." -msgstr "Hiçbir şeyi düzenlemek ve göstermek için izne sahip değilsiniz." - msgid "Recent actions" msgstr "Son eylemler" @@ -521,6 +531,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Kullanıcı adınızı veya parolanızı mı unuttunuz?" +msgid "Toggle navigation" +msgstr "Gezinmeyi aç/kapat" + msgid "Date/time" msgstr "Tarih/saat" @@ -587,8 +600,7 @@ msgid "Delete selected %(model)s" msgstr "Seçilen %(model)s sil" msgid "Thanks for spending some quality time with the Web site today." -msgstr "" -"Bugün Web sitesinde biraz güzel zaman geçirdiğiniz için teşekkür ederiz." +msgstr "Bugün Web sitesine ayırdığınız kaliteli zaman için teşekkür ederiz." msgid "Log in again" msgstr "Tekrar oturum aç" diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo index cf61c236433a..aff5543d9cef 100644 Binary files a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po index d883f5ca3bdc..354c99b1f1e5 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po @@ -1,17 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# BouRock, 2015-2016,2019 +# BouRock, 2015-2016,2019-2021 # BouRock, 2014 # Jannis Leidel , 2011 # Metin Amiroff , 2011 -# Murat Çorlu , 2012 +# Murat Çorlu , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-09-17 07:46+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-16 19:30+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -86,20 +86,20 @@ msgstr "" "bir eylem çalıştırırsanız, kaydedilmemiş değişiklikleriniz kaybolacaktır." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Bir eylem seçtiniz, fakat henüz bireysel alanlara değişikliklerinizi " -"kaydetmediniz. Kaydetmek için lütfen TAMAM düğmesine tıklayın. Eylemi " -"yeniden çalıştırmanız gerekecek." +"Bir eylem seçtiniz, ancak değişikliklerinizi tek tek alanlara kaydetmediniz. " +"Kaydetmek için lütfen TAMAM düğmesine tıklayın. Eylemi yeniden çalıştırmanız " +"gerekecek." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Bir eylem seçtiniz, fakat bireysel alanlar üzerinde hiçbir değişiklik " +"Bir eylem seçtiniz, ancak tek tek alanlarda herhangi bir değişiklik " "yapmadınız. Muhtemelen Kaydet düğmesi yerine Git düğmesini arıyorsunuz." msgid "Now" @@ -186,6 +186,54 @@ msgstr "Kasım" msgid "December" msgstr "Aralık" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Oca" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Şub" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Mar" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Nis" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "May" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Haz" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Tem" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Ağu" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Eyl" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Eki" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Kas" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Ara" + msgctxt "one letter Sunday" msgid "S" msgstr "P" diff --git a/django/contrib/admin/locale/uz/LC_MESSAGES/django.mo b/django/contrib/admin/locale/uz/LC_MESSAGES/django.mo index 66b854d9a302..6fa33743d7e0 100644 Binary files a/django/contrib/admin/locale/uz/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/uz/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/uz/LC_MESSAGES/django.po b/django/contrib/admin/locale/uz/LC_MESSAGES/django.po index 767edf7f5ba7..b5cdb16d3946 100644 --- a/django/contrib/admin/locale/uz/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/uz/LC_MESSAGES/django.po @@ -4,15 +4,16 @@ # Anvar Ulugov , 2020 # Bedilbek Khamidov , 2019 # Claude Paroz , 2019 +# Shukrullo Turgunov , 2021 # Sukhrobbek Ismatov , 2019 # Yet Sum , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-21 09:24+0000\n" -"Last-Translator: Anvar Ulugov \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-23 11:13+0000\n" +"Last-Translator: Shukrullo Turgunov \n" "Language-Team: Uzbek (http://www.transifex.com/django/django/language/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +21,21 @@ msgstr "" "Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "%(verbose_name_plural)s tanlanganlarni o'chirish" + #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "Muvaffaqiyatli %(count)d%(items)s o'chirildi." +msgstr "%(count)d%(items)s muvaffaqiyatli o'chirildi." #, python-format msgid "Cannot delete %(name)s" -msgstr "%(name)s o'chirib bo'lmaydi" +msgstr "%(name)s o'chirib bo'lmadi" msgid "Are you sure?" msgstr "Ishonchingiz komilmi?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "%(verbose_name_plural)s tanlanganlarini o'chirish" - msgid "Administration" msgstr "Administratsiya" @@ -71,6 +72,12 @@ msgstr "Sanasi yo'q" msgid "Has date" msgstr "Sanasi bor" +msgid "Empty" +msgstr "Bo'sh" + +msgid "Not empty" +msgstr "Bo'sh emas" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -129,15 +136,15 @@ msgstr "" #, python-format msgid "Added “%(object)s”." -msgstr "" +msgstr "\"%(object)s\" qo'shildi." #, python-format msgid "Changed “%(object)s” — %(changes)s" -msgstr "" +msgstr "%(object)s dan %(changes)sga o'zgartirildi." #, python-format msgid "Deleted “%(object)s.”" -msgstr "" +msgstr "\"%(object)s\" o'chirildi." msgid "LogEntry Object" msgstr "" @@ -320,6 +327,19 @@ msgstr "" msgid "Clear selection" msgstr "" +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +msgid "Add" +msgstr "Qo'shish" + +msgid "View" +msgstr "Ko'rish" + +msgid "You don’t have permission to view or edit anything." +msgstr "" + msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." @@ -366,6 +386,9 @@ msgstr "Saytda ko'rish" msgid "Filter" msgstr "Saralash" +msgid "Clear all filters" +msgstr "" + msgid "Remove from sorting" msgstr "Tartiblashdan chiqarish" @@ -429,9 +452,6 @@ msgid "" "following objects and their related items will be deleted:" msgstr "" -msgid "View" -msgstr "Ko'rish" - msgid "Delete?" msgstr "O'chirasizmi?" @@ -442,16 +462,6 @@ msgstr "" msgid "Summary" msgstr "Xulosa" -#, python-format -msgid "Models in the %(name)s application" -msgstr "" - -msgid "Add" -msgstr "Qo'shish" - -msgid "You don’t have permission to view or edit anything." -msgstr "" - msgid "Recent actions" msgstr "So'ngi harakatlar" @@ -479,6 +489,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" +msgid "Toggle navigation" +msgstr "" + msgid "Date/time" msgstr "" diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo index 8a5dd9364286..1d6d75abc398 100644 Binary files a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po index f063f60879ec..773847bc147f 100644 --- a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,6 +7,7 @@ # Kevin Sze , 2012 # Lele Long , 2011,2015 # Le Yang , 2018 +# li beite , 2020 # Liping Wang , 2016-2017 # mozillazg , 2016 # Ronald White , 2013-2014 @@ -14,21 +15,23 @@ # Sean Lee , 2013 # slene , 2011 # Suntravel Chris , 2019 -# Wentao Han , 2018 +# Wentao Han , 2018,2020 # xuyi wang , 2018 # yf zhan , 2018 # dykai , 2019 # ced773123cfad7b4e8b79ca80f736af9, 2012 +# 嘉琪 方 <370358679@qq.com>, 2020 # Kevin Sze , 2012 +# 考证 李 , 2020 # 雨翌 , 2016 # Ronald White , 2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-15 05:12+0000\n" -"Last-Translator: dykai \n" +"POT-Creation-Date: 2020-07-14 19:53+0200\n" +"PO-Revision-Date: 2020-09-11 01:47+0000\n" +"Last-Translator: 嘉琪 方 <370358679@qq.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -88,6 +91,12 @@ msgstr "没有日期" msgid "Has date" msgstr "具有日期" +msgid "Empty" +msgstr "空" + +msgid "Not empty" +msgstr "非空" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -114,7 +123,7 @@ msgid "Deletion" msgstr "删除" msgid "action time" -msgstr "动作时间" +msgstr "操作时间" msgid "user" msgstr "用户" @@ -143,23 +152,23 @@ msgid "log entries" msgstr "日志记录" #, python-format -msgid "Added \"%(object)s\"." -msgstr "已经添加了 \"%(object)s\"." +msgid "Added “%(object)s”." +msgstr "添加了“%(object)s”。" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "修改了 \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "修改了“%(object)s”—%(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "删除了 \"%(object)s.\"" +msgid "Deleted “%(object)s.”" +msgstr "删除了“%(object)s”。" msgid "LogEntry Object" msgstr "LogEntry对象" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "已添加{name}\"{object}\"。" +msgid "Added {name} “{object}”." +msgstr "添加了 {name}“{object}”。" msgid "Added." msgstr "已添加。" @@ -168,16 +177,16 @@ msgid "and" msgstr "和" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "已修改{name} \"{object}\"的{fields}。" +msgid "Changed {fields} for {name} “{object}”." +msgstr "修改了 {name}“{object}”的 {fields}。" #, python-brace-format msgid "Changed {fields}." msgstr "已修改{fields}。" #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "已删除{name}\"{object}\"。" +msgid "Deleted {name} “{object}”." +msgstr "删除了 {name}“{object}”。" msgid "No fields changed." msgstr "没有字段被修改。" @@ -185,42 +194,39 @@ msgstr "没有字段被修改。" msgid "None" msgstr "无" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "按住 ”Control“，或者Mac上的 “Command”，可以选择多个。" +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "按住 Control 键或 Mac 上的 Command 键来选择多项。" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name}\"{obj}\"添加成功。" +msgid "The {name} “{obj}” was added successfully." +msgstr "成功添加了 {name}“{obj}”。" msgid "You may edit it again below." msgstr "您可以在下面再次编辑它." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." -msgstr "{name} \"{obj}\" 已经添加成功。你可以在下面添加其它的{name}。" +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "成功添加了 {name}“{obj}”。你可以在下面添加另一个 {name}。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "{name} \"{obj}\" 添加成功。你可以在下面再次编辑它。" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "成功修改了 {name}“{obj}”。你可以在下面再次编辑它。" #, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "{name} \"{obj}\" 已经添加成功。你可以在下面再次编辑它。" +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "成功添加了 {name}“{obj}”。你可以在下面再次编辑它。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "{name} \"{obj}\" 已经成功进行变更。你可以在下面添加其它的{name}。" +msgstr "成功修改了 {name}“{obj}”。你可以在下面添加另一个 {name}。" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name}\"{obj}\"修改成功。" +msgid "The {name} “{obj}” was changed successfully." +msgstr "成功修改了 {name}“{obj}”。" msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -231,12 +237,12 @@ msgid "No action selected." msgstr "未选择动作" #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" 删除成功。" +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "成功删除了 %(name)s“%(obj)s”。" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "ID为“%(key)s”的%(name)s不存在。也许它被删除了？ " +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "ID 为“%(key)s”的 %(name)s 不存在。可能已经被删除了？" #, python-format msgid "Add %s" @@ -304,8 +310,8 @@ msgstr "%(app)s 管理" msgid "Page not found" msgstr "页面没有找到" -msgid "We're sorry, but the requested page could not be found." -msgstr "很抱歉，请求页面无法找到。" +msgid "We’re sorry, but the requested page could not be found." +msgstr "非常抱歉，请求的页面不存在。" msgid "Home" msgstr "首页" @@ -320,11 +326,11 @@ msgid "Server Error (500)" msgstr "服务器错误 (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"有一个错误。已经通过电子邮件通知网站管理员，不久以后应该可以修复。谢谢你的参" -"与。" +"发生了错误，已经通过电子邮件报告给了网站管理员。我们会尽快修复，感谢您的耐心" +"等待。" msgid "Run the selected action" msgstr "运行选中的动作" @@ -342,10 +348,23 @@ msgstr "选中所有的 %(total_count)s 个 %(module_name)s" msgid "Clear selection" msgstr "清除选中" +#, python-format +msgid "Models in the %(name)s application" +msgstr "在应用程序 %(name)s 中的模型" + +msgid "Add" +msgstr "增加" + +msgid "View" +msgstr "查看" + +msgid "You don’t have permission to view or edit anything." +msgstr "你没有查看或编辑的权限。" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." -msgstr "首先，输入一个用户名和密码。然后，你就可以编辑更多的用户选项。" +msgstr "输入用户名和密码后，你将能够编辑更多的用户选项。" msgid "Enter a username and password." msgstr "输入用户名和密码" @@ -388,6 +407,9 @@ msgstr "在站点上查看" msgid "Filter" msgstr "过滤器" +msgid "Clear all filters" +msgstr "清除所有过滤器" + msgid "Remove from sorting" msgstr "删除排序" @@ -428,7 +450,7 @@ msgstr "" msgid "Objects" msgstr "对象" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "是的，我确定" msgid "No, take me back" @@ -460,9 +482,6 @@ msgstr "" "请确认要删除选中的 %(objects_name)s 吗？以下所有对象和余它们相关的条目将都会" "被删除：" -msgid "View" -msgstr "查看" - msgid "Delete?" msgstr "删除？" @@ -473,16 +492,6 @@ msgstr " 以 %(filter_title)s" msgid "Summary" msgstr "概览" -#, python-format -msgid "Models in the %(name)s application" -msgstr "在应用程序 %(name)s 中的模型" - -msgid "Add" -msgstr "增加" - -msgid "You don't have permission to view or edit anything." -msgstr "无权查看或修改。" - msgid "Recent actions" msgstr "最近动作" @@ -496,12 +505,12 @@ msgid "Unknown content" msgstr "未知内容" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"你的数据库安装有误。确保已经创建了相应的数据库表，并确保数据库可被相关的用户" -"读取。" +"数据库设置有误。请检查所需的数据库表格是否已经创建，以及数据库用户是否具有正" +"确的权限。" #, python-format msgid "" @@ -514,6 +523,9 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "忘记了您的密码或用户名？" +msgid "Toggle navigation" +msgstr "切换导航" + msgid "Date/time" msgstr "日期/时间" @@ -524,9 +536,9 @@ msgid "Action" msgstr "动作" msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." -msgstr "该对象没有变更历史记录。可能从未通过这个管理站点添加。" +msgstr "此对象没有修改历史。它可能不是通过管理站点添加的。" msgid "Show all" msgstr "显示全部" @@ -589,11 +601,9 @@ msgid "Your password was changed." msgstr "你的密码已修改。" msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." -msgstr "" -"请输入你的旧密码，为了安全起见，接着要输入两遍新密码，以便我们校验你输入的是" -"否正确。" +msgstr "安全起见请输入你的旧密码。然后输入两次你的新密码以确保输入正确。" msgid "Change my password" msgstr "修改我的密码" @@ -624,17 +634,18 @@ msgid "" msgstr "密码重置链接无效，可能是因为它已使用。可以请求一次新的密码重置。" msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"如果您输入的邮件地址所对应的账户存在，设置密码的提示已经发送邮件给您，您将很" -"快收到。" +"如果你所输入的电子邮箱存在对应的用户，我们将通过电子邮件向你发送设置密码的操" +"作步骤说明。你应该很快就会收到。" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" -"如果你没有收到邮件, 请确保您所输入的地址是正确的, 并检查您的垃圾邮件文件夹." +"如果你没有收到电子邮件，请检查输入的是你注册的电子邮箱地址。另外，也请检查你" +"的垃圾邮件文件夹。" #, python-format msgid "" @@ -645,8 +656,8 @@ msgstr "你收到这封邮件是因为你请求重置你在网站 %(site_name)s msgid "Please go to the following page and choose a new password:" msgstr "请访问该页面并选择一个新密码：" -msgid "Your username, in case you've forgotten:" -msgstr "你的用户名，如果已忘记的话：" +msgid "Your username, in case you’ve forgotten:" +msgstr "提醒一下，你的用户名是：" msgid "Thanks for using our site!" msgstr "感谢使用我们的站点！" @@ -656,11 +667,11 @@ msgid "The %(site_name)s team" msgstr "%(site_name)s 团队" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"忘记你的密码了？在下面输入你的电子邮件地址，我们将发送一封设置新密码的邮件给" -"你。" +"忘记密码？在下面输入你的电子邮箱地址，我们将会把设置新密码的操作步骤说明通过" +"电子邮件发送给你。" msgid "Email address:" msgstr "电子邮件地址：" diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo index 2df69307e176..505b8e1a3688 100644 Binary files a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po index b37c86410e52..32dfa619c4c2 100644 --- a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po @@ -1,23 +1,25 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bai HuanCheng (Bestony) , 2018 +# HuanCheng Bai白宦成 , 2018 # Jannis Leidel , 2011 # Kewei Ma , 2016 # Lele Long , 2011,2015 # Liping Wang , 2016 +# matthew Yip , 2020 # mozillazg , 2016 # slene , 2011 +# Veoco , 2021 # spaceoi , 2016 -# Ziang Song , 2012 +# ced773123cfad7b4e8b79ca80f736af9, 2012 # Kevin Sze , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2018-01-14 07:41+0000\n" -"Last-Translator: Bai HuanCheng (Bestony) \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-07 04:25+0000\n" +"Last-Translator: Veoco \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -88,20 +90,20 @@ msgstr "" "你尚未保存一个可编辑栏位的变更. 如果你进行别的动作, 未保存的变更将会丢失." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"你已选则执行一个动作, 但有一个可编辑栏位的变更尚未保存. 请点选确定进行保存. " -"再重新执行该动作." +"你已经选择一个动作，但是你没有保存你单独修改的地方。请点击OK保存。你需要再重" +"新跑这个动作。" msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"你已选则执行一个动作, 但可编辑栏位沒有任何改变. 你应该尝试 '去' 按钮, 而不是 " -"'保存' 按钮." +"你已经选择一个动作，但是没有单独修改任何一处。你可以选择'Go'按键而不" +"是'Save'按键。" msgid "Now" msgstr "现在" @@ -185,6 +187,54 @@ msgstr "十一月" msgid "December" msgstr "十二月" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "一月" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "二月" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "三月" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "四月" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "五月" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "六月" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "七月" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "八月" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "九月" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "十月" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "十一月" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "十二月" + msgctxt "one letter Sunday" msgid "S" msgstr "S" diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 90f14d21363a..6eba48f13817 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -12,6 +12,7 @@ from django.contrib.admin.checks import ( BaseModelAdminChecks, InlineModelAdminChecks, ModelAdminChecks, ) +from django.contrib.admin.decorators import display from django.contrib.admin.exceptions import DisallowedModelAdminToField from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.contrib.admin.utils import ( @@ -19,7 +20,6 @@ get_deleted_objects, lookup_needs_distinct, model_format_dict, model_ngettext, quote, unquote, ) -from django.contrib.admin.views.autocomplete import AutocompleteJsonView from django.contrib.admin.widgets import ( AutocompleteSelect, AutocompleteSelectMultiple, ) @@ -44,7 +44,9 @@ from django.utils.html import format_html from django.utils.http import urlencode from django.utils.safestring import mark_safe -from django.utils.text import capfirst, format_lazy, get_text_list +from django.utils.text import ( + capfirst, format_lazy, get_text_list, smart_split, unescape_string_literal, +) from django.utils.translation import gettext as _, ngettext from django.views.decorators.csrf import csrf_protect from django.views.generic import RedirectView @@ -223,7 +225,7 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs): if 'widget' not in kwargs: if db_field.name in self.get_autocomplete_fields(request): - kwargs['widget'] = AutocompleteSelect(db_field.remote_field, self.admin_site, using=db) + kwargs['widget'] = AutocompleteSelect(db_field, self.admin_site, using=db) elif db_field.name in self.raw_id_fields: kwargs['widget'] = widgets.ForeignKeyRawIdWidget(db_field.remote_field, self.admin_site, using=db) elif db_field.name in self.radio_fields: @@ -253,7 +255,7 @@ def formfield_for_manytomany(self, db_field, request, **kwargs): autocomplete_fields = self.get_autocomplete_fields(request) if db_field.name in autocomplete_fields: kwargs['widget'] = AutocompleteSelectMultiple( - db_field.remote_field, + db_field, self.admin_site, using=db, ) @@ -294,7 +296,7 @@ def get_view_on_site_url(self, obj=None): if callable(self.view_on_site): return self.view_on_site(obj) - elif self.view_on_site and hasattr(obj, 'get_absolute_url'): + elif hasattr(obj, 'get_absolute_url'): # use the ContentType lookup if view_on_site is True return reverse('admin:view_on_site', kwargs={ 'content_type_id': get_content_type_for_model(obj).pk, @@ -620,7 +622,6 @@ def wrapper(*args, **kwargs): return [ path('', wrap(self.changelist_view), name='%s_%s_changelist' % info), path('add/', wrap(self.add_view), name='%s_%s_add' % info), - path('autocomplete/', wrap(self.autocomplete_view), name='%s_%s_autocomplete' % info), path('/history/', wrap(self.history_view), name='%s_%s_history' % info), path('/delete/', wrap(self.delete_view), name='%s_%s_delete' % info), path('/change/', wrap(self.change_view), name='%s_%s_change' % info), @@ -642,9 +643,9 @@ def media(self): 'jquery.init.js', 'core.js', 'admin/RelatedObjectLookups.js', - 'actions%s.js' % extra, + 'actions.js', 'urlify.js', - 'prepopulate%s.js' % extra, + 'prepopulate.js', 'vendor/xregexp/xregexp%s.js' % extra, ] return forms.Media(js=['admin/js/%s' % url for url in js]) @@ -806,7 +807,7 @@ def log_addition(self, request, object, message): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, ADDITION + from django.contrib.admin.models import ADDITION, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -822,7 +823,7 @@ def log_change(self, request, object, message): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, CHANGE + from django.contrib.admin.models import CHANGE, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -839,7 +840,7 @@ def log_deletion(self, request, object, object_repr): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, DELETION + from django.contrib.admin.models import DELETION, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -848,12 +849,16 @@ def log_deletion(self, request, object, object_repr): action_flag=DELETION, ) + @display(description=mark_safe('')) def action_checkbox(self, obj): """ A list_display column containing a checkbox widget. """ return helpers.checkbox.render(helpers.ACTION_CHECKBOX_NAME, str(obj.pk)) - action_checkbox.short_description = mark_safe('') + + @staticmethod + def _get_action_description(func, name): + return getattr(func, 'short_description', capfirst(name.replace('_', ' '))) def _get_base_actions(self): """Return the list of actions, prior to any request-based filtering.""" @@ -867,7 +872,7 @@ def _get_base_actions(self): for (name, func) in self.admin_site.actions: if name in base_action_names: continue - description = getattr(func, 'short_description', name.replace('_', ' ')) + description = self._get_action_description(func, name) actions.append((func, name, description)) # Add actions from this ModelAdmin. actions.extend(base_actions) @@ -936,10 +941,7 @@ def get_action(self, action): except KeyError: return None - if hasattr(func, 'short_description'): - description = func.short_description - else: - description = capfirst(action.replace('_', ' ')) + description = self._get_action_description(func, action) return func, action, description def get_list_display(self, request): @@ -1017,18 +1019,22 @@ def construct_search(field_name): # Otherwise, use the field with icontains. return "%s__icontains" % field_name - use_distinct = False + may_have_duplicates = False search_fields = self.get_search_fields(request) if search_fields and search_term: orm_lookups = [construct_search(str(search_field)) for search_field in search_fields] - for bit in search_term.split(): + for bit in smart_split(search_term): + if bit.startswith(('"', "'")) and bit[0] == bit[-1]: + bit = unescape_string_literal(bit) or_queries = [models.Q(**{orm_lookup: bit}) for orm_lookup in orm_lookups] queryset = queryset.filter(reduce(operator.or_, or_queries)) - use_distinct |= any(lookup_needs_distinct(self.opts, search_spec) for search_spec in orm_lookups) - - return queryset, use_distinct + may_have_duplicates |= any( + lookup_needs_distinct(self.opts, search_spec) + for search_spec in orm_lookups + ) + return queryset, may_have_duplicates def get_preserved_filters(self, request): """ @@ -1623,6 +1629,7 @@ def _changeform_view(self, request, object_id, form_url, extra_context): context = { **self.admin_site.each_context(request), 'title': title % opts.verbose_name, + 'subtitle': str(obj) if obj else None, 'adminform': adminForm, 'object_id': object_id, 'original': obj, @@ -1646,9 +1653,6 @@ def _changeform_view(self, request, object_id, form_url, extra_context): return self.render_change_form(request, context, add=add, change=not add, obj=obj, form_url=form_url) - def autocomplete_view(self, request): - return AutocompleteJsonView.as_view(model_admin=self)(request) - def add_view(self, request, form_url='', extra_context=None): return self.changeform_view(request, None, form_url, extra_context) @@ -1811,6 +1815,7 @@ def changelist_view(self, request, extra_context=None): 'selection_note': _('0 of %(cnt)s selected') % {'cnt': len(cl.result_list)}, 'selection_note_all': selection_note_all % {'total_count': cl.result_count}, 'title': cl.title, + 'subtitle': None, 'is_popup': cl.is_popup, 'to_field': cl.to_field, 'cl': cl, @@ -1887,6 +1892,7 @@ def _delete_view(self, request, object_id, extra_context): context = { **self.admin_site.each_context(request), 'title': title, + 'subtitle': None, 'object_name': object_name, 'object': obj, 'deleted_objects': deleted_objects, @@ -1906,6 +1912,7 @@ def _delete_view(self, request, object_id, extra_context): def history_view(self, request, object_id, extra_context=None): "The 'history' admin view for this model." from django.contrib.admin.models import LogEntry + # First check if the user can see this history. model = self.model obj = self.get_object(request, unquote(object_id)) @@ -1926,6 +1933,7 @@ def history_view(self, request, object_id, extra_context=None): context = { **self.admin_site.each_context(request), 'title': _('Change history: %s') % obj, + 'subtitle': None, 'action_list': action_list, 'module_name': str(capfirst(opts.verbose_name_plural)), 'object': obj, @@ -2024,12 +2032,11 @@ def __init__(self, parent_model, admin_site): @property def media(self): extra = '' if settings.DEBUG else '.min' - js = ['vendor/jquery/jquery%s.js' % extra, 'jquery.init.js', - 'inlines%s.js' % extra] + js = ['vendor/jquery/jquery%s.js' % extra, 'jquery.init.js', 'inlines.js'] if self.filter_vertical or self.filter_horizontal: js.extend(['SelectBox.js', 'SelectFilter2.js']) if self.classes and 'collapse' in self.classes: - js.append('collapse%s.js' % extra) + js.append('collapse.js') return forms.Media(js=['admin/js/%s' % url for url in js]) def get_extra(self, request, obj=None, **kwargs): diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 5cdb2a0f7228..3d9492e198b7 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -3,18 +3,23 @@ from weakref import WeakSet from django.apps import apps +from django.conf import settings from django.contrib.admin import ModelAdmin, actions +from django.contrib.admin.views.autocomplete import AutocompleteJsonView from django.contrib.auth import REDIRECT_FIELD_NAME from django.core.exceptions import ImproperlyConfigured from django.db.models.base import ModelBase -from django.http import Http404, HttpResponseRedirect +from django.http import ( + Http404, HttpResponsePermanentRedirect, HttpResponseRedirect, +) from django.template.response import TemplateResponse -from django.urls import NoReverseMatch, reverse +from django.urls import NoReverseMatch, Resolver404, resolve, reverse from django.utils.functional import LazyObject from django.utils.module_loading import import_string from django.utils.text import capfirst from django.utils.translation import gettext as _, gettext_lazy from django.views.decorators.cache import never_cache +from django.views.decorators.common import no_append_slash from django.views.decorators.csrf import csrf_protect from django.views.i18n import JavaScriptCatalog @@ -52,7 +57,7 @@ class AdminSite: enable_nav_sidebar = True - _empty_value_display = '-' + empty_value_display = '-' login_form = None index_template = None @@ -62,6 +67,8 @@ class AdminSite: password_change_template = None password_change_done_template = None + final_catch_all_view = True + def __init__(self, name='admin'): self._registry = {} # model_class class -> admin_class instance self.name = name @@ -180,14 +187,6 @@ def actions(self): """ return self._actions.items() - @property - def empty_value_display(self): - return self._empty_value_display - - @empty_value_display.setter - def empty_value_display(self, empty_value_display): - self._empty_value_display = empty_value_display - def has_permission(self, request): """ Return True if the given HttpRequest has permission to view @@ -240,11 +239,11 @@ def inner(request, *args, **kwargs): return update_wrapper(inner, view) def get_urls(self): - from django.urls import include, path, re_path # Since this module gets imported in the application's root package, # it cannot import models from other applications at the module level, # and django.contrib.contenttypes.views imports ContentType. from django.contrib.contenttypes import views as contenttype_views + from django.urls import include, path, re_path def wrap(view, cacheable=False): def wrapper(*args, **kwargs): @@ -263,6 +262,7 @@ def wrapper(*args, **kwargs): wrap(self.password_change_done, cacheable=True), name='password_change_done', ), + path('autocomplete/', wrap(self.autocomplete_view), name='autocomplete'), path('jsi18n/', wrap(self.i18n_javascript, cacheable=True), name='jsi18n'), path( 'r///', @@ -288,6 +288,10 @@ def wrapper(*args, **kwargs): urlpatterns += [ re_path(regex, wrap(self.app_index), name='app_list'), ] + + if self.final_catch_all_view: + urlpatterns.append(re_path(r'(?P.*)$', wrap(self.catch_all_view))) + return urlpatterns @property @@ -385,11 +389,11 @@ def login(self, request, extra_context=None): index_path = reverse('admin:index', current_app=self.name) return HttpResponseRedirect(index_path) - from django.contrib.auth.views import LoginView # Since this module gets imported in the application's root package, # it cannot import models from other applications at the module level, # and django.contrib.admin.forms eventually imports User. from django.contrib.admin.forms import AdminAuthenticationForm + from django.contrib.auth.views import LoginView context = { **self.each_context(request), 'title': _('Log in'), @@ -409,6 +413,22 @@ def login(self, request, extra_context=None): request.current_app = self.name return LoginView.as_view(**defaults)(request) + def autocomplete_view(self, request): + return AutocompleteJsonView.as_view(admin_site=self)(request) + + @no_append_slash + def catch_all_view(self, request, url): + if settings.APPEND_SLASH and not url.endswith('/'): + urlconf = getattr(request, 'urlconf', None) + try: + match = resolve('%s/' % request.path_info, urlconf) + except Resolver404: + pass + else: + if getattr(match.func, 'should_append_slash', True): + return HttpResponsePermanentRedirect('%s/' % request.path) + raise Http404 + def _build_app_dict(self, request, label=None): """ Build the app dictionary. The optional `label` parameter filters models @@ -504,6 +524,7 @@ def index(self, request, extra_context=None): context = { **self.each_context(request), 'title': self.index_title, + 'subtitle': None, 'app_list': app_list, **(extra_context or {}), } @@ -518,10 +539,10 @@ def app_index(self, request, app_label, extra_context=None): raise Http404('The requested admin page does not exist.') # Sort the models alphabetically within each app. app_dict['models'].sort(key=lambda x: x['name']) - app_name = apps.get_app_config(app_label).verbose_name context = { **self.each_context(request), - 'title': _('%(app)s administration') % {'app': app_name}, + 'title': _('%(app)s administration') % {'app': app_dict['name']}, + 'subtitle': None, 'app_list': [app_dict], 'app_label': app_label, **(extra_context or {}), diff --git a/django/contrib/admin/static/admin/css/autocomplete.css b/django/contrib/admin/static/admin/css/autocomplete.css index 3ef95d15f0a1..69c94e734774 100644 --- a/django/contrib/admin/static/admin/css/autocomplete.css +++ b/django/contrib/admin/static/admin/css/autocomplete.css @@ -14,7 +14,7 @@ select.admin-autocomplete { .select2-container--admin-autocomplete.select2-container--focus .select2-selection, .select2-container--admin-autocomplete.select2-container--open .select2-selection { - border-color: #999; + border-color: var(--body-quiet-color); min-height: 30px; } @@ -29,13 +29,13 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--single { - background-color: #fff; - border: 1px solid #ccc; + background-color: var(--body-bg); + border: 1px solid var(--border-color); border-radius: 4px; } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered { - color: #444; + color: var(--body-fg); line-height: 30px; } @@ -46,7 +46,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder { - color: #999; + color: var(--body-quiet-color); } .select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow { @@ -80,7 +80,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single { - background-color: #eee; + background-color: var(--darkened-bg); cursor: default; } @@ -94,8 +94,8 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple { - background-color: white; - border: 1px solid #ccc; + background-color: var(--body-bg); + border: 1px solid var(--border-color); border-radius: 4px; cursor: text; } @@ -104,8 +104,10 @@ select.admin-autocomplete { box-sizing: border-box; list-style: none; margin: 0; - padding: 0 5px; + padding: 0 10px 5px 5px; width: 100%; + display: flex; + flex-wrap: wrap; } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li { @@ -113,7 +115,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder { - color: #999; + color: var(--body-quiet-color); margin-top: 5px; float: left; } @@ -123,11 +125,13 @@ select.admin-autocomplete { float: right; font-weight: bold; margin: 5px; + position: absolute; + right: 0; } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #ccc; + background-color: var(--darkened-bg); + border: 1px solid var(--border-color); border-radius: 4px; cursor: default; float: left; @@ -137,7 +141,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove { - color: #999; + color: var(--body-quiet-color); cursor: pointer; display: inline-block; font-weight: bold; @@ -145,7 +149,7 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #333; + color: var(--body-fg); } .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline { @@ -163,12 +167,12 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple { - border: solid #999 1px; + border: solid var(--body-quiet-color) 1px; outline: 0; } .select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple { - background-color: #eee; + background-color: var(--darkened-bg); cursor: default; } @@ -186,12 +190,20 @@ select.admin-autocomplete { border-bottom-right-radius: 0; } +.select2-container--admin-autocomplete .select2-search--dropdown { + background: var(--darkened-bg); +} + .select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field { - border: 1px solid #ccc; + background: var(--body-bg); + color: var(--body-fg); + border: 1px solid var(--border-color); + border-radius: 4px; } .select2-container--admin-autocomplete .select2-search--inline .select2-search__field { background: transparent; + color: var(--body-fg); border: none; outline: 0; box-shadow: none; @@ -201,6 +213,8 @@ select.admin-autocomplete { .select2-container--admin-autocomplete .select2-results > .select2-results__options { max-height: 200px; overflow-y: auto; + color: var(--body-fg); + background: var(--body-bg); } .select2-container--admin-autocomplete .select2-results__option[role=group] { @@ -208,11 +222,12 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] { - color: #999; + color: var(--body-quiet-color); } .select2-container--admin-autocomplete .select2-results__option[aria-selected=true] { - background-color: #ddd; + background-color: var(--selected-bg); + color: var(--body-fg); } .select2-container--admin-autocomplete .select2-results__option .select2-results__option { @@ -249,8 +264,8 @@ select.admin-autocomplete { } .select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] { - background-color: #79aec8; - color: white; + background-color: var(--primary); + color: var(--primary-fg); } .select2-container--admin-autocomplete .select2-results__group { diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index c4285195fc8b..1cb3acdbe775 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -4,6 +4,93 @@ @import url(fonts.css); +/* VARIABLE DEFINITIONS */ +:root { + --primary: #79aec8; + --secondary: #417690; + --accent: #f5dd5d; + --primary-fg: #fff; + + --body-fg: #333; + --body-bg: #fff; + --body-quiet-color: #666; + --body-loud-color: #000; + + --header-color: #ffc; + --header-branding-color: var(--accent); + --header-bg: var(--secondary); + --header-link-color: var(--primary-fg); + + --breadcrumbs-fg: #c4dce8; + --breadcrumbs-link-fg: var(--body-bg); + --breadcrumbs-bg: var(--primary); + + --link-fg: #447e9b; + --link-hover-color: #036; + --link-selected-fg: #5b80b2; + + --hairline-color: #e8e8e8; + --border-color: #ccc; + + --error-fg: #ba2121; + + --message-success-bg: #dfd; + --message-warning-bg: #ffc; + --message-error-bg: #ffefef; + + --darkened-bg: #f8f8f8; /* A bit darker than --body-bg */ + --selected-bg: #e4e4e4; /* E.g. selected table cells */ + --selected-row: #ffc; + + --button-fg: #fff; + --button-bg: var(--primary); + --button-hover-bg: #609ab6; + --default-button-bg: var(--secondary); + --default-button-hover-bg: #205067; + --close-button-bg: #888; /* Previously #bbb, contrast 1.92 */ + --close-button-hover-bg: #747474; + --delete-button-bg: #ba2121; + --delete-button-hover-bg: #a41515; + + --object-tools-fg: var(--button-fg); + --object-tools-bg: var(--close-button-bg); + --object-tools-hover-bg: var(--close-button-hover-bg); +} + +@media (prefers-color-scheme: dark) { + :root { + --primary: #264b5d; + --primary-fg: #eee; + + --body-fg: #eeeeee; + --body-bg: #121212; + --body-quiet-color: #e0e0e0; + --body-loud-color: #ffffff; + + --breadcrumbs-link-fg: #e0e0e0; + --breadcrumbs-bg: var(--primary); + + --link-fg: #81d4fa; + --link-hover-color: #4ac1f7; + --link-selected-fg: #6f94c6; + + --hairline-color: #272727; + --border-color: #353535; + + --error-fg: #e35f5f; + --message-success-bg: #006b1b; + --message-warning-bg: #583305; + --message-error-bg: #570808; + + --darkened-bg: #212121; + --selected-bg: #1b1b1b; + --selected-row: #00363a; + + --close-button-bg: #333333; + --close-button-hover-bg: #666666; + } +} + html, body { height: 100%; } @@ -13,19 +100,20 @@ body { padding: 0; font-size: 14px; font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; - color: #333; - background: #fff; + color: var(--body-fg); + background: var(--body-bg); } /* LINKS */ a:link, a:visited { - color: #447e9b; + color: var(--link-fg); text-decoration: none; + transition: color 0.15s, background 0.15s; } a:focus, a:hover { - color: #036; + color: var(--link-hover-color); } a:focus { @@ -37,7 +125,7 @@ a img { } a.section:link, a.section:visited { - color: #fff; + color: var(--header-link-color); text-decoration: none; } @@ -64,7 +152,7 @@ h1 { margin: 0 0 20px; font-weight: 300; font-size: 20px; - color: #666; + color: var(--body-quiet-color); } h2 { @@ -80,7 +168,7 @@ h2.subhead { h3 { font-size: 14px; margin: .8em 0 .3em 0; - color: #666; + color: var(--body-quiet-color); font-weight: bold; } @@ -93,7 +181,7 @@ h4 { h5 { font-size: 10px; margin: 1.5em 0 .5em 0; - color: #666; + color: var(--body-quiet-color); text-transform: uppercase; letter-spacing: 1px; } @@ -131,7 +219,7 @@ fieldset { min-width: 0; padding: 0; border: none; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } blockquote { @@ -144,14 +232,14 @@ blockquote { code, pre { font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; - color: #666; + color: var(--body-quiet-color); font-size: 12px; overflow-x: auto; } pre.literal-block { margin: 10px; - background: #eee; + background: var(--darkened-bg); padding: 6px 8px; } @@ -161,8 +249,8 @@ code strong { hr { clear: both; - color: #eee; - background-color: #eee; + color: var(--hairline-color); + background-color: var(--hairline-color); height: 1px; border: none; margin: 0; @@ -183,7 +271,7 @@ hr { .help, p.help, form p.help, div.help, form div.help, div.help li { font-size: 11px; - color: #999; + color: var(--body-quiet-color); } div.help ul { @@ -199,7 +287,7 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { } .quiet, a.quiet:link, a.quiet:visited { - color: #999; + color: var(--body-quiet-color); font-weight: normal; } @@ -211,20 +299,23 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { white-space: nowrap; } +.hidden { + display: none; +} + /* TABLES */ table { border-collapse: collapse; - border-color: #ccc; + border-color: var(--border-color); } td, th { font-size: 13px; line-height: 16px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); vertical-align: top; padding: 8px; - font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif; } th { @@ -234,37 +325,37 @@ th { thead th, tfoot td { - color: #666; + color: var(--body-quiet-color); padding: 5px 10px; font-size: 11px; - background: #fff; + background: var(--body-bg); border: none; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); } tfoot td { border-bottom: none; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } thead th.required { - color: #000; + color: var(--body-loud-color); } tr.alt { - background: #f6f6f6; + background: var(--darkened-bg); } tr:nth-child(odd), .row-form-errors { - background: #fff; + background: var(--body-bg); } tr:nth-child(even), tr:nth-child(even) .errorlist, tr:nth-child(odd) + .row-form-errors, tr:nth-child(odd) + .row-form-errors .errorlist { - background: #f9f9f9; + background: var(--darkened-bg); } /* SORTABLE TABLES */ @@ -273,15 +364,15 @@ thead th { padding: 5px 10px; line-height: normal; text-transform: uppercase; - background: #f6f6f6; + background: var(--darkened-bg); } thead th a:link, thead th a:visited { - color: #666; + color: var(--body-quiet-color); } thead th.sorted { - background: #eee; + background: var(--selected-bg); } thead th.sorted .text { @@ -300,7 +391,7 @@ table thead th .text a { } table thead th .text a:focus, table thead th .text a:hover { - background: #eee; + background: var(--selected-bg); } thead th.sorted a.sortremove { @@ -347,12 +438,12 @@ table thead th.sorted .sortoptions a.sortremove:after { left: 3px; font-weight: 200; font-size: 18px; - color: #999; + color: var(--body-quiet-color); } table thead th.sorted .sortoptions a.sortremove:focus:after, table thead th.sorted .sortoptions a.sortremove:hover:after { - color: #447e9b; + color: var(--link-fg); } table thead th.sorted .sortoptions a.sortremove:focus, @@ -399,16 +490,18 @@ textarea { input[type=text], input[type=password], input[type=email], input[type=url], input[type=number], input[type=tel], textarea, select, .vTextField { - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px; padding: 5px 6px; margin-top: 0; + color: var(--body-fg); + background-color: var(--body-bg); } input[type=text]:focus, input[type=password]:focus, input[type=email]:focus, input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus, textarea:focus, select:focus, .vTextField:focus { - border-color: #999; + border-color: var(--body-quiet-color); } select { @@ -424,12 +517,13 @@ select[multiple] { /* FORM BUTTONS */ .button, input[type=submit], input[type=button], .submit-row input, a.button { - background: #79aec8; + background: var(--button-bg); padding: 10px 15px; border: none; border-radius: 4px; - color: #fff; + color: var(--button-fg); cursor: pointer; + transition: background 0.15s; } a.button { @@ -439,7 +533,7 @@ a.button { .button:active, input[type=submit]:active, input[type=button]:active, .button:focus, input[type=submit]:focus, input[type=button]:focus, .button:hover, input[type=submit]:hover, input[type=button]:hover { - background: #609ab6; + background: var(--button-hover-bg); } .button[disabled], input[type=submit][disabled], input[type=button][disabled] { @@ -450,13 +544,13 @@ a.button { float: right; border: none; font-weight: 400; - background: #417690; + background: var(--default-button-bg); } .button.default:active, input[type=submit].default:active, .button.default:focus, input[type=submit].default:focus, .button.default:hover, input[type=submit].default:hover { - background: #205067; + background: var(--default-button-hover-bg); } .button[disabled].default, @@ -471,7 +565,7 @@ input[type=button][disabled].default { .module { border: none; margin-bottom: 30px; - background: #fff; + background: var(--body-bg); } .module p, .module ul, .module h3, .module h4, .module dl, .module pre { @@ -497,8 +591,8 @@ input[type=button][disabled].default { font-weight: 400; font-size: 13px; text-align: left; - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--header-link-color); } .module caption, @@ -525,18 +619,18 @@ ul.messagelist li { font-size: 13px; padding: 10px 10px 10px 65px; margin: 0 0 10px 0; - background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat; + background: var(--message-success-bg) url(../img/icon-yes.svg) 40px 12px no-repeat; background-size: 16px auto; - color: #333; + color: var(--body-fg); } ul.messagelist li.warning { - background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat; + background: var(--message-warning-bg) url(../img/icon-alert.svg) 40px 14px no-repeat; background-size: 14px auto; } ul.messagelist li.error { - background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat; + background: var(--message-error-bg) url(../img/icon-no.svg) 40px 12px no-repeat; background-size: 16px auto; } @@ -546,24 +640,26 @@ ul.messagelist li.error { display: block; padding: 10px 12px; margin: 0 0 10px 0; - color: #ba2121; - border: 1px solid #ba2121; + color: var(--error-fg); + border: 1px solid var(--error-fg); border-radius: 4px; - background-color: #fff; + background-color: var(--body-bg); background-position: 5px 12px; + overflow-wrap: break-word; } ul.errorlist { margin: 0 0 4px; padding: 0; - color: #ba2121; - background: #fff; + color: var(--error-fg); + background: var(--body-bg); } ul.errorlist li { font-size: 13px; display: block; margin-bottom: 4px; + overflow-wrap: break-word; } ul.errorlist li:first-child { @@ -587,7 +683,7 @@ td ul.errorlist li { .form-row.errors { margin: 0; border: none; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); background: none; } @@ -597,7 +693,7 @@ td ul.errorlist li { .errors input, .errors select, .errors textarea, td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea { - border: 1px solid #ba2121; + border: 1px solid var(--error-fg); } .description { @@ -608,20 +704,19 @@ td ul.errorlist + input, td ul.errorlist + select, td ul.errorlist + textarea { /* BREADCRUMBS */ div.breadcrumbs { - background: #79aec8; + background: var(--breadcrumbs-bg); padding: 10px 40px; border: none; - font-size: 14px; - color: #c4dce8; + color: var(--breadcrumbs-fg); text-align: left; } div.breadcrumbs a { - color: #fff; + color: var(--breadcrumbs-link-fg); } div.breadcrumbs a:focus, div.breadcrumbs a:hover { - color: #c4dce8; + color: var(--breadcrumbs-fg); } /* ACTION ICONS */ @@ -647,11 +742,11 @@ div.breadcrumbs a:focus, div.breadcrumbs a:hover { } a.deletelink:link, a.deletelink:visited { - color: #CC3434; + color: #CC3434; /* XXX Probably unused? */ } a.deletelink:focus, a.deletelink:hover { - color: #993333; + color: #993333; /* XXX Probably unused? */ text-decoration: none; } @@ -666,14 +761,6 @@ a.deletelink:focus, a.deletelink:hover { margin-top: -48px; } -.form-row .object-tools { - margin-top: 5px; - margin-bottom: 5px; - float: none; - height: 2em; - padding-left: 3.5em; -} - .object-tools li { display: block; float: left; @@ -689,29 +776,29 @@ a.deletelink:focus, a.deletelink:hover { display: block; float: left; padding: 3px 12px; - background: #999; + background: var(--object-tools-bg); + color: var(--object-tools-fg); font-weight: 400; font-size: 11px; text-transform: uppercase; letter-spacing: 0.5px; - color: #fff; } .object-tools a:focus, .object-tools a:hover { - background-color: #417690; + background-color: var(--object-tools-hover-bg); } .object-tools a:focus{ text-decoration: none; } -.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink { +.object-tools a.viewsitelink, .object-tools a.addlink { background-repeat: no-repeat; background-position: right 7px center; padding-right: 26px; } -.object-tools a.viewsitelink, .object-tools a.golink { +.object-tools a.viewsitelink { background-image: url(../img/tooltag-arrowright.svg); } @@ -813,13 +900,13 @@ table#change-history tbody th { justify-content: space-between; align-items: center; padding: 10px 40px; - background: #417690; - color: #ffc; + background: var(--header-bg); + color: var(--header-color); overflow: hidden; } #header a:link, #header a:visited { - color: #fff; + color: var(--header-link-color); } #header a:focus , #header a:hover { @@ -835,11 +922,11 @@ table#change-history tbody th { margin: 0 20px 0 0; font-weight: 300; font-size: 24px; - color: #f5dd5d; + color: var(--accent); } #branding h1, #branding h1 a:link, #branding h1 a:visited { - color: #f5dd5d; + color: var(--accent); } #branding h2 { @@ -847,7 +934,7 @@ table#change-history tbody th { font-size: 14px; margin: -8px 0 8px 0; font-weight: normal; - color: #ffc; + color: var(--header-color); } #branding a:hover { @@ -871,14 +958,14 @@ table#change-history tbody th { #user-tools a:focus, #user-tools a:hover { text-decoration: none; - border-bottom-color: #79aec8; - color: #79aec8; + border-bottom-color: var(--primary); + color: var(--primary); } /* SIDEBAR */ #content-related { - background: #f8f8f8; + background: var(--darkened-bg); } #content-related .module { @@ -886,8 +973,7 @@ table#change-history tbody th { } #content-related h3 { - font-size: 14px; - color: #666; + color: var(--body-quiet-color); padding: 0 16px; margin: 0 0 16px; } @@ -916,22 +1002,22 @@ table#change-history tbody th { background: none; padding: 16px; margin-bottom: 16px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); font-size: 18px; - color: #333; + color: var(--body-fg); } .delete-confirmation form input[type="submit"] { - background: #ba2121; + background: var(--delete-button-bg); border-radius: 4px; padding: 10px 15px; - color: #fff; + color: var(--button-fg); } .delete-confirmation form input[type="submit"]:active, .delete-confirmation form input[type="submit"]:focus, .delete-confirmation form input[type="submit"]:hover { - background: #a41515; + background: var(--delete-button-hover-bg); } .delete-confirmation form .cancel-link { @@ -939,17 +1025,17 @@ table#change-history tbody th { vertical-align: middle; height: 15px; line-height: 15px; - background: #ddd; border-radius: 4px; padding: 10px 15px; - color: #333; + color: var(--button-fg); + background: var(--close-button-bg); margin: 0 0 0 10px; } .delete-confirmation form .cancel-link:active, .delete-confirmation form .cancel-link:focus, .delete-confirmation form .cancel-link:hover { - background: #ccc; + background: var(--close-button-hover-bg); } /* POPUP */ diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css index abd2640b4a27..b4a1557887ab 100644 --- a/django/contrib/admin/static/admin/css/changelists.css +++ b/django/contrib/admin/static/admin/css/changelists.css @@ -1,8 +1,14 @@ /* CHANGELISTS */ #changelist { - position: relative; - width: 100%; + display: flex; + align-items: flex-start; + justify-content: space-between; +} + +#changelist .changelist-form-container { + flex: 1 1 auto; + min-width: 0; } #changelist table { @@ -21,7 +27,6 @@ .change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { - margin-right: 280px; width: auto; } @@ -30,17 +35,18 @@ } #changelist-form .results { - overflow-x: auto; + overflow-x: auto; + width: 100%; } #changelist .toplinks { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid var(--hairline-color); } #changelist .paginator { - color: #666; - border-bottom: 1px solid #eee; - background: #fff; + color: var(--body-quiet-color); + border-bottom: 1px solid var(--hairline-color); + background: var(--body-bg); overflow: hidden; } @@ -62,58 +68,59 @@ } #changelist table tfoot { - color: #666; + color: var(--body-quiet-color); } /* TOOLBAR */ -#changelist #toolbar { +#toolbar { padding: 8px 10px; margin-bottom: 15px; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #f8f8f8; - color: #666; + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); + background: var(--darkened-bg); + color: var(--body-quiet-color); } -#changelist #toolbar form input { +#toolbar form input { border-radius: 4px; font-size: 14px; padding: 5px; - color: #333; + color: var(--body-fg); } -#changelist #toolbar form #searchbar { +#toolbar #searchbar { height: 19px; - border: 1px solid #ccc; + border: 1px solid var(--border-color); padding: 2px 5px; margin: 0; vertical-align: top; font-size: 13px; + max-width: 100%; } -#changelist #toolbar form #searchbar:focus { - border-color: #999; +#toolbar #searchbar:focus { + border-color: var(--body-quiet-color); } -#changelist #toolbar form input[type="submit"] { - border: 1px solid #ccc; +#toolbar form input[type="submit"] { + border: 1px solid var(--border-color); font-size: 13px; padding: 4px 8px; margin: 0; vertical-align: middle; - background: #fff; + background: var(--body-bg); box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; cursor: pointer; - color: #333; + color: var(--body-fg); } -#changelist #toolbar form input[type="submit"]:focus, -#changelist #toolbar form input[type="submit"]:hover { - border-color: #999; +#toolbar form input[type="submit"]:focus, +#toolbar form input[type="submit"]:hover { + border-color: var(--body-quiet-color); } -#changelist #changelist-search img { +#changelist-search img { vertical-align: middle; margin-right: 4px; } @@ -121,14 +128,11 @@ /* FILTER COLUMN */ #changelist-filter { - position: absolute; - top: 0; - right: 0; - z-index: 1000; - width: 240px; - background: #f8f8f8; + flex: 0 0 240px; + order: 1; + background: var(--darkened-bg); border-left: none; - margin: 0; + margin: 0 0 0 30px; } #changelist-filter h2 { @@ -142,7 +146,6 @@ #changelist-filter h3 { font-weight: 400; - font-size: 14px; padding: 0 15px; margin-bottom: 10px; } @@ -150,7 +153,7 @@ #changelist-filter ul { margin: 5px 0; padding: 0 15px 15px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); } #changelist-filter ul:last-child { @@ -165,31 +168,31 @@ #changelist-filter a { display: block; - color: #999; + color: var(--body-quiet-color); text-overflow: ellipsis; overflow-x: hidden; } #changelist-filter li.selected { - border-left: 5px solid #eaeaea; + border-left: 5px solid var(--hairline-color); padding-left: 10px; margin-left: -15px; } #changelist-filter li.selected a { - color: #5b80b2; + color: var(--link-selected-fg); } #changelist-filter a:focus, #changelist-filter a:hover, #changelist-filter li.selected a:focus, #changelist-filter li.selected a:hover { - color: #036; + color: var(--link-hover-color); } #changelist-filter #changelist-filter-clear a { font-size: 13px; padding-bottom: 10px; - border-bottom: 1px solid #eaeaea; + border-bottom: 1px solid var(--hairline-color); } /* DATE DRILLDOWN */ @@ -210,12 +213,12 @@ } .change-list ul.toplinks .date-back a { - color: #999; + color: var(--body-quiet-color); } .change-list ul.toplinks .date-back a:focus, .change-list ul.toplinks .date-back a:hover { - color: #036; + color: var(--link-hover-color); } /* PAGINATOR */ @@ -226,25 +229,26 @@ padding-bottom: 10px; line-height: 22px; margin: 0; - border-top: 1px solid #ddd; + border-top: 1px solid var(--hairline-color); + width: 100%; } .paginator a:link, .paginator a:visited { padding: 2px 6px; - background: #79aec8; + background: var(--button-bg); text-decoration: none; - color: #fff; + color: var(--button-fg); } .paginator a.showall { border: none; background: none; - color: #5b80b2; + color: var(--link-fg); } .paginator a.showall:focus, .paginator a.showall:hover { background: none; - color: #036; + color: var(--link-hover-color); } .paginator .end { @@ -260,13 +264,12 @@ .paginator a:focus, .paginator a:hover { color: white; - background: #036; + background: var(--link-hover-color); } /* ACTIONS */ .filtered .actions { - margin-right: 280px; border-right: none; } @@ -276,21 +279,22 @@ } #changelist table tbody tr.selected { - background-color: #FFFFCC; + background-color: var(--selected-row); } #changelist .actions { padding: 10px; - background: #fff; + background: var(--body-bg); border-top: none; border-bottom: none; line-height: 24px; - color: #999; + color: var(--body-quiet-color); + width: 100%; } -#changelist .actions.selected { - background: #fffccf; - border-top: 1px solid #fffee8; +#changelist .actions.selected { /* XXX Probably unused? */ + background: var(--body-bg); + border-top: 1px solid var(--body-bg); border-bottom: 1px solid #edecd6; } @@ -300,7 +304,6 @@ #changelist .actions span.question { font-size: 13px; margin: 0 0.5em; - display: none; } #changelist .actions:last-child { @@ -310,9 +313,8 @@ #changelist .actions select { vertical-align: top; height: 24px; - background: none; - color: #000; - border: 1px solid #ccc; + color: var(--body-fg); + border: 1px solid var(--border-color); border-radius: 4px; font-size: 14px; padding: 0 0 0 4px; @@ -321,7 +323,7 @@ } #changelist .actions select:focus { - border-color: #999; + border-color: var(--body-quiet-color); } #changelist .actions label { @@ -332,18 +334,18 @@ #changelist .actions .button { font-size: 13px; - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px; - background: #fff; + background: var(--body-bg); box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; cursor: pointer; height: 24px; line-height: 1; padding: 4px 8px; margin: 0; - color: #333; + color: var(--body-fg); } #changelist .actions .button:focus, #changelist .actions .button:hover { - border-color: #999; + border-color: var(--body-quiet-color); } diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 06acd4290d64..89b22701705b 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -6,7 +6,7 @@ overflow: hidden; padding: 10px; font-size: 13px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .form-row img, .form-row input { @@ -22,21 +22,17 @@ form .form-row p { padding-left: 0; } -.hidden { - display: none; -} - /* FORM LABELS */ label { font-weight: normal; - color: #666; + color: var(--body-quiet-color); font-size: 13px; } .required label, label.required { font-weight: bold; - color: #333; + color: var(--body-fg); } /* RADIO BUTTONS */ @@ -219,24 +215,24 @@ fieldset.collapsed h2, fieldset.collapsed { } fieldset.collapsed { - border: 1px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; overflow: hidden; } fieldset.collapsed h2 { - background: #f8f8f8; - color: #666; + background: var(--darkened-bg); + color: var(--body-quiet-color); } fieldset .collapse-toggle { - color: #fff; + color: var(--header-link-color); } fieldset.collapsed .collapse-toggle { background: transparent; display: inline; - color: #447e9b; + color: var(--link-fg); } /* MONOSPACE TEXTAREAS */ @@ -250,8 +246,8 @@ fieldset.monospace textarea { .submit-row { padding: 12px 14px; margin: 0 0 20px; - background: #f8f8f8; - border: 1px solid #eee; + background: var(--darkened-bg); + border: 1px solid var(--hairline-color); border-radius: 4px; text-align: right; overflow: hidden; @@ -283,35 +279,35 @@ body.popup .submit-row { .submit-row a.deletelink { display: block; - background: #ba2121; + background: var(--delete-button-bg); border-radius: 4px; padding: 10px 15px; height: 15px; line-height: 15px; - color: #fff; + color: var(--button-fg); } .submit-row a.closelink { display: inline-block; - background: #bbbbbb; + background: var(--close-button-bg); border-radius: 4px; padding: 10px 15px; height: 15px; line-height: 15px; margin: 0 0 0 5px; - color: #fff; + color: var(--button-fg); } .submit-row a.deletelink:focus, .submit-row a.deletelink:hover, .submit-row a.deletelink:active { - background: #a41515; + background: var(--delete-button-hover-bg); } .submit-row a.closelink:focus, .submit-row a.closelink:hover, .submit-row a.closelink:active { - background: #aaaaaa; + background: var(--close-button-hover-bg); } /* CUSTOM FORM FIELDS */ @@ -390,12 +386,12 @@ body.popup .submit-row { .inline-related h3 { margin: 0; - color: #666; + color: var(--body-quiet-color); padding: 5px; font-size: 13px; - background: #f8f8f8; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; + background: var(--darkened-bg); + border-top: 1px solid var(--hairline-color); + border-bottom: 1px solid var(--hairline-color); } .inline-related h3 span.delete { @@ -409,7 +405,7 @@ body.popup .submit-row { .inline-related fieldset { margin: 0; - background: #fff; + background: var(--body-bg); border: none; width: 100%; } @@ -421,7 +417,7 @@ body.popup .submit-row { text-align: left; font-weight: bold; background: #bcd; - color: #fff; + color: var(--body-bg); } .inline-group .tabular fieldset.module { @@ -430,6 +426,7 @@ body.popup .submit-row { .inline-related.tabular fieldset.module table { width: 100%; + overflow-x: scroll; } .last-related fieldset { @@ -459,7 +456,7 @@ body.popup .submit-row { overflow: hidden; font-size: 9px; font-weight: bold; - color: #666; + color: var(--body-quiet-color); _width: 700px; } @@ -476,15 +473,15 @@ body.popup .submit-row { .inline-group div.add-row, .inline-group .tabular tr.add-row td { - color: #666; - background: #f8f8f8; + color: var(--body-quiet-color); + background: var(--darkened-bg); padding: 8px 10px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .inline-group .tabular tr.add-row td { padding: 8px 10px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--hairline-color); } .inline-group ul.tools a.add, diff --git a/django/contrib/admin/static/admin/css/login.css b/django/contrib/admin/static/admin/css/login.css index 062b36e0512a..10d9d2204a5f 100644 --- a/django/contrib/admin/static/admin/css/login.css +++ b/django/contrib/admin/static/admin/css/login.css @@ -1,7 +1,7 @@ /* LOGIN FORM */ .login { - background: #f8f8f8; + background: var(--darkened-bg); height: auto; } @@ -16,7 +16,7 @@ } .login #header h1 a { - color: #fff; + color: var(--header-link-color); } .login #content { @@ -24,8 +24,8 @@ } .login #container { - background: #fff; - border: 1px solid #eaeaea; + background: var(--body-bg); + border: 1px solid var(--hairline-color); border-radius: 4px; overflow: hidden; width: 28em; @@ -34,44 +34,25 @@ height: auto; } -.login #content-main { - width: 100%; -} - .login .form-row { padding: 4px 0; - float: left; - width: 100%; - border-bottom: none; } .login .form-row label { - padding-right: 0.5em; + display: block; line-height: 2em; - font-size: 1em; - clear: both; - color: #333; } .login .form-row #id_username, .login .form-row #id_password { - clear: both; padding: 8px; width: 100%; box-sizing: border-box; } -.login span.help { - font-size: 10px; - display: block; -} - .login .submit-row { - clear: both; - padding: 1em 0 0 9.4em; + padding: 1em 0 0 0; margin: 0; - border: none; - background: none; - text-align: left; + text-align: center; } .login .password-reset-link { diff --git a/django/contrib/admin/static/admin/css/nav_sidebar.css b/django/contrib/admin/static/admin/css/nav_sidebar.css index 6fcfb26131b4..f3c2fd804278 100644 --- a/django/contrib/admin/static/admin/css/nav_sidebar.css +++ b/django/contrib/admin/static/admin/css/nav_sidebar.css @@ -12,21 +12,23 @@ justify-content: center; flex: 0 0 23px; width: 23px; - border-right: 1px solid #eaeaea; - background-color: #ffffff; + border: 0; + border-right: 1px solid var(--hairline-color); + background-color: var(--body-bg); cursor: pointer; font-size: 20px; - color: #447e9b; + color: var(--link-fg); + padding: 0; } [dir="rtl"] .toggle-nav-sidebar { - border-left: 1px solid #eaeaea; + border-left: 1px solid var(--hairline-color); border-right: 0; } .toggle-nav-sidebar:hover, .toggle-nav-sidebar:focus { - background-color: #f6f6f6; + background-color: var(--darkened-bg); } #nav-sidebar { @@ -35,13 +37,13 @@ left: -276px; margin-left: -276px; border-top: 1px solid transparent; - border-right: 1px solid #eaeaea; - background-color: #ffffff; + border-right: 1px solid var(--hairline-color); + background-color: var(--body-bg); overflow: auto; } [dir="rtl"] #nav-sidebar { - border-left: 1px solid #eaeaea; + border-left: 1px solid var(--hairline-color); border-right: 0; left: 0; margin-left: 0; @@ -70,6 +72,7 @@ #nav-sidebar .module th { width: 100%; + overflow-wrap: anywhere; } #nav-sidebar .module th, @@ -77,6 +80,10 @@ padding-left: 16px; } +#nav-sidebar .module td { + white-space: nowrap; +} + [dir="rtl"] #nav-sidebar .module th, [dir="rtl"] #nav-sidebar .module caption { padding-left: 8px; @@ -85,16 +92,29 @@ #nav-sidebar .current-app .section:link, #nav-sidebar .current-app .section:visited { - color: #ffc; + color: var(--header-color); font-weight: bold; } #nav-sidebar .current-model { - background: #ffc; + background: var(--selected-row); +} + +.main > #nav-sidebar + .content { + max-width: calc(100% - 23px); +} + +.main.shifted > #nav-sidebar + .content { + max-width: calc(100% - 299px); } @media (max-width: 767px) { #nav-sidebar, #toggle-nav-sidebar { display: none; } + + .main > #nav-sidebar + .content, + .main.shifted > #nav-sidebar + .content { + max-width: 100%; + } } diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css index e1ce9c27d1fd..8c6dd810ca28 100644 --- a/django/contrib/admin/static/admin/css/responsive.css +++ b/django/contrib/admin/static/admin/css/responsive.css @@ -93,14 +93,14 @@ input[type="submit"], button { /* Changelist */ - #changelist #toolbar { + #toolbar { border: none; padding: 15px; } #changelist-search > div { display: flex; - flex-wrap: wrap; + flex-wrap: nowrap; max-width: 480px; } @@ -108,15 +108,20 @@ input[type="submit"], button { line-height: 22px; } - #changelist #toolbar form #searchbar { + #toolbar form #searchbar { flex: 1 0 auto; width: 0; height: 22px; margin: 0 10px 0 6px; } + #toolbar form input[type=submit] { + flex: 0 1 auto; + } + #changelist-search .quiet { - width: 100%; + width: 0; + flex: 1 0 auto; margin: 5px 0 0 25px; } @@ -135,7 +140,7 @@ input[type="submit"], button { } #changelist .actions select { - background: #fff; + background: var(--body-bg); } #changelist .actions .button { @@ -152,19 +157,16 @@ input[type="submit"], button { } #changelist-filter { - width: 200px; + flex-basis: 200px; } .change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered .actions, - .filtered div.xfull { - margin-right: 230px; - } #changelist .paginator { - border-top-color: #eee; + border-top-color: var(--hairline-color); /* XXX Is this used at all? */ } #changelist .results + .paginator { @@ -211,11 +213,11 @@ input[type="submit"], button { fieldset .fieldBox + .fieldBox { margin-top: 10px; padding-top: 10px; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); } textarea { - max-width: 518px; + max-width: 100%; max-height: 120px; } @@ -397,11 +399,11 @@ input[type="submit"], button { .datetime .timezonewarning { display: block; font-size: 11px; - color: #999; + color: var(--body-quiet-color); } .datetimeshortcuts { - color: #ccc; + color: var(--border-color); /* XXX Redundant, .datetime span also sets #ccc */ } .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { @@ -500,25 +502,16 @@ input[type="submit"], button { /* Changelist */ #changelist { - display: flex; + align-items: stretch; flex-direction: column; } - #changelist #toolbar { - order: 1; + #toolbar { padding: 10px; } - #changelist .xfull { - order: 2; - } - - #changelist-form { - order: 3; - } - #changelist-filter { - order: 4; + margin-left: 0; } #changelist .actions label { @@ -534,11 +527,6 @@ input[type="submit"], button { flex: 1 0 100%; } - .change-list .filtered .results, .change-list .filtered .paginator, - .filtered #toolbar, .filtered .actions, .filtered div.xfull { - margin-right: 0; - } - #changelist-filter { position: static; width: auto; @@ -667,7 +655,7 @@ input[type="submit"], button { margin-bottom: -3px; } - form .aligned ul.radiolist li + li { + form .aligned ul.radiolist:not(.inline) li + li { margin-top: 5px; } @@ -752,7 +740,7 @@ input[type="submit"], button { /* Inlines */ .inline-group[data-inline-type="stacked"] .inline-related { - border: 2px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; margin-top: 15px; overflow: auto; @@ -762,18 +750,19 @@ input[type="submit"], button { box-sizing: border-box; } - .inline-group[data-inline-type="stacked"] .inline-related + .inline-related { - margin-top: 30px; - } - .inline-group[data-inline-type="stacked"] .inline-related .module { padding: 0 10px; } - .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:last-child { + .inline-group[data-inline-type="stacked"] .inline-related .module .form-row { + border-top: 1px solid var(--hairline-color); border-bottom: none; } + .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:first-child { + border-top: none; + } + .inline-group[data-inline-type="stacked"] .inline-related h3 { padding: 10px; border-top-width: 0; @@ -803,7 +792,7 @@ input[type="submit"], button { .inline-group[data-inline-type="stacked"] div.add-row { margin-top: 15px; - border: 1px solid #eee; + border: 1px solid var(--hairline-color); border-radius: 4px; } @@ -897,9 +886,7 @@ input[type="submit"], button { } .login .form-row label { - display: block; margin: 0 0 5px; - padding: 0; line-height: 1.2; } @@ -907,7 +894,7 @@ input[type="submit"], button { padding: 15px 0 0; } - .login br, .login .submit-row label { + .login br { display: none; } @@ -975,7 +962,7 @@ input[type="submit"], button { } .timelist a { - background: #fff; + background: var(--body-bg); padding: 4px; } diff --git a/django/contrib/admin/static/admin/css/responsive_rtl.css b/django/contrib/admin/static/admin/css/responsive_rtl.css index 66fcc3ca6101..66d3c2f9b369 100644 --- a/django/contrib/admin/static/admin/css/responsive_rtl.css +++ b/django/contrib/admin/static/admin/css/responsive_rtl.css @@ -23,9 +23,9 @@ [dir="rtl"] .change-list .filtered .paginator, [dir="rtl"] .filtered #toolbar, [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-right: 0; - margin-left: 230px; + [dir="rtl"] .filtered .actions, + [dir="rtl"] #changelist-filter { + margin-left: 0; } [dir="rtl"] .inline-group ul.tools a.add, @@ -63,14 +63,6 @@ /* MOBILE */ @media (max-width: 767px) { - [dir="rtl"] .change-list .filtered .results, - [dir="rtl"] .change-list .filtered .paginator, - [dir="rtl"] .filtered #toolbar, - [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-left: 0; - } - [dir="rtl"] .aligned .related-lookup, [dir="rtl"] .aligned .datetimeshortcuts { margin-left: 0; @@ -80,4 +72,9 @@ [dir="rtl"] .aligned ul { margin-right: 0; } + + [dir="rtl"] #changelist-filter { + margin-left: 0; + margin-right: 0; + } } diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css index f4916d32822c..0447f8938214 100644 --- a/django/contrib/admin/static/admin/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -1,25 +1,3 @@ -body { - direction: rtl; -} - -/* LOGIN */ - -.login .form-row { - float: right; -} - -.login .form-row label { - float: right; - padding-left: 0.5em; - padding-right: 0; - text-align: left; -} - -.login .submit-row { - clear: both; - padding: 1em 9.4em 0 0; -} - /* GLOBAL */ th { @@ -109,31 +87,21 @@ thead th.sorted .text { } #changelist-filter { - right: auto; - left: 0; border-left: none; border-right: none; -} - -.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { - margin-right: 0; - margin-left: 280px; + margin-left: 0; + margin-right: 30px; } #changelist-filter li.selected { border-left: none; padding-left: 10px; margin-left: 0; - border-right: 5px solid #eaeaea; + border-right: 5px solid var(--hairline-color); padding-right: 10px; margin-right: -15px; } -.filtered .actions { - margin-left: 280px; - margin-right: 0; -} - #changelist table tbody td:first-child, #changelist table tbody th:first-child { border-right: none; border-left: none; diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index 14ef12db94ce..c7d64566d96e 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -22,26 +22,25 @@ } .selector-available h2, .selector-chosen h2 { - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-radius: 4px 4px 0 0; } .selector-chosen h2 { - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--header-link-color); } .selector .selector-available h2 { - background: #f8f8f8; - color: #666; + background: var(--darkened-bg); + color: var(--body-quiet-color); } .selector .selector-filter { - background: white; - border: 1px solid #ccc; + border: 1px solid var(--border-color); border-width: 0 1px; padding: 8px; - color: #999; + color: var(--body-quiet-color); font-size: 10px; margin: 0; text-align: left; @@ -66,7 +65,7 @@ .selector ul.selector-chooser { float: left; width: 22px; - background-color: #eee; + background-color: var(--selected-bg); border-radius: 10px; margin: 10em 5px 0 5px; padding: 0; @@ -91,7 +90,7 @@ text-indent: -3000px; overflow: hidden; cursor: default; - opacity: 0.3; + opacity: 0.55; } .active.selector-add, .active.selector-remove { @@ -126,14 +125,14 @@ a.selector-chooseall, a.selector-clearall { overflow: hidden; font-weight: bold; line-height: 16px; - color: #666; + color: var(--body-quiet-color); text-decoration: none; - opacity: 0.3; + opacity: 0.55; } a.active.selector-chooseall:focus, a.active.selector-clearall:focus, a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - color: #447e9b; + color: var(--link-fg); } a.active.selector-chooseall, a.active.selector-clearall { @@ -261,7 +260,7 @@ p.datetime { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-weight: bold; } @@ -269,7 +268,7 @@ p.datetime { white-space: nowrap; font-weight: normal; font-size: 11px; - color: #ccc; + color: var(--body-quiet-color); } .datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { @@ -313,7 +312,7 @@ table p.datetime { .timezonewarning { font-size: 11px; - color: #999; + color: var(--body-quiet-color); } /* URL */ @@ -322,7 +321,7 @@ p.url { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-size: 11px; font-weight: bold; } @@ -337,7 +336,7 @@ p.file-upload { line-height: 20px; margin: 0; padding: 0; - color: #666; + color: var(--body-quiet-color); font-size: 11px; font-weight: bold; } @@ -355,7 +354,7 @@ p.file-upload { } span.clearable-file-input label { - color: #333; + color: var(--body-fg); font-size: 11px; display: inline; float: none; @@ -368,8 +367,9 @@ span.clearable-file-input label { font-size: 12px; width: 19em; text-align: center; - background: white; - border: 1px solid #ddd; + background: var(--body-bg); + color: var(--body-fg); + border: 1px solid var(--hairline-color); border-radius: 4px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15); overflow: hidden; @@ -397,20 +397,20 @@ span.clearable-file-input label { margin: 0; text-align: center; border-top: none; - background: #f5dd5d; font-weight: 700; font-size: 12px; color: #333; + background: var(--accent); } .calendar th { padding: 8px 5px; - background: #f8f8f8; - border-bottom: 1px solid #ddd; + background: var(--darkened-bg); + border-bottom: 1px solid var(--border-color); font-weight: 400; font-size: 12px; text-align: center; - color: #666; + color: var(--body-quiet-color); } .calendar td { @@ -418,17 +418,17 @@ span.clearable-file-input label { font-size: 12px; text-align: center; padding: 0; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); border-bottom: none; } .calendar td.selected a { - background: #79aec8; - color: #fff; + background: var(--primary); + color: var(--button-fg); } .calendar td.nonday { - background: #f8f8f8; + background: var(--darkened-bg); } .calendar td.today a { @@ -440,17 +440,17 @@ span.clearable-file-input label { font-weight: 400; padding: 6px; text-decoration: none; - color: #444; + color: var(--body-quiet-color); } .calendar td a:focus, .timelist a:focus, .calendar td a:hover, .timelist a:hover { - background: #79aec8; + background: var(--primary); color: white; } .calendar td a:active, .timelist a:active { - background: #417690; + background: var(--header-bg); color: white; } @@ -464,16 +464,16 @@ span.clearable-file-input label { .calendarnav a:link, #calendarnav a:visited, #calendarnav a:focus, #calendarnav a:hover { - color: #999; + color: var(--body-quiet-color); } .calendar-shortcuts { - background: white; + background: var(--body-bg); + color: var(--body-quiet-color); font-size: 11px; line-height: 11px; - border-top: 1px solid #eee; + border-top: 1px solid var(--hairline-color); padding: 8px 0; - color: #ccc; } .calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { @@ -511,8 +511,8 @@ span.clearable-file-input label { padding: 4px 0; font-size: 12px; background: #eee; - border-top: 1px solid #ddd; - color: #333; + border-top: 1px solid var(--border-color); + color: var(--body-fg); } .calendar-cancel:focus, .calendar-cancel:hover { diff --git a/django/contrib/admin/static/admin/js/SelectBox.js b/django/contrib/admin/static/admin/js/SelectBox.js index 1927b4cefa0a..ace6d9dfb864 100644 --- a/django/contrib/admin/static/admin/js/SelectBox.js +++ b/django/contrib/admin/static/admin/js/SelectBox.js @@ -13,6 +13,7 @@ redisplay: function(id) { // Repopulate HTML select box from cache const box = document.getElementById(id); + const scroll_value_from_top = box.scrollTop; box.innerHTML = ''; for (const node of SelectBox.cache[id]) { if (node.displayed) { @@ -22,6 +23,7 @@ box.appendChild(new_option); } } + box.scrollTop = scroll_value_from_top; }, filter: function(id, text) { // Redisplay the HTML select box, displaying only the choices containing ALL @@ -31,7 +33,7 @@ node.displayed = 1; const node_text = node.text.toLowerCase(); for (const token of tokens) { - if (node_text.indexOf(token) === -1) { + if (!node_text.includes(token)) { node.displayed = 0; break; // Once the first token isn't found we're done } diff --git a/django/contrib/admin/static/admin/js/actions.js b/django/contrib/admin/static/admin/js/actions.js index dae69920b289..2830e91156a5 100644 --- a/django/contrib/admin/static/admin/js/actions.js +++ b/django/contrib/admin/static/admin/js/actions.js @@ -1,154 +1,201 @@ /*global gettext, interpolate, ngettext*/ 'use strict'; { - const $ = django.jQuery; - let lastChecked; + function show(selector) { + document.querySelectorAll(selector).forEach(function(el) { + el.classList.remove('hidden'); + }); + } - $.fn.actions = function(opts) { - const options = $.extend({}, $.fn.actions.defaults, opts); - const actionCheckboxes = $(this); - let list_editable_changed = false; - const showQuestion = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).show(); - $(options.allContainer).hide(); - }, - showClear = function() { - $(options.acrossClears).show(); - $(options.acrossQuestions).hide(); - $(options.actionContainer).toggleClass(options.selectedClass); - $(options.allContainer).show(); - $(options.counterContainer).hide(); - }, - reset = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).hide(); - $(options.allContainer).hide(); - $(options.counterContainer).show(); - }, - clearAcross = function() { - reset(); - $(options.acrossInput).val(0); - $(options.actionContainer).removeClass(options.selectedClass); - }, - checker = function(checked) { - if (checked) { - showQuestion(); - } else { - reset(); - } - $(actionCheckboxes).prop("checked", checked) - .parent().parent().toggleClass(options.selectedClass, checked); - }, - updateCounter = function() { - const sel = $(actionCheckboxes).filter(":checked").length; - // data-actions-icnt is defined in the generated HTML - // and contains the total amount of objects in the queryset - const actions_icnt = $('.action-counter').data('actionsIcnt'); - $(options.counterContainer).html(interpolate( - ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { - sel: sel, - cnt: actions_icnt - }, true)); - $(options.allToggle).prop("checked", function() { - let value; - if (sel === actionCheckboxes.length) { - value = true; - showQuestion(); - } else { - value = false; - clearAcross(); - } - return value; - }); - }; - // Show counter by default - $(options.counterContainer).show(); - // Check state of checkboxes and reinit state if needed - $(this).filter(":checked").each(function(i) { - $(this).parent().parent().toggleClass(options.selectedClass); - updateCounter(); - if ($(options.acrossInput).val() === 1) { - showClear(); - } + function hide(selector) { + document.querySelectorAll(selector).forEach(function(el) { + el.classList.add('hidden'); + }); + } + + function showQuestion(options) { + hide(options.acrossClears); + show(options.acrossQuestions); + hide(options.allContainer); + } + + function showClear(options) { + show(options.acrossClears); + hide(options.acrossQuestions); + document.querySelector(options.actionContainer).classList.remove(options.selectedClass); + show(options.allContainer); + hide(options.counterContainer); + } + + function reset(options) { + hide(options.acrossClears); + hide(options.acrossQuestions); + hide(options.allContainer); + show(options.counterContainer); + } + + function clearAcross(options) { + reset(options); + const acrossInputs = document.querySelectorAll(options.acrossInput); + acrossInputs.forEach(function(acrossInput) { + acrossInput.value = 0; }); - $(options.allToggle).show().on('click', function() { - checker($(this).prop("checked")); - updateCounter(); + document.querySelector(options.actionContainer).classList.remove(options.selectedClass); + } + + function checker(actionCheckboxes, options, checked) { + if (checked) { + showQuestion(options); + } else { + reset(options); + } + actionCheckboxes.forEach(function(el) { + el.checked = checked; + el.closest('tr').classList.toggle(options.selectedClass, checked); }); - $("a", options.acrossQuestions).on('click', function(event) { - event.preventDefault(); - $(options.acrossInput).val(1); - showClear(); + } + + function updateCounter(actionCheckboxes, options) { + const sel = Array.from(actionCheckboxes).filter(function(el) { + return el.checked; + }).length; + const counter = document.querySelector(options.counterContainer); + // data-actions-icnt is defined in the generated HTML + // and contains the total amount of objects in the queryset + const actions_icnt = Number(counter.dataset.actionsIcnt); + counter.textContent = interpolate( + ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { + sel: sel, + cnt: actions_icnt + }, true); + const allToggle = document.getElementById(options.allToggleId); + allToggle.checked = sel === actionCheckboxes.length; + if (allToggle.checked) { + showQuestion(options); + } else { + clearAcross(options); + } + } + + const defaults = { + actionContainer: "div.actions", + counterContainer: "span.action-counter", + allContainer: "div.actions span.all", + acrossInput: "div.actions input.select-across", + acrossQuestions: "div.actions span.question", + acrossClears: "div.actions span.clear", + allToggleId: "action-toggle", + selectedClass: "selected" + }; + + window.Actions = function(actionCheckboxes, options) { + options = Object.assign({}, defaults, options); + let list_editable_changed = false; + let lastChecked = null; + let shiftPressed = false; + + document.addEventListener('keydown', (event) => { + shiftPressed = event.shiftKey; }); - $("a", options.acrossClears).on('click', function(event) { - event.preventDefault(); - $(options.allToggle).prop("checked", false); - clearAcross(); - checker(0); - updateCounter(); + + document.addEventListener('keyup', (event) => { + shiftPressed = event.shiftKey; }); - lastChecked = null; - $(actionCheckboxes).on('click', function(event) { - if (!event) { event = window.event; } - const target = event.target ? event.target : event.srcElement; - if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) { - let inrange = false; - $(lastChecked).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - $(actionCheckboxes).each(function() { - if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) { - inrange = (inrange) ? false : true; - } - if (inrange) { - $(this).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - } + + document.getElementById(options.allToggleId).addEventListener('click', function(event) { + checker(actionCheckboxes, options, this.checked); + updateCounter(actionCheckboxes, options); + }); + + document.querySelectorAll(options.acrossQuestions + " a").forEach(function(el) { + el.addEventListener('click', function(event) { + event.preventDefault(); + const acrossInputs = document.querySelectorAll(options.acrossInput); + acrossInputs.forEach(function(acrossInput) { + acrossInput.value = 1; }); - } - $(target).parent().parent().toggleClass(options.selectedClass, target.checked); - lastChecked = target; - updateCounter(); + showClear(options); + }); }); - $('form#changelist-form table#result_list tr').on('change', 'td:gt(0) :input', function() { - list_editable_changed = true; + + document.querySelectorAll(options.acrossClears + " a").forEach(function(el) { + el.addEventListener('click', function(event) { + event.preventDefault(); + document.getElementById(options.allToggleId).checked = false; + clearAcross(options); + checker(actionCheckboxes, options, false); + updateCounter(actionCheckboxes, options); + }); }); - $('form#changelist-form button[name="index"]').on('click', function(event) { - if (list_editable_changed) { - return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); + + function affectedCheckboxes(target, withModifier) { + const multiSelect = (lastChecked && withModifier && lastChecked !== target); + if (!multiSelect) { + return [target]; } - }); - $('form#changelist-form input[name="_save"]').on('click', function(event) { - let action_changed = false; - $('select option:selected', options.actionContainer).each(function() { - if ($(this).val()) { - action_changed = true; + const checkboxes = Array.from(actionCheckboxes); + const targetIndex = checkboxes.findIndex(el => el === target); + const lastCheckedIndex = checkboxes.findIndex(el => el === lastChecked); + const startIndex = Math.min(targetIndex, lastCheckedIndex); + const endIndex = Math.max(targetIndex, lastCheckedIndex); + const filtered = checkboxes.filter((el, index) => (startIndex <= index) && (index <= endIndex)); + return filtered; + }; + + Array.from(document.getElementById('result_list').tBodies).forEach(function(el) { + el.addEventListener('change', function(event) { + const target = event.target; + if (target.classList.contains('action-select')) { + const checkboxes = affectedCheckboxes(target, shiftPressed); + checker(checkboxes, options, target.checked); + updateCounter(actionCheckboxes, options); + lastChecked = target; + } else { + list_editable_changed = true; } }); - if (action_changed) { - if (list_editable_changed) { - return confirm(gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.")); - } else { - return confirm(gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button.")); + }); + + document.querySelector('#changelist-form button[name=index]').addEventListener('click', function() { + if (list_editable_changed) { + const confirmed = confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); + if (!confirmed) { + event.preventDefault(); } } }); + + const el = document.querySelector('#changelist-form input[name=_save]'); + // The button does not exist if no fields are editable. + if (el) { + el.addEventListener('click', function(event) { + if (document.querySelector('[name=action]').value) { + const text = list_editable_changed + ? gettext("You have selected an action, but you haven’t saved your changes to individual fields yet. Please click OK to save. You’ll need to re-run the action.") + : gettext("You have selected an action, and you haven’t made any changes on individual fields. You’re probably looking for the Go button rather than the Save button."); + if (!confirm(text)) { + event.preventDefault(); + } + } + }); + } }; - /* Setup plugin defaults */ - $.fn.actions.defaults = { - actionContainer: "div.actions", - counterContainer: "span.action-counter", - allContainer: "div.actions span.all", - acrossInput: "div.actions input.select-across", - acrossQuestions: "div.actions span.question", - acrossClears: "div.actions span.clear", - allToggle: "#action-toggle", - selectedClass: "selected" - }; - $(document).ready(function() { - const $actionsEls = $('tr input.action-select'); - if ($actionsEls.length > 0) { - $actionsEls.actions(); + + // Call function fn when the DOM is loaded and ready. If it is already + // loaded, call the function now. + // http://youmightnotneedjquery.com/#ready + function ready(fn) { + if (document.readyState !== 'loading') { + fn(); + } else { + document.addEventListener('DOMContentLoaded', fn); + } + } + + ready(function() { + const actionsEls = document.querySelectorAll('tr input.action-select'); + if (actionsEls.length > 0) { + Actions(actionsEls); } }); } diff --git a/django/contrib/admin/static/admin/js/actions.min.js b/django/contrib/admin/static/admin/js/actions.min.js deleted file mode 100644 index 29fd0d8c2d5c..000000000000 --- a/django/contrib/admin/static/admin/js/actions.min.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict';{const a=django.jQuery;let e;a.fn.actions=function(g){const b=a.extend({},a.fn.actions.defaults,g),f=a(this);let k=!1;const l=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},m=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},n=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()}, -p=function(){n();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},q=function(c){c?l():n();a(f).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){const c=a(f).filter(":checked").length,d=a(".action-counter").data("actionsIcnt");a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:d},!0));a(b.allToggle).prop("checked",function(){let a;c===f.length?(a=!0,l()):(a=!1,p());return a})}; -a(b.counterContainer).show();a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);h();1===a(b.acrossInput).val()&&m()});a(b.allToggle).show().on("click",function(){q(a(this).prop("checked"));h()});a("a",b.acrossQuestions).on("click",function(c){c.preventDefault();a(b.acrossInput).val(1);m()});a("a",b.acrossClears).on("click",function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);p();q(0);h()});e=null;a(f).on("click",function(c){c||(c=window.event); -const d=c.target?c.target:c.srcElement;if(e&&a.data(e)!==a.data(d)&&!0===c.shiftKey){let c=!1;a(e).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(f).each(function(){if(a.data(this)===a.data(e)||a.data(this)===a.data(d))c=c?!1:!0;c&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);e=d;h()});a("form#changelist-form table#result_list tr").on("change","td:gt(0) :input", -function(){k=!0});a('form#changelist-form button[name="index"]').on("click",function(a){if(k)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').on("click",function(c){let d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return k?confirm(gettext("You have selected an action, but you haven\u2019t saved your changes to individual fields yet. Please click OK to save. You\u2019ll need to re-run the action.")): -confirm(gettext("You have selected an action, and you haven\u2019t made any changes on individual fields. You\u2019re probably looking for the Go button rather than the Save button."))})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"};a(document).ready(function(){const g= -a("tr input.action-select");0=h.val()-f.val()&&k.parent().hide();p(d.closest(".inline-group"));a.added&&a.added(d);b(document).trigger("formset:added",[d,a.prefix])}, -r=function(b){b.is("tr")?b.children(":last").append('"):b.is("ul")||b.is("ol")?b.append('
  • '+a.deleteText+"
    • "):b.children(":first").append(''+a.deleteText+"");b.find("a."+a.deleteCssClass).on("click",u.bind(this))},u=function(g){g.preventDefault();var d=b(g.target).closest("."+a.formCssClass);g=d.closest(".inline-group"); -var f=d.prev();f.length&&f.hasClass("row-form-errors")&&f.remove();d.remove();--n;a.removed&&a.removed(d);b(document).trigger("formset:removed",[d,a.prefix]);d=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(d.length);(""===h.val()||0'+a.addText+"");k=l.find("tr:last a")}else e.filter(":last").after('
    '+a.addText+"
    "), -k=e.filter(":last").next().find("a");k.on("click",t)})();c=""===h.val()||0 tr.form-row",b(c).tabularFormset(c,a.options)}})})}; diff --git a/django/contrib/admin/static/admin/js/nav_sidebar.js b/django/contrib/admin/static/admin/js/nav_sidebar.js index 9b558ca2e711..efaa7214b8de 100644 --- a/django/contrib/admin/static/admin/js/nav_sidebar.js +++ b/django/contrib/admin/static/admin/js/nav_sidebar.js @@ -2,18 +2,35 @@ { const toggleNavSidebar = document.getElementById('toggle-nav-sidebar'); if (toggleNavSidebar !== null) { + const navLinks = document.querySelectorAll('#nav-sidebar a'); + function disableNavLinkTabbing() { + for (const navLink of navLinks) { + navLink.tabIndex = -1; + } + } + function enableNavLinkTabbing() { + for (const navLink of navLinks) { + navLink.tabIndex = 0; + } + } + const main = document.getElementById('main'); let navSidebarIsOpen = localStorage.getItem('django.admin.navSidebarIsOpen'); if (navSidebarIsOpen === null) { navSidebarIsOpen = 'true'; } + if (navSidebarIsOpen === 'false') { + disableNavLinkTabbing(); + } main.classList.toggle('shifted', navSidebarIsOpen === 'true'); toggleNavSidebar.addEventListener('click', function() { - if (navSidebarIsOpen == 'true') { + if (navSidebarIsOpen === 'true') { navSidebarIsOpen = 'false'; + disableNavLinkTabbing(); } else { navSidebarIsOpen = 'true'; + enableNavLinkTabbing(); } localStorage.setItem('django.admin.navSidebarIsOpen', navSidebarIsOpen); main.classList.toggle('shifted'); diff --git a/django/contrib/admin/static/admin/js/prepopulate.min.js b/django/contrib/admin/static/admin/js/prepopulate.min.js deleted file mode 100644 index 11ead4990506..000000000000 --- a/django/contrib/admin/static/admin/js/prepopulate.min.js +++ /dev/null @@ -1 +0,0 @@ -'use strict';{const b=django.jQuery;b.fn.prepopulate=function(d,f,g){return this.each(function(){const a=b(this),h=function(){if(!a.data("_changed")){var e=[];b.each(d,function(a,c){c=b(c);0{{ selection_note }} {% if cl.result_count != cl.result_list|length %} - {{ selection_note_all }} - + + - {% translate "Clear selection" %} + {% endif %} {% endif %} {% endblock %} diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 1c3347e6595d..c107161a93ef 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -2,9 +2,6 @@ {% load i18n static %} {% load admin_urls %} -{% block extrahead %}{{ block.super }} - -{% endblock %} {% block extrastyle %}{{ block.super }}{% endblock %} {% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %} {% if not is_popup %} @@ -20,7 +17,7 @@ {% endif %} {% block content %}
    {% csrf_token %}{% block form_top %}{% endblock %} - +
    {% if is_popup %}{% endif %} {% if form.errors %} diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 00454ade9de1..e3788b9c2040 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -1,11 +1,12 @@ {% load i18n static %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} - + {% block title %}{% endblock %} {% if not is_popup and is_nav_sidebar_enabled %} + {% endif %} {% block extrastyle %}{% endblock %} {% if LANGUAGE_BIDI %}{% endif %} @@ -85,6 +86,7 @@
    {% block pretitle %}{% endblock %} {% block content_title %}{% if title %}

    {{ title }}

    {% endif %}{% endblock %} + {% block content_subtitle %}{% if subtitle %}

    {{ subtitle }}

    {% endif %}{% endblock %} {% block content %} {% block object-tools %}{% endblock %} {{ content }} @@ -98,9 +100,5 @@
    - -{% if not is_popup and is_nav_sidebar_enabled %} - -{% endif %} diff --git a/django/contrib/admin/templates/admin/base_site.html b/django/contrib/admin/templates/admin/base_site.html index cae0a691e36f..9e8cc604c595 100644 --- a/django/contrib/admin/templates/admin/base_site.html +++ b/django/contrib/admin/templates/admin/base_site.html @@ -1,6 +1,6 @@ {% extends "admin/base.html" %} -{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %} +{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %} {% block branding %}

    {{ site_header|default:_('Django administration') }}

    diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index aebd12b95706..15508a9a9f77 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -35,7 +35,7 @@ {% endblock %} {% endif %} -{% block coltype %}flex{% endblock %} +{% block coltype %}{% endblock %} {% block content %}
    @@ -53,33 +53,34 @@ {{ cl.formset.non_form_errors }} {% endif %}
    - {% block search %}{% search_form cl %}{% endblock %} - {% block date_hierarchy %}{% if cl.date_hierarchy %}{% date_hierarchy cl %}{% endif %}{% endblock %} +
    + {% block search %}{% search_form cl %}{% endblock %} + {% block date_hierarchy %}{% if cl.date_hierarchy %}{% date_hierarchy cl %}{% endif %}{% endblock %} +
    {% csrf_token %} + {% if cl.formset %} +
    {{ cl.formset.management_form }}
    + {% endif %} + + {% block result_list %} + {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %} + {% result_list cl %} + {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %} + {% endblock %} + {% block pagination %}{% pagination cl %}{% endblock %} +
    +
    {% block filters %} {% if cl.has_filters %}

    {% translate 'Filter' %}

    - {% if cl.preserved_filters %}

    - ✖ {% translate "Clear all filters" %} + {% if cl.has_active_filters %}

    + ✖ {% translate "Clear all filters" %}

    {% endif %} {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %}
    {% endif %} {% endblock %} - -
    {% csrf_token %} - {% if cl.formset %} -
    {{ cl.formset.management_form }}
    - {% endif %} - - {% block result_list %} - {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %} - {% result_list cl %} - {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %} - {% endblock %} - {% block pagination %}{% pagination cl %}{% endblock %} -
    {% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html index 7eeba04f7cd1..f8099cecbe1b 100644 --- a/django/contrib/admin/templates/admin/change_list_results.html +++ b/django/contrib/admin/templates/admin/change_list_results.html @@ -10,7 +10,7 @@ {% for header in result_headers %} - + {% if header.sortable %} {% if header.sort_priority > 0 %}
    diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 0292c6ef9975..25b7b58e4e08 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -4,7 +4,11 @@ data-inline-type="stacked" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
    -

    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

    + {% if inline_admin_formset.formset.max_num == 1 %} +

    {{ inline_admin_formset.opts.verbose_name|capfirst }}

    + {% else %} +

    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

    + {% endif %} {{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.non_form_errors }} diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index c19d28406228..7a4e7cb226d7 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -5,7 +5,11 @@
    {{ inline_admin_formset.formset.management_form }}
    -

    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

    + {% if inline_admin_formset.formset.max_num == 1 %} +

    {{ inline_admin_formset.opts.verbose_name|capfirst }}

    + {% else %} +

    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

    + {% endif %} {{ inline_admin_formset.formset.non_form_errors }} diff --git a/django/contrib/admin/templates/admin/nav_sidebar.html b/django/contrib/admin/templates/admin/nav_sidebar.html index 84956c1bd102..32c5b8f839f9 100644 --- a/django/contrib/admin/templates/admin/nav_sidebar.html +++ b/django/contrib/admin/templates/admin/nav_sidebar.html @@ -1,4 +1,5 @@ -
    +{% load i18n %} + diff --git a/django/contrib/admin/templates/admin/widgets/clearable_file_input.html b/django/contrib/admin/templates/admin/widgets/clearable_file_input.html index 80699d1a50c1..fe71ebdb06f5 100644 --- a/django/contrib/admin/templates/admin/widgets/clearable_file_input.html +++ b/django/contrib/admin/templates/admin/widgets/clearable_file_input.html @@ -1,6 +1,6 @@ {% if widget.is_initial %}

    {{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %} - + {% endif %}
    {{ widget.input_text }}:{% endif %} {% if widget.is_initial %}

    {% endif %} diff --git a/django/contrib/admin/templates/registration/password_change_done.html b/django/contrib/admin/templates/registration/password_change_done.html index 9cc85f836142..e1bb982abafe 100644 --- a/django/contrib/admin/templates/registration/password_change_done.html +++ b/django/contrib/admin/templates/registration/password_change_done.html @@ -8,8 +8,6 @@ {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} {% block content %}

    {% translate 'Your password was changed.' %}

    {% endblock %} diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index d3a9bf305d39..95c84f922d12 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -9,9 +9,6 @@ {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} - {% block content %}
    {% csrf_token %} diff --git a/django/contrib/admin/templates/registration/password_reset_complete.html b/django/contrib/admin/templates/registration/password_reset_complete.html index 396f33984176..e6a383fcfecc 100644 --- a/django/contrib/admin/templates/registration/password_reset_complete.html +++ b/django/contrib/admin/templates/registration/password_reset_complete.html @@ -8,9 +8,6 @@
    {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} - {% block content %}

    {% translate "Your password has been set. You may go ahead and log in now." %}

    diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index 20ef252b95a0..373e7034162b 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -9,8 +9,6 @@ {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} {% block content %} {% if validlink %} @@ -19,6 +17,7 @@ {% csrf_token %}
    +
    {{ form.new_password1.errors }} diff --git a/django/contrib/admin/templates/registration/password_reset_done.html b/django/contrib/admin/templates/registration/password_reset_done.html index 1f6e83aaafbc..8b1971a76e21 100644 --- a/django/contrib/admin/templates/registration/password_reset_done.html +++ b/django/contrib/admin/templates/registration/password_reset_done.html @@ -8,8 +8,6 @@
    {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} {% block content %}

    {% translate 'We’ve emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.' %}

    diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index d5493d9d6118..33785f7c14d5 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -9,8 +9,6 @@ {% endblock %} -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

    {{ title }}

    {% endblock %} {% block content %}

    {% translate 'Forgotten your password? Enter your email address below, and we’ll email instructions for setting a new one.' %}

    diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 2b48f09f2192..f4b6d8d59f61 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -24,24 +24,22 @@ register = Library() -DOT = '.' - @register.simple_tag def paginator_number(cl, i): """ Generate an individual page index link in a paginated list. """ - if i == DOT: - return '… ' + if i == cl.paginator.ELLIPSIS: + return format_html('{} ', cl.paginator.ELLIPSIS) elif i == cl.page_num: - return format_html('{} ', i + 1) + return format_html('{} ', i) else: return format_html( '{} ', cl.get_query_string({PAGE_VAR: i}), - mark_safe(' class="end"' if i == cl.paginator.num_pages - 1 else ''), - i + 1, + mark_safe(' class="end"' if i == cl.paginator.num_pages else ''), + i, ) @@ -49,39 +47,8 @@ def pagination(cl): """ Generate the series of links to the pages in a paginated list. """ - paginator, page_num = cl.paginator, cl.page_num - pagination_required = (not cl.show_all or not cl.can_show_all) and cl.multi_page - if not pagination_required: - page_range = [] - else: - ON_EACH_SIDE = 3 - ON_ENDS = 2 - - # If there are 10 or fewer pages, display links to every page. - # Otherwise, do some fancy - if paginator.num_pages <= 10: - page_range = range(paginator.num_pages) - else: - # Insert "smart" pagination links, so that there are always ON_ENDS - # links at either end of the list of pages, and there are always - # ON_EACH_SIDE links at either end of the "current page" link. - page_range = [] - if page_num > (ON_EACH_SIDE + ON_ENDS): - page_range += [ - *range(0, ON_ENDS), DOT, - *range(page_num - ON_EACH_SIDE, page_num + 1), - ] - else: - page_range.extend(range(0, page_num + 1)) - if page_num < (paginator.num_pages - ON_EACH_SIDE - ON_ENDS - 1): - page_range += [ - *range(page_num + 1, page_num + ON_EACH_SIDE + 1), DOT, - *range(paginator.num_pages - ON_ENDS, paginator.num_pages) - ] - else: - page_range.extend(range(page_num + 1, paginator.num_pages)) - + page_range = cl.paginator.get_elided_page_range(cl.page_num) if pagination_required else [] need_show_all_link = cl.can_show_all and not cl.show_all and cl.multi_page return { 'cl': cl, @@ -380,12 +347,12 @@ def link(filters): # select appropriate start level date_range = cl.queryset.aggregate(first=models.Min(field_name), last=models.Max(field_name)) - if dates_or_datetimes == 'datetimes': - date_range = { - k: timezone.localtime(v) if timezone.is_aware(v) else v - for k, v in date_range.items() - } if date_range['first'] and date_range['last']: + if dates_or_datetimes == 'datetimes': + date_range = { + k: timezone.localtime(v) if timezone.is_aware(v) else v + for k, v in date_range.items() + } if date_range['first'].year == date_range['last'].year: year_lookup = date_range['first'].year if date_range['first'].month == date_range['last'].month: diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index 941d030d30aa..482027b1ae74 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -10,7 +10,7 @@ class CSPMiddleware(MiddlewareMixin): """The admin's JavaScript should be compatible with CSP.""" def process_response(self, request, response): - response['Content-Security-Policy'] = "default-src 'self'" + response.headers['Content-Security-Policy'] = "default-src 'self'" return response diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 446083e65934..ba06da521105 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -1,5 +1,6 @@ import datetime import decimal +import json from collections import defaultdict from django.core.exceptions import FieldDoesNotExist @@ -400,7 +401,7 @@ def display_for_field(value, field, empty_value_display): return format_html('{}', value.url, value) elif isinstance(field, models.JSONField) and value: try: - return field.get_prep_value(value) + return json.dumps(value, ensure_ascii=False, cls=field.encoder) except TypeError: return display_for_value(value, empty_value_display) else: diff --git a/django/contrib/admin/views/autocomplete.py b/django/contrib/admin/views/autocomplete.py index 7aa59bf92fbc..3903e4c98c92 100644 --- a/django/contrib/admin/views/autocomplete.py +++ b/django/contrib/admin/views/autocomplete.py @@ -1,3 +1,5 @@ +from django.apps import apps +from django.core.exceptions import FieldDoesNotExist, PermissionDenied from django.http import Http404, JsonResponse from django.views.generic.list import BaseListView @@ -5,7 +7,7 @@ class AutocompleteJsonView(BaseListView): """Handle AutocompleteWidget's AJAX requests for data.""" paginate_by = 20 - model_admin = None + admin_site = None def get(self, request, *args, **kwargs): """ @@ -15,20 +17,16 @@ def get(self, request, *args, **kwargs): pagination: {more: true} } """ - if not self.model_admin.get_search_fields(request): - raise Http404( - '%s must have search_fields for the autocomplete_view.' % - type(self.model_admin).__name__ - ) + self.term, self.model_admin, self.source_field, to_field_name = self.process_request(request) + if not self.has_perm(request): - return JsonResponse({'error': '403 Forbidden'}, status=403) + raise PermissionDenied - self.term = request.GET.get('term', '') self.object_list = self.get_queryset() context = self.get_context_data() return JsonResponse({ 'results': [ - {'id': str(obj.pk), 'text': str(obj)} + {'id': str(getattr(obj, to_field_name)), 'text': str(obj)} for obj in context['object_list'] ], 'pagination': {'more': context['page_obj'].has_next()}, @@ -41,11 +39,64 @@ def get_paginator(self, *args, **kwargs): def get_queryset(self): """Return queryset based on ModelAdmin.get_search_results().""" qs = self.model_admin.get_queryset(self.request) + qs = qs.complex_filter(self.source_field.get_limit_choices_to()) qs, search_use_distinct = self.model_admin.get_search_results(self.request, qs, self.term) if search_use_distinct: qs = qs.distinct() return qs + def process_request(self, request): + """ + Validate request integrity, extract and return request parameters. + + Since the subsequent view permission check requires the target model + admin, which is determined here, raise PermissionDenied if the + requested app, model or field are malformed. + + Raise Http404 if the target model admin is not configured properly with + search_fields. + """ + term = request.GET.get('term', '') + try: + app_label = request.GET['app_label'] + model_name = request.GET['model_name'] + field_name = request.GET['field_name'] + except KeyError as e: + raise PermissionDenied from e + + # Retrieve objects from parameters. + try: + source_model = apps.get_model(app_label, model_name) + except LookupError as e: + raise PermissionDenied from e + + try: + source_field = source_model._meta.get_field(field_name) + except FieldDoesNotExist as e: + raise PermissionDenied from e + try: + remote_model = source_field.remote_field.model + except AttributeError as e: + raise PermissionDenied from e + try: + model_admin = self.admin_site._registry[remote_model] + except KeyError as e: + raise PermissionDenied from e + + # Validate suitability of objects. + if not model_admin.get_search_fields(request): + raise Http404( + '%s must have search_fields for the autocomplete_view.' % + type(model_admin).__qualname__ + ) + + to_field_name = getattr(source_field.remote_field, 'field_name', remote_model._meta.pk.attname) + to_field_name = remote_model._meta.get_field(to_field_name).attname + if not model_admin.to_field_allowed(request, to_field_name): + raise PermissionDenied + + return term, model_admin, source_field, to_field_name + def has_perm(self, request, obj=None): """Check if user has permission to access the related model.""" return self.model_admin.has_view_permission(request, obj=obj) diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 5bc3f736f1bd..a54ef25f23c8 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -17,7 +17,7 @@ FieldDoesNotExist, ImproperlyConfigured, SuspiciousOperation, ) from django.core.paginator import InvalidPage -from django.db.models import F, Field, ManyToOneRel, OrderBy +from django.db.models import Exists, F, Field, ManyToOneRel, OrderBy, OuterRef from django.db.models.expressions import Combinable from django.urls import reverse from django.utils.http import urlencode @@ -59,6 +59,8 @@ def __init__(self, request, model, list_display, list_display_links, self.list_display_links = list_display_links self.list_filter = list_filter self.has_filters = None + self.has_active_filters = None + self.clear_all_filters_qs = None self.date_hierarchy = date_hierarchy self.search_fields = search_fields self.list_select_related = list_select_related @@ -75,9 +77,9 @@ def __init__(self, request, model, list_display, list_display_links, messages.error(request, ', '.join(error)) self.query = _search_form.cleaned_data.get(SEARCH_VAR) or '' try: - self.page_num = int(request.GET.get(PAGE_VAR, 0)) + self.page_num = int(request.GET.get(PAGE_VAR, 1)) except ValueError: - self.page_num = 0 + self.page_num = 1 self.show_all = ALL_VAR in request.GET self.is_popup = IS_POPUP_VAR in request.GET to_field = request.GET.get(TO_FIELD_VAR) @@ -120,7 +122,8 @@ def get_filters_params(self, params=None): def get_filters(self, request): lookup_params = self.get_filters_params() - use_distinct = False + may_have_duplicates = False + has_active_filters = False for key, value in lookup_params.items(): if not self.model_admin.lookup_allowed(key, value): @@ -128,6 +131,7 @@ def get_filters(self, request): filter_specs = [] for list_filter in self.list_filter: + lookup_params_count = len(lookup_params) if callable(list_filter): # This is simply a custom list filter class. spec = list_filter(request, lookup_params, self.model, self.model_admin) @@ -145,7 +149,6 @@ def get_filters(self, request): field_path = field field = get_fields_from_path(self.model, field_path)[-1] - lookup_params_count = len(lookup_params) spec = field_list_filter_class( field, request, lookup_params, self.model, self.model_admin, field_path=field_path, @@ -154,9 +157,11 @@ def get_filters(self, request): # processes. If that happened, check if distinct() is needed to # remove duplicate results. if lookup_params_count > len(lookup_params): - use_distinct = use_distinct or lookup_needs_distinct(self.lookup_opts, field_path) + may_have_duplicates |= lookup_needs_distinct(self.lookup_opts, field_path) if spec and spec.has_output(): filter_specs.append(spec) + if lookup_params_count > len(lookup_params): + has_active_filters = True if self.date_hierarchy: # Create bounded lookup parameters so that the query is more @@ -198,8 +203,11 @@ def get_filters(self, request): try: for key, value in lookup_params.items(): lookup_params[key] = prepare_lookup_value(key, value) - use_distinct = use_distinct or lookup_needs_distinct(self.lookup_opts, key) - return filter_specs, bool(filter_specs), lookup_params, use_distinct + may_have_duplicates |= lookup_needs_distinct(self.lookup_opts, key) + return ( + filter_specs, bool(filter_specs), lookup_params, may_have_duplicates, + has_active_filters, + ) except FieldDoesNotExist as e: raise IncorrectLookupParameters(e) from e @@ -239,7 +247,7 @@ def get_results(self, request): result_list = self.queryset._clone() else: try: - result_list = paginator.page(self.page_num + 1).object_list + result_list = paginator.page(self.page_num).object_list except InvalidPage: raise IncorrectLookupParameters @@ -433,9 +441,13 @@ def get_ordering_field_columns(self): def get_queryset(self, request): # First, we collect all the declared list filters. - (self.filter_specs, self.has_filters, remaining_lookup_params, - filters_use_distinct) = self.get_filters(request) - + ( + self.filter_specs, + self.has_filters, + remaining_lookup_params, + filters_may_have_duplicates, + self.has_active_filters, + ) = self.get_filters(request) # Then, we let every list filter modify the queryset to its liking. qs = self.root_queryset for filter_spec in self.filter_specs: @@ -460,21 +472,29 @@ def get_queryset(self, request): # ValueError, ValidationError, or ?. raise IncorrectLookupParameters(e) - if not qs.query.select_related: - qs = self.apply_select_related(qs) + # Apply search results + qs, search_may_have_duplicates = self.model_admin.get_search_results( + request, qs, self.query, + ) + + # Set query string for clearing all filters. + self.clear_all_filters_qs = self.get_query_string( + new_params=remaining_lookup_params, + remove=self.get_filters_params(), + ) + # Remove duplicates from results, if necessary + if filters_may_have_duplicates | search_may_have_duplicates: + qs = qs.filter(pk=OuterRef('pk')) + qs = self.root_queryset.filter(Exists(qs)) # Set ordering. ordering = self.get_ordering(request, qs) qs = qs.order_by(*ordering) - # Apply search results - qs, search_use_distinct = self.model_admin.get_search_results(request, qs, self.query) + if not qs.query.select_related: + qs = self.apply_select_related(qs) - # Remove duplicates from results, if necessary - if filters_use_distinct | search_use_distinct: - return qs.distinct() - else: - return qs + return qs def apply_select_related(self, qs): if self.list_select_related is True: diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index 1ec7c70abd0f..aeb74773ac64 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -12,7 +12,7 @@ from django.urls import reverse from django.urls.exceptions import NoReverseMatch from django.utils.html import smart_urlquote -from django.utils.safestring import mark_safe +from django.utils.http import urlencode from django.utils.text import Truncator from django.utils.translation import get_language, gettext as _ @@ -145,8 +145,8 @@ def get_context(self, name, value, attrs): params = self.url_parameters() if params: - related_url += '?' + '&'.join('%s=%s' % (k, v) for k, v in params.items()) - context['related_url'] = mark_safe(related_url) + related_url += '?' + urlencode(params) + context['related_url'] = related_url context['link_title'] = _('Lookup') # The JavaScript code looks for this class. context['widget']['attrs'].setdefault('class', 'vForeignKeyRawIdAdminField') @@ -380,18 +380,17 @@ class AutocompleteMixin: Renders the necessary data attributes for select2 and adds the static form media. """ - url_name = '%s:%s_%s_autocomplete' + url_name = '%s:autocomplete' - def __init__(self, rel, admin_site, attrs=None, choices=(), using=None): - self.rel = rel + def __init__(self, field, admin_site, attrs=None, choices=(), using=None): + self.field = field self.admin_site = admin_site self.db = using self.choices = choices self.attrs = {} if attrs is None else attrs.copy() def get_url(self): - model = self.rel.model - return reverse(self.url_name % (self.admin_site.name, model._meta.app_label, model._meta.model_name)) + return reverse(self.url_name % self.admin_site.name) def build_attrs(self, base_attrs, extra_attrs=None): """ @@ -408,6 +407,9 @@ def build_attrs(self, base_attrs, extra_attrs=None): 'data-ajax--delay': 250, 'data-ajax--type': 'GET', 'data-ajax--url': self.get_url(), + 'data-app-label': self.field.model._meta.app_label, + 'data-model-name': self.field.model._meta.model_name, + 'data-field-name': self.field.name, 'data-theme': 'admin-autocomplete', 'data-allow-clear': json.dumps(not self.is_required), 'data-placeholder': '', # Allows clearing of the input. @@ -426,9 +428,12 @@ def optgroups(self, name, value, attr=None): } if not self.is_required and not self.allow_multiple_selected: default[1].append(self.create_option(name, '', '', False, 0)) + remote_model_opts = self.field.remote_field.model._meta + to_field_name = getattr(self.field.remote_field, 'field_name', remote_model_opts.pk.attname) + to_field_name = remote_model_opts.get_field(to_field_name).attname choices = ( - (obj.pk, self.choices.field.label_from_instance(obj)) - for obj in self.choices.queryset.using(self.db).filter(pk__in=selected_choices) + (getattr(obj, to_field_name), self.choices.field.label_from_instance(obj)) + for obj in self.choices.queryset.using(self.db).filter(**{'%s__in' % to_field_name: selected_choices}) ) for option_value, option_label in choices: selected = ( diff --git a/django/contrib/admindocs/__init__.py b/django/contrib/admindocs/__init__.py index 733519ac54da..e69de29bb2d1 100644 --- a/django/contrib/admindocs/__init__.py +++ b/django/contrib/admindocs/__init__.py @@ -1 +0,0 @@ -default_app_config = 'django.contrib.admindocs.apps.AdminDocsConfig' diff --git a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo index 556d2535d763..faba0ccd9e9d 100644 Binary files a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po index c434ce3f87e0..ca1bd2ad1a2c 100644 --- a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Bashar Al-Abdulhadi, 2015-2016 # Bashar Al-Abdulhadi, 2014 # Jannis Leidel , 2011 +# Muaaz Alsaied, 2020 # Ossama Khayat , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-02 10:32+0000\n" +"Last-Translator: Muaaz Alsaied\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -132,7 +133,7 @@ msgid "Arguments" msgstr "مُعطيات" msgid "Back to Model documentation" -msgstr "" +msgstr "العودة إلى وثائق الموديول" msgid "Model documentation" msgstr "وثائق الموديول" @@ -148,13 +149,13 @@ msgid "Template: %(name)s" msgstr "قالب: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "قالب: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "قالب: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "البحث عن مسار القالب \"%(name)s\":" +msgid "Search path for template %(name)s:" +msgstr "البحث عن مسار القالب %(name)s:" msgid "(does not exist)" msgstr "(غير موجود)" @@ -207,10 +208,10 @@ msgid "Templates:" msgstr "القوالب:" msgid "Back to View documentation" -msgstr "" +msgstr "العودة إلى وثائق الفيو" msgid "View documentation" -msgstr "عرض الوثائق" +msgstr "وثائق الفيو" msgid "Jump to namespace" msgstr "القفز إلى مساحة الاسم" diff --git a/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..c7a051998f44 Binary files /dev/null and b/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..534386d0b9d9 --- /dev/null +++ b/django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,276 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-12-14 20:11+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "Administrative Documentation" +msgstr "الوثائق الإدارية" + +msgid "Home" +msgstr "الرئيسية" + +msgid "Documentation" +msgstr "الوثائق" + +msgid "Bookmarklets" +msgstr "أوامر المفضلة" + +msgid "Documentation bookmarklets" +msgstr "أوامر مفضلة للوثائق" + +msgid "" +"To install bookmarklets, drag the link to your bookmarks toolbar, or right-" +"click the link and add it to your bookmarks. Now you can select the " +"bookmarklet from any page in the site." +msgstr "" +"لتثبيت أوامر المفضلة، اسحب الرابط إلى المواقع المفضلة في شريط الأدوات الخاص " +"بك، أو إضغط بزر الماوس الأيمن على الرابط وأضفه إلى قائمة المواقع المفضلة " +"الخاصة بك. الآن يمكنك اختيار أوامر المفضلة من أي صفحة في الموقع." + +msgid "Documentation for this page" +msgstr "الوثائق لهذه الصفحة" + +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "ينتقل بك من أي صفحة إلى وثائق العرض الذي أنشأ هذه الصفحة." + +msgid "Tags" +msgstr "الوسوم" + +msgid "List of all the template tags and their functions." +msgstr "قائمة بجميع وسوم القوالب ووظائفهم." + +msgid "Filters" +msgstr "الفلاتر" + +msgid "" +"Filters are actions which can be applied to variables in a template to alter " +"the output." +msgstr "" +"المرشحات هي الإجراءات التي يمكن تطبيقها على المتغيرات في قالب لتغيير الناتج." + +msgid "Models" +msgstr "النماذج" + +msgid "" +"Models are descriptions of all the objects in the system and their " +"associated fields. Each model has a list of fields which can be accessed as " +"template variables" +msgstr "" +"الموديلات هي وصف لجميع الكائنات في النظام والحقول المرتبطة بها. كل موديول " +"يحتوي على قائمة الحقول التي يمكن الوصول إليها كمتغيرات قالب" + +msgid "Views" +msgstr "إستعراض" + +msgid "" +"Each page on the public site is generated by a view. The view defines which " +"template is used to generate the page and which objects are available to " +"that template." +msgstr "" +"يتم إنشاء كل صفحة على الموقع علني من خلال عرض. يعرّف العرض الذي يستخدم كقالب " +"لتوليد الصفحة والتي هي الكائنات المتاحة لذلك القالب." + +msgid "Tools for your browser to quickly access admin functionality." +msgstr "أدوات المتصفح لكي تتمكن من الوصول بسرعة وظائف المشرف." + +msgid "Please install docutils" +msgstr "الرجاء تثبيت docutils" + +#, python-format +msgid "" +"The admin documentation system requires Python's docutils library." +msgstr "" +"نظام توثيقات المشرف مكتبة بايثون docutils." + +#, python-format +msgid "" +"Please ask your administrators to install docutils." +msgstr "" +"الرجاء الطلب من مشرف النظام لتنصيب docutils." + +#, python-format +msgid "Model: %(name)s" +msgstr "المودل: %(name)s" + +msgid "Fields" +msgstr "الحقول" + +msgid "Field" +msgstr "حقل" + +msgid "Type" +msgstr "نوع" + +msgid "Description" +msgstr "وصف" + +msgid "Methods with arguments" +msgstr "طرق بمعطيات" + +msgid "Method" +msgstr "الطريقة" + +msgid "Arguments" +msgstr "معطيات" + +msgid "Back to Model documentation" +msgstr "العودة إلى وثائق الموديول" + +msgid "Model documentation" +msgstr "وثائق الموديول" + +msgid "Model groups" +msgstr "مجموعات الموديول" + +msgid "Templates" +msgstr "القوالب" + +#, python-format +msgid "Template: %(name)s" +msgstr "قالب: %(name)s" + +#, python-format +msgid "Template: %(name)s" +msgstr "قالب: \\\"%(name)s\\\"" + +#. Translators: Search is not a verb here, it qualifies path (a search path) +#, python-format +msgid "Search path for template %(name)s:" +msgstr "البحث عن مسار القالب \\\"%(name)s\\\":" + +msgid "(does not exist)" +msgstr "(غير موجود)" + +msgid "Back to Documentation" +msgstr "العودة إلى الوثائق" + +msgid "Template filters" +msgstr "مرشحات القالب" + +msgid "Template filter documentation" +msgstr "وثائق مرشح القالب" + +msgid "Built-in filters" +msgstr "المرشحات المدمجة" + +#, python-format +msgid "" +"To use these filters, put %(code)s in your template before " +"using the filter." +msgstr "" +"لإستخدام هذه المرشحات, الرجاء وضع %(code)s في القالب الخاص بك " +"قبل إستخدام المرشّح." + +msgid "Template tags" +msgstr "وسوم القالب" + +msgid "Template tag documentation" +msgstr "وثائق وسم القالب" + +msgid "Built-in tags" +msgstr "المسوم المدمجة" + +#, python-format +msgid "" +"To use these tags, put %(code)s in your template before using " +"the tag." +msgstr "" +"لإستخدام هذه الوسوم, الرجاء وضع %(code)s في القالب الخاص بك قبل " +"إستخدام الوسم." + +#, python-format +msgid "View: %(name)s" +msgstr "عرض: %(name)s" + +msgid "Context:" +msgstr "السياق:" + +msgid "Templates:" +msgstr "القوالب:" + +msgid "Back to View documentation" +msgstr "العودة لـ : عرض الوثائق" + +msgid "View documentation" +msgstr "عرض الوثائق" + +msgid "Jump to namespace" +msgstr "القفز إلى مساحة الاسم" + +msgid "Empty namespace" +msgstr "مساحة إسم فارغة" + +#, python-format +msgid "Views by namespace %(name)s" +msgstr "العروض عبر مساحة الإسم %(name)s" + +msgid "Views by empty namespace" +msgstr "العروض عبر مساحة الإسم الفارغة" + +#, python-format +msgid "" +"\n" +" View function: %(full_name)s. Name: %(url_name)s.\n" +msgstr "" +"\n" +" عرض الخاصية: %(full_name)s. الإسم: %(url_name)s." +"\\n\n" + +msgid "tag:" +msgstr "وسم:" + +msgid "filter:" +msgstr "مرشّح" + +msgid "view:" +msgstr "عرض:" + +#, python-format +msgid "App %(app_label)r not found" +msgstr "البرنامج %(app_label)r غير موجود" + +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "النموذج %(model_name)r غير موجود في التطبيق %(app_label)r" + +msgid "model:" +msgstr "نموذج:" + +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "العنصر `%(app_label)s.%(data_type)s` المرتبط" + +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "عناصر `%(app_label)s.%(object_name)s` مرتبطة" + +#, python-format +msgid "all %s" +msgstr "كل %s" + +#, python-format +msgid "number of %s" +msgstr "عدد %s" + +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "يبدو أن %s ليس عنصر urlpattern" diff --git a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo index 639cb48f7f66..96f61d39afc2 100644 Binary files a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po index 0ea4895e56dd..0da3c326cf55 100644 --- a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Viktar Palstsiuk , 2014-2015 -# znotdead , 2016,2019 +# znotdead , 2016,2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-16 18:30+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 17:29+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -101,7 +101,7 @@ msgstr "Калі ласка, усталюйце Docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Дакументацыя кіраўнічай сістэмы патрабуе бібліятэку Python , 2011 # Vláďa Macek , 2012-2014 -# Vláďa Macek , 2015-2016,2019 +# Vláďa Macek , 2015-2016,2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-19 09:23+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 23:13+0000\n" "Last-Translator: Vláďa Macek \n" "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" @@ -102,11 +102,11 @@ msgstr "Nainstalujte balík docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Dokumentační systém administračního rozhraní potřebuje pythonskou knihovnu " -"docutils." +"Dokumentační systém administračního rozhraní vyžaduje pythonskou knihovnu docutils." #, python-format msgid "" diff --git a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo index 414be2ae2c1f..d08548261640 100644 Binary files a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po index 746bb6b850d6..4544478d205f 100644 --- a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po @@ -2,16 +2,17 @@ # # Translators: # Christian Joergensen , 2012 -# Erik Wognsen , 2013,2015-2016,2019 +# Erik Ramsgaard Wognsen , 2021 +# Erik Ramsgaard Wognsen , 2013,2015-2016,2019 # Jannis Leidel , 2011 # valberg , 2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 17:56+0000\n" -"Last-Translator: Erik Wognsen \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 18:23+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,10 +102,10 @@ msgstr "Installer venligst docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Admin dokumentationssystemet kræver Python's docutilsdocutils bibliotek." #, python-format diff --git a/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.mo index a8f32d7f0a80..d07d1872bd82 100644 Binary files a/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.po index 5ead6add94c2..f4caac7fb145 100644 --- a/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/dsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016 +# Michael Wolf , 2016,2020-2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 00:02+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 22:06+0000\n" +"Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" @@ -102,7 +102,7 @@ msgstr "Pšosym instalěrujśo docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Administratorowy dokumentaciski system pomina se Pythonowu biblioteku %(name)s" +msgstr "Pśedłoga: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Py´tańska sćažka za pśedłogu „%(name)s“:" +msgid "Search path for template %(name)s:" +msgstr "Pytańska sćažka za pśedłogu %(name)s:" msgid "(does not exist)" msgstr "(njeeksistěrujo)" diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index ebbbd3abd947..34eb488012f6 100644 --- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -131,7 +131,7 @@ msgstr "" #: contrib/admindocs/templates/admin_doc/missing_docutils.html:17 #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" @@ -301,54 +301,54 @@ msgid "" "code>.\n" msgstr "" -#: contrib/admindocs/views.py:71 contrib/admindocs/views.py:72 -#: contrib/admindocs/views.py:74 +#: contrib/admindocs/views.py:72 contrib/admindocs/views.py:73 +#: contrib/admindocs/views.py:75 msgid "tag:" msgstr "" -#: contrib/admindocs/views.py:102 contrib/admindocs/views.py:103 -#: contrib/admindocs/views.py:105 +#: contrib/admindocs/views.py:103 contrib/admindocs/views.py:104 +#: contrib/admindocs/views.py:106 msgid "filter:" msgstr "" -#: contrib/admindocs/views.py:161 contrib/admindocs/views.py:162 -#: contrib/admindocs/views.py:164 +#: contrib/admindocs/views.py:162 contrib/admindocs/views.py:163 +#: contrib/admindocs/views.py:165 msgid "view:" msgstr "" -#: contrib/admindocs/views.py:191 +#: contrib/admindocs/views.py:192 #, python-format msgid "App %(app_label)r not found" msgstr "" -#: contrib/admindocs/views.py:195 +#: contrib/admindocs/views.py:196 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "" -#: contrib/admindocs/views.py:200 contrib/admindocs/views.py:201 -#: contrib/admindocs/views.py:216 contrib/admindocs/views.py:239 -#: contrib/admindocs/views.py:244 contrib/admindocs/views.py:259 -#: contrib/admindocs/views.py:300 contrib/admindocs/views.py:305 +#: contrib/admindocs/views.py:201 contrib/admindocs/views.py:202 +#: contrib/admindocs/views.py:217 contrib/admindocs/views.py:240 +#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:260 +#: contrib/admindocs/views.py:301 contrib/admindocs/views.py:306 msgid "model:" msgstr "" -#: contrib/admindocs/views.py:212 +#: contrib/admindocs/views.py:213 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "" -#: contrib/admindocs/views.py:232 contrib/admindocs/views.py:292 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:293 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "" -#: contrib/admindocs/views.py:239 contrib/admindocs/views.py:300 +#: contrib/admindocs/views.py:240 contrib/admindocs/views.py:301 #, python-format msgid "all %s" msgstr "" -#: contrib/admindocs/views.py:244 contrib/admindocs/views.py:305 +#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:306 #, python-format msgid "number of %s" msgstr "" diff --git a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo index baff5730ea4c..26e4989e57eb 100644 Binary files a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po index ad2f5b198719..e4892d9ab5d1 100644 --- a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Baptiste Darthenay , 2013-2016 +# Batist D 🐍 , 2013-2016 +# Matthieu Desplantes , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-13 08:19+0000\n" +"Last-Translator: Matthieu Desplantes \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -98,11 +99,9 @@ msgstr "Bonvolu instali docutils-n" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"La admin dokumentaran sistemon bezonas la pitonan docutils bibliotekon." #, python-format msgid "" @@ -153,13 +152,13 @@ msgid "Template: %(name)s" msgstr "Ŝablono: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "Ŝablono: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "Ŝablono: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Serĉi vojon por ŝablono “%(name)s”:" +msgid "Search path for template %(name)s:" +msgstr "" msgid "(does not exist)" msgstr "(ne ekzistas)" diff --git a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo index 857a5b5673bd..bf264a80ce20 100644 Binary files a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po index 45cff1e2b91d..2747c1ab814a 100644 --- a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po @@ -4,19 +4,20 @@ # Antoni Aloy , 2012-2013 # Claude Paroz , 2014 # Eduardo , 2017 -# Ernesto Avilés Vázquez , 2015 +# e4db27214f7e7544f2022c647b585925_bb0e321, 2015 # Herty Nava , 2013 # Jannis Leidel , 2011 # José Luis , 2016 # Josue Naaman Nistal Guerra , 2014 +# Uriel Medina , 2020-2021 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Eduardo \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-11 05:39+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -26,7 +27,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Administrative Documentation" -msgstr "Documentacion Administrativa" +msgstr "Documentación Administrativa" msgid "Home" msgstr "Inicio" @@ -47,7 +48,7 @@ msgid "" msgstr "" "Para instalar bookmarklets, arrastre el enlace a su barra de favoritos, o " "pulse con el botón derecho el enlace y añádalo a sus favoritos. Ahora puede " -"escoger el bookmarklet desde cualquier página del sitio. " +"seleccionar el bookmarklet desde cualquier página del sitio. " msgid "Documentation for this page" msgstr "Documentación para esta página" @@ -56,7 +57,7 @@ msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" -"Lleva desde cualquier página a la documentación de la vista que la genera." +"Lo lleva desde cualquier página a la documentación de la vista que la genera." msgid "Tags" msgstr "Etiquetas" @@ -71,7 +72,7 @@ msgid "" "Filters are actions which can be applied to variables in a template to alter " "the output." msgstr "" -"Los filtros son accciones se pueden aplicar a variables en una plantilla " +"Los filtros son acciones que se pueden aplicar a variables en una plantilla " "para alterar el resultado." msgid "Models" @@ -83,7 +84,7 @@ msgid "" "template variables" msgstr "" "Los modelos son descripciones de todos los objetos en el sistema y sus " -"campos asociados. Cada modelo tienen una lista de campos a los que se puede " +"campos asociados. Cada modelo tienen una lista de campos a los que se puede " "acceder como variables de plantilla" msgid "Views" @@ -95,30 +96,30 @@ msgid "" "that template." msgstr "" "Cada página en el sitio público se genera a través de una vista. La vista " -"define qué plantilla se usa para generar la página y qué objetos están " +"define que plantilla se usa para generar la página y que objetos están " "disponibles para esa plantilla." msgid "Tools for your browser to quickly access admin functionality." msgstr "" -"Herramientas para tu navegador para acceder a funciones de administración " +"Herramientas para el navegador para acceder a funciones de administración " "rápidamente." msgid "Please install docutils" -msgstr "Por favor instale docutils" +msgstr "Por favor, instale docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"El sistema de documentación de la administración require la biblioteca docutils de Python." +"El sistema de documentación del administrador requiere la librería de Python " +"docutils." #, python-format msgid "" "Please ask your administrators to install docutils." msgstr "" -"Por favor pida al administrador que instale docutilsdocutils." #, python-format @@ -147,10 +148,10 @@ msgid "Arguments" msgstr "Argumentos" msgid "Back to Model documentation" -msgstr "Volver a la documentación del modelo" +msgstr "Volver a la documentación de modelos" msgid "Model documentation" -msgstr "Documentación del modelo" +msgstr "Documentación de modelos" msgid "Model groups" msgstr "Grupo de modelos" @@ -163,13 +164,13 @@ msgid "Template: %(name)s" msgstr "Plantilla: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "Plantilla: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "Plantilla: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Buscar ruta para ejemplo \"%(name)s\":" +msgid "Search path for template %(name)s:" +msgstr "Buscar ruta de la plantilla %(name)s:" msgid "(does not exist)" msgstr "(no existe)" @@ -222,10 +223,10 @@ msgid "Templates:" msgstr "Plantillas:" msgid "Back to View documentation" -msgstr "Volver a la documentación de la vista" +msgstr "Volver a la documentación de vistas" msgid "View documentation" -msgstr "Ver la documentación" +msgstr "Documentación de vistas" msgid "Jump to namespace" msgstr "Ir al espacio de nombres" @@ -247,7 +248,7 @@ msgid "" "code>.\n" msgstr "" "\n" -"Visualizar funcion: %(full_name)s. Nombre: %(url_name)s%(full_name)s. Nombre: %(url_name)s.\n" msgid "tag:" @@ -261,7 +262,7 @@ msgstr "vista:" #, python-format msgid "App %(app_label)r not found" -msgstr "App %(app_label)r no encontrado" +msgstr "Aplicación %(app_label)r no encontrada" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" diff --git a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo index 6e0bfc145ffc..1bae5242321f 100644 Binary files a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po index c6fc34f833ed..07e8021e480d 100644 --- a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # Translators: # Federico Bond , 2013 # Jannis Leidel , 2011 -# Ramiro Morales, 2012-2016,2019 +# Ramiro Morales, 2012-2016,2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-01 10:17+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-21 12:57+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -103,7 +103,7 @@ msgstr "Por favor instale docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "El sistema de documentación de admin requiere la biblioteca Python \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-03 06:13+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -102,10 +103,10 @@ msgstr "لطفاً docutils نصب کنید" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"سیستم مستندات ادمین نیازمند کتابخانه‌ی docutils " +"سیستم مستندات مدیر نیازمند کتابخانه‌ی docutils " "پایتون است." #, python-format @@ -157,12 +158,12 @@ msgid "Template: %(name)s" msgstr "قالب: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "قالب: «%(name)s»" +msgid "Template: %(name)s" +msgstr "قالب: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" +msgid "Search path for template %(name)s:" msgstr "مسیر جستجو برای قالب \"%(name)s\":" msgid "(does not exist)" diff --git a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo index 433e6f3b6d5e..8886f15d57f6 100644 Binary files a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po index d04b1020de9f..bec75c98d99a 100644 --- a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015,2017 +# Aarni Koskela, 2015,2017,2020-2021 # Elias Luttinen , 2015 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-14 12:19+0000\n" "Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" @@ -98,7 +98,7 @@ msgstr "Ole hyvä ja asenna docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Hallinnan dokumentaatio vaatii Pythonin docutils-" @@ -151,13 +151,13 @@ msgid "Template: %(name)s" msgstr "Malline: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "Malline: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "Malline: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Polun \"%(name)s\" hakupolku:" +msgid "Search path for template %(name)s:" +msgstr "Mallineen %(name)s hakupolku" msgid "(does not exist)" msgstr "(ei ole olemassa)" diff --git a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo index 7d2ed85b4922..8a47fb9f212f 100644 Binary files a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po index 9a8f2d06150b..81e057103804 100644 --- a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2013-2016,2018-2019 +# Claude Paroz , 2013-2016,2018-2019,2021 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 15:49+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 14:25+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "Veuillez installer docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Le système de documentation de l'interface d'administration nécessite la " diff --git a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo index 834b64cda447..1616f4cbb73c 100644 Binary files a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po index 98eef6301391..3052a37942af 100644 --- a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Jannis Leidel , 2011 -# Meir Kriheli , 2012-2015,2017 +# Meir Kriheli , 2012-2015,2017,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-08-02 13:22+0000\n" "Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" @@ -146,13 +146,13 @@ msgid "Template: %(name)s" msgstr "תבנית: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "תבנית: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "תבנית: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "נתיב חיפוש לתבנית \"%(name)s\":" +msgid "Search path for template %(name)s:" +msgstr "נתיב חיפוש לתבנית %(name)s:" msgid "(does not exist)" msgstr "(לא קיים)" diff --git a/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.mo index 140a24e006f0..734adc017690 100644 Binary files a/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.po index 3975e536fa16..d210e3860e73 100644 --- a/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/hsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016,2019 +# Michael Wolf , 2016,2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-21 19:23+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-01 21:47+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -103,7 +103,7 @@ msgstr "Prošu instalujće docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Administratorowy dokumentaciski system sej Pythonowu biblioteku \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-02 13:45+0000\n" +"Last-Translator: János R\n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -103,7 +104,7 @@ msgstr "Kérem telepítse a docutils-t" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Az adminisztrációs dokumentáció működéséhez szükség van a Python \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" @@ -106,11 +106,11 @@ msgstr "Installa docutils, per favore" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Il sistema di documentazione dell'admin richiede la libreria Python docutils" +"\"%(link)s\">docutils." #, python-format msgid "" diff --git a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo index eae329f6ed58..edac83ed3ed0 100644 Binary files a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po index b75ea46e8ca1..54d9c995ac96 100644 --- a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po @@ -4,13 +4,15 @@ # Fandekasp , 2012 # Jannis Leidel , 2011 # Shinya Okano , 2013-2016 +# Takuya N , 2020 +# Tsuboi Yuto , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-05-09 04:02+0000\n" +"Last-Translator: Tsuboi Yuto \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -99,11 +101,11 @@ msgstr "docutilsをインストールして下さい" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"管理ドキュメントシステムには、Pythonの docutils ライ" -"ブラリが必要です。" +"管理用ドキュメントシステムにはPythonのdocutilsライブ" +"ラリが必要です。" #, python-format msgid "" @@ -154,13 +156,13 @@ msgid "Template: %(name)s" msgstr "テンプレート: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "テンプレート: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "テンプレート: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "テンプレートの検索パス \"%(name)s\":" +msgid "Search path for template %(name)s:" +msgstr "テンプレートの検索パス %(name)s:" msgid "(does not exist)" msgstr "(存在しません)" diff --git a/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..de83cd3d98a7 Binary files /dev/null and b/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..ae974b63e344 --- /dev/null +++ b/django/contrib/admindocs/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,281 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020-2021 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-02 11:59+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Administrative Documentation" +msgstr "Башкармалык түшүндүрмөсү" + +msgid "Home" +msgstr "Башкы" + +msgid "Documentation" +msgstr "Түшүндүрмө" + +msgid "Bookmarklets" +msgstr "Букмарклеттер" + +msgid "Documentation bookmarklets" +msgstr "букмарклет түшүндүрмөсү" + +msgid "" +"To install bookmarklets, drag the link to your bookmarks toolbar, or right-" +"click the link and add it to your bookmarks. Now you can select the " +"bookmarklet from any page in the site." +msgstr "" +"Букмарклетти орнотуу үчүн шилтемени кыстырмалар панелине сүйрөңүз же " +"шилтемени оң чыкылдатып андан соң кыстырмаларыңызга кошуп алыңыз. Азыр " +"букмарклетти сайттын бүт бетинен тандап алсаңыз болот." + +msgid "Documentation for this page" +msgstr "Бул барактын түшүндүрмөсү" + +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Бул баракты жараткан көрүнүш үчүн сиз каалаган барактагы түшүндүрмөдөн " +"секирип өтүңүз." + +msgid "Tags" +msgstr "Тегдер" + +msgid "List of all the template tags and their functions." +msgstr "Бүт калып тегдердин жана алардын кызматынын тизмеси" + +msgid "Filters" +msgstr "Чыпкалар" + +msgid "" +"Filters are actions which can be applied to variables in a template to alter " +"the output." +msgstr "" +"Чыпкалар чыгуучу агымды өзгөртүү үчүн калыптагы өзгөрмөгө жасалуучу аракет " +"болуп саналат." + +msgid "Models" +msgstr "Моделдер" + +msgid "" +"Models are descriptions of all the objects in the system and their " +"associated fields. Each model has a list of fields which can be accessed as " +"template variables" +msgstr "" +"Моделдер системдеги бүт обекттер жана алардын талаалардын ачыкталышы. Ар бир " +"модел өзүнө талааларды камтыйт. Алар өз учурунда калыптуу өзгөрмөлөр катары " +"жетүүнү камсыз кылат." + +msgid "Views" +msgstr "Көрүнүштөр" + +msgid "" +"Each page on the public site is generated by a view. The view defines which " +"template is used to generate the page and which objects are available to " +"that template." +msgstr "" +"Ачык саттагы ар бир барак көрүнүш аркылуу чыгарылган. Көрүнүш баракты " +"чыгаруу үчүн кайсы калып колдонууларын жана кайсы обекттер жеткиликтүү " +"экендигин аныктайт." + +msgid "Tools for your browser to quickly access admin functionality." +msgstr "Браузер үчүн башкаруу кызматына тез жетүү үчүн куралдар." + +msgid "Please install docutils" +msgstr "түшүндүрмө утилитасын орнотуңуз." + +#, python-format +msgid "" +"The admin documentation system requires Python’s docutils library." +msgstr "" +"Башкармалыктын түшүндүрмө системи Питондун docutils " +"китепканасын талап кылат. " + +#, python-format +msgid "" +"Please ask your administrators to install docutils." +msgstr "" +"Башкаруучудан түшүндүрмө утилитасынорнотууну " +"сураңыз." + +#, python-format +msgid "Model: %(name)s" +msgstr "Модел: %(name)s" + +msgid "Fields" +msgstr "Талаалар" + +msgid "Field" +msgstr "Талаа" + +msgid "Type" +msgstr "Тип" + +msgid "Description" +msgstr "Ачыктоо" + +msgid "Methods with arguments" +msgstr "аргументүү ыкма" + +msgid "Method" +msgstr "Ыкма" + +msgid "Arguments" +msgstr "Аргумент" + +msgid "Back to Model documentation" +msgstr "Модел түшүндүрмөсүнө кайт" + +msgid "Model documentation" +msgstr "Модел түшүндүрмөсү" + +msgid "Model groups" +msgstr "Модел тайпасы" + +msgid "Templates" +msgstr "Калыптар" + +#, python-format +msgid "Template: %(name)s" +msgstr "Калып: %(name)s" + +#, python-format +msgid "Template: %(name)s" +msgstr "Калып: %(name)s" + +#. Translators: Search is not a verb here, it qualifies path (a search path) +#, python-format +msgid "Search path for template %(name)s:" +msgstr "%(name)sкалыбы үчүн жолду издөө:" + +msgid "(does not exist)" +msgstr "(табылган жок)" + +msgid "Back to Documentation" +msgstr "Түшүндүрмөгө кайт" + +msgid "Template filters" +msgstr "Калып чыпкалары" + +msgid "Template filter documentation" +msgstr "Калып чыпкалары түшүндүрмөсү" + +msgid "Built-in filters" +msgstr "Бар чыпкалар" + +#, python-format +msgid "" +"To use these filters, put %(code)s in your template before " +"using the filter." +msgstr "" +"Бул чыпкаларды колдонуудан мурда калыбыңызга %(code)sкоюңуз." + +msgid "Template tags" +msgstr "Калып тегдер" + +msgid "Template tag documentation" +msgstr "Калып тегдер түшүндүрмөсү" + +msgid "Built-in tags" +msgstr "Мурдатан бар тегдер" + +#, python-format +msgid "" +"To use these tags, put %(code)s in your template before using " +"the tag." +msgstr "" +"Тегдерди колдонуш үчүн: тегди колдонуудан мурда калыбыңызга%(code)sкоюңуз." + +#, python-format +msgid "View: %(name)s" +msgstr "Көрүнүш: %(name)s" + +msgid "Context:" +msgstr "Мазмун:" + +msgid "Templates:" +msgstr "Калыптар:" + +msgid "Back to View documentation" +msgstr "Көрүнүш түшүндүрмөсүнө кайт" + +msgid "View documentation" +msgstr "Көрүнүш түшүндүрмөсү" + +msgid "Jump to namespace" +msgstr "ысым мейкиндигине өтүү" + +msgid "Empty namespace" +msgstr "бош ысым мейкиндиги" + +#, python-format +msgid "Views by namespace %(name)s" +msgstr "%(name)sысым мейкиндиги боюнча көрүү" + +msgid "Views by empty namespace" +msgstr "бош ысым мейкиндиги боюнча көрүү" + +#, python-format +msgid "" +"\n" +" View function: %(full_name)s. Name: %(url_name)s.\n" +msgstr "" +"\n" +"Көрүнүш функциасы: %(full_name)s.Аты:%(url_name)s.\n" + +msgid "tag:" +msgstr "тег:" + +msgid "filter:" +msgstr "чыпка:" + +msgid "view:" +msgstr "көрүнүш:" + +#, python-format +msgid "App %(app_label)r not found" +msgstr "%(app_label)r колдонмосу табылган жок" + +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "%(app_label)r колдонмосунда %(model_name)r модели табылбады" + +msgid "model:" +msgstr "модел:" + +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "байланышкан `%(app_label)s.%(data_type)s` обектиси" + +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "байланышкан `%(app_label)s.%(object_name)s` обекттери" + +#, python-format +msgid "all %s" +msgstr "Бүт %s" + +#, python-format +msgid "number of %s" +msgstr "%s саны" + +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s урлкалып обектисине тиешеси жок" diff --git a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo index 04ff556ef4d4..d2ef159eb4ff 100644 Binary files a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po index 71132acb8f64..b153b4dde0e5 100644 --- a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po @@ -4,13 +4,13 @@ # NullIsNot0 , 2017 # Jannis Leidel , 2011 # Māris Nartišs , 2016 -# NullIsNot0 , 2019 +# NullIsNot0 , 2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-07 07:29+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-25 22:44+0000\n" "Last-Translator: NullIsNot0 \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -103,11 +103,11 @@ msgstr "Lūdzu instalējiet 'docutils'" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Administratora dokumentācijas sistēmai ir nepieciešama Python docutils bibliotēka." +"\"%(link)s\">docutils bibliotēka." #, python-format msgid "" diff --git a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo index b9f9b0775e4b..e6595dc018ba 100644 Binary files a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po index 0fff93cd5c2c..b7959c63cdfa 100644 --- a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po @@ -2,18 +2,18 @@ # # Translators: # Jannis Leidel , 2011 -# Jon , 2015-2016 -# Jon , 2014 -# Jon , 2020 -# Jon , 2013 -# Jon , 2012 +# Jon, 2015-2016 +# Jon, 2014 +# Jon, 2020-2021 +# Jon, 2013 +# Jon, 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-21 12:15+0000\n" -"Last-Translator: Jon \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-18 14:16+0000\n" +"Last-Translator: Jon\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -103,11 +103,11 @@ msgstr "Vennligst installer docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Admin-dokumentasjonssystemet krever Pythons docutils-bibliotek." +"Admin-verktøyets dokumentasjonssystem behøver Pythons docutils-bibliotek ." #, python-format msgid "" diff --git a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo index 1d3dbf4a9828..69081819fab5 100644 Binary files a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po index 0c9d7ed278a7..9a76f27e73aa 100644 --- a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po @@ -7,16 +7,17 @@ # Janusz Harkot , 2015 # m_aciek , 2016,2019 # m_aciek , 2014 -# p , 2014 +# Mariusz Felisiak , 2021 +# c10516f0462e552b4c3672569f0745a7_cc5cca2 <841826256cd8f47d0e443806a8e56601_19204>, 2014 # Mattia Procopio , 2014 # Tomasz Kajtoch , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-11 14:09+0000\n" -"Last-Translator: m_aciek \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-04-01 09:45+0000\n" +"Last-Translator: Mariusz Felisiak \n" "Language-Team: Polish (http://www.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,7 +111,7 @@ msgstr "Zainstaluj docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "System dokumentacji admina wymaga Pythonowej biblioteki , 2011 # Lucas Infante , 2015 +# Rafael Fontenelle , 2021 # Vinícius Muniz de Melo , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-12-19 17:59+0000\n" -"Last-Translator: Vinícius Muniz de Melo \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-17 05:53+0000\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -109,7 +110,7 @@ msgstr "Por favor, instale o docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "O sistema de documentação de administração exige a biblioteca \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -160,12 +161,12 @@ msgstr "Șablonul: %(name)s" #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Template: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format msgid "Search path for template %(name)s:" -msgstr "" +msgstr "Calea de căutare pentru template %(name)s:" msgid "(does not exist)" msgstr "(inexistent)" diff --git a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo index b338b84323a0..21931a6dbf03 100644 Binary files a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po index 1cd7475cea83..0f7e30f5ff8a 100644 --- a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po @@ -1,17 +1,19 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Eugene MechanisM , 2012 +# Eugene , 2012 # Jannis Leidel , 2011 +# Panasoft, 2021 +# SeryiMysh , 2020 # Алексей Борискин , 2012-2015 # Андрей Щуров , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-03-16 22:51+0000\n" +"Last-Translator: Panasoft\n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -107,11 +109,11 @@ msgstr "Пожалуйста, установите docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Встроенной в административное приложение системе документации необходима для " -"работы Python-библиотека docutils." +"Для системы административной документации требуется библиотека Python docutils." #, python-format msgid "" @@ -162,13 +164,13 @@ msgid "Template: %(name)s" msgstr "Шаблон: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "Шаблон: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "Шаблон: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Пути, по которым будет произведён поиск шаблона \"%(name)s\":" +msgid "Search path for template %(name)s:" +msgstr "Путь к местонахождению шаблона %(name)s:" msgid "(does not exist)" msgstr "(не существует)" diff --git a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo index 20db987f0574..1ff898e98c37 100644 Binary files a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po index dc4a066b333c..54a523309242 100644 --- a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Besnik , 2011,2015 -# Besnik , 2015,2019 +# Besnik Bleta , 2011,2015 +# Besnik Bleta , 2021 +# Besnik Bleta , 2015,2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 12:29+0000\n" -"Last-Translator: Besnik \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-15 13:31+0000\n" +"Last-Translator: Besnik Bleta \n" "Language-Team: Albanian (http://www.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -99,10 +100,10 @@ msgstr "Ju lutemi, instaloni docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Sistemi i dokumentimit të administrimeve lyp librarinë Python docutils." #, python-format diff --git a/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..f906516fee4f Binary files /dev/null and b/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..58fdd30746b8 --- /dev/null +++ b/django/contrib/admindocs/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,281 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-15 00:08+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Administrative Documentation" +msgstr "Хуччатгузории рохбарият" + +msgid "Home" +msgstr "Асосӣ" + +msgid "Documentation" +msgstr "Хуҷҷатгузорӣ" + +msgid "Bookmarklets" +msgstr "Гузориш" + +msgid "Documentation bookmarklets" +msgstr "Хуҷҷатгузорӣ" + +msgid "" +"To install bookmarklets, drag the link to your bookmarks toolbar, or right-" +"click the link and add it to your bookmarks. Now you can select the " +"bookmarklet from any page in the site." +msgstr "" +"Барои ба панели гузоришот ворид сохтани сурогаи сомонаи мазкур ба равзанаи " +"гузоришот ,бо пахши тугмаи чапи муш сурогаро дохил кунед.Акнун шумо аз " +"тамоми саҳифаҳои сомона ба ин суроға дастрасӣ пайдо кардед." + +msgid "Documentation for this page" +msgstr "Хуҷҷатгузорӣ барои саҳифаи мазкур" + +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Аз тамоми саҳифаҳо бв ҳуҷҷатгузории view, ки ин саҳифаро табдил медиҳад, " +"раҳнамоӣ месозад" + +msgid "Tags" +msgstr "Тегҳо" + +msgid "List of all the template tags and their functions." +msgstr "Руйхати хама template -ҳо ва функқияи онхо" + +msgid "Filters" +msgstr "Поло-ҳо (Filters)" + +msgid "" +"Filters are actions which can be applied to variables in a template to alter " +"the output." +msgstr "" +"Полоҳо(Filters) - ин амалиётест ,ки барои тағйирдиҳии инъикоси шаблонҳо иҷро " +"мешавад" + +msgid "Models" +msgstr "Моделҳо" + +msgid "" +"Models are descriptions of all the objects in the system and their " +"associated fields. Each model has a list of fields which can be accessed as " +"template variables" +msgstr "" +"Моделҳо - ин рӯйхати ҳамаи объектҳо ва майдонҳои ба онҳо алоқандӣ дар " +"система мавҷудбуда аст.Ҳар як модел руйхати майдонҳои худро дорад, ки дар " +"шаблонҳо ба сифати тағйирёбанда истифода бурда мешаванд." + +msgid "Views" +msgstr "View" + +msgid "" +"Each page on the public site is generated by a view. The view defines which " +"template is used to generate the page and which objects are available to " +"that template." +msgstr "" +"Ҳар як саҳифаи сомона тавассути view сохта мешавад. View муайян месозад, ки " +"кадом шаблон барои сохтанисаҳифа истифода мешавад ва кадом кадом объектҳо " +"дар он дастрасанд." + +msgid "Tools for your browser to quickly access admin functionality." +msgstr "" +"Асбобҳо барои браузери шумо, барои дастрасии зуд ба қисми маъмурияти " +"сомона(Гузоришот)" + +msgid "Please install docutils" +msgstr "Хоҳиш менамоем, docutil-ро танзим(install) кунед" + +#, python-format +msgid "" +"The admin documentation system requires Python's docutils library." +msgstr "" +"Барои фаъолияти маъмурияти системаи ҳуҷҷатгузорӣ, бояд пакетҳои docutils -b Pythonтанзим карда шуда бошанд." + +#, python-format +msgid "" +"Please ask your administrators to install docutils." +msgstr "" +"Хоҳишмандем аз маъмурият дархости танзими docutils -" +"ро кунед." + +#, python-format +msgid "Model: %(name)s" +msgstr "Модел: %(name)s" + +msgid "Fields" +msgstr "Майдонҳо" + +msgid "Field" +msgstr "Майдон" + +msgid "Type" +msgstr "Намуд" + +msgid "Description" +msgstr "Тавсиф" + +msgid "Methods with arguments" +msgstr "Усулҳо бо санадҳо" + +msgid "Method" +msgstr "Усул" + +msgid "Arguments" +msgstr "Санадҳо" + +msgid "Back to Model documentation" +msgstr "Ба қафо, ба қисми ҳуҷҷатгузории моделҳо" + +msgid "Model documentation" +msgstr "Ҳуҷҷатгузории моделҳо" + +msgid "Model groups" +msgstr "Гурӯҳы моделҳо" + +msgid "Templates" +msgstr "Нусхаҳо" + +#, python-format +msgid "Template: %(name)s" +msgstr "Нусхаи: %(name)s" + +#, python-format +msgid "Template: %(name)s" +msgstr "" + +#. Translators: Search is not a verb here, it qualifies path (a search path) +#, python-format +msgid "Search path for template %(name)s:" +msgstr "" + +msgid "(does not exist)" +msgstr "(вуҷуд надорад)" + +msgid "Back to Documentation" +msgstr "Ба қафо, ба қисми ҳуҷҷатгузорӣ" + +msgid "Template filters" +msgstr "Полоҳо(Filters)-и нусхаҳо" + +msgid "Template filter documentation" +msgstr "Нусхаи ҳуҷҷатгузории полоҳо" + +msgid "Built-in filters" +msgstr "Бо полоҳо(filters) сохташуда." + +#, python-format +msgid "" +"To use these filters, put %(code)s in your template before " +"using the filter." +msgstr "" +"Барои истифодаи ин поло(filter), %(code)s - ро дар нусхаи худ " +"бо истифода аз полоҳо (Filters) ҷой диҳед." + +msgid "Template tags" +msgstr "Теги шаблонов" + +msgid "Template tag documentation" +msgstr "Ҳуҷатгузории нусхаи тегҳо" + +msgid "Built-in tags" +msgstr "Тегҳои сохташуда" + +#, python-format +msgid "" +"To use these tags, put %(code)s in your template before using " +"the tag." +msgstr "" + +#, python-format +msgid "View: %(name)s" +msgstr "View: %(name)s" + +msgid "Context:" +msgstr "Контекст:" + +msgid "Templates:" +msgstr "Нусхаҳо:" + +msgid "Back to View documentation" +msgstr "Ба қафо ба қисми намоиш(View)" + +msgid "View documentation" +msgstr "Ҳуҷҷатгузории view" + +msgid "Jump to namespace" +msgstr "Гузариш ба майдони номҳо" + +msgid "Empty namespace" +msgstr "Майдони номҳои фарох" + +#, python-format +msgid "Views by namespace %(name)s" +msgstr "View дар майдони номҳо %(name)s" + +msgid "Views by empty namespace" +msgstr "View дар майдони номҳои фарох" + +#, python-format +msgid "" +"\n" +" View function: %(full_name)s. Name: %(url_name)s.\n" +msgstr "" +"\n" +"View-функсия: %(full_name)s. Номи url-нусхаҳо: " +"%(url_name)s.\n" + +msgid "tag:" +msgstr "тег:" + +msgid "filter:" +msgstr "Поло(filter):" + +msgid "view:" +msgstr "view:" + +#, python-format +msgid "App %(app_label)r not found" +msgstr "Барномаи «%(app_label)r» ёфт нашуд" + +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "Модели %(model_name)r дар барномаи %(app_label)r ёфт нашуд" + +msgid "model:" +msgstr "модел:" + +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "Объектҳои вобаста `%(app_label)s.%(data_type)s` " + +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "Объектҳои алоқаманд `%(app_label)s.%(object_name)s`" + +#, python-format +msgid "all %s" +msgstr "ҳамаи %s" + +#, python-format +msgid "number of %s" +msgstr "миқдори %s" + +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s ба объекти urlpattern монанд нест." diff --git a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo index 11e985da1667..f8752e1ec5c8 100644 Binary files a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po index 5a39e03546de..dcb2f9b1987d 100644 --- a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2016,2019 +# BouRock, 2015-2016,2019,2021 # BouRock, 2014 # Jannis Leidel , 2011 -# Murat Çorlu , 2012 +# Murat Çorlu , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 08:21+0000\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-16 19:32+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -104,7 +104,7 @@ msgstr "Lütfen docutils’i yükleyin" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" "Yönetici belge sistemi, Python’un docutils " diff --git a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo index 0d14a14ca8e3..76e5f11bd428 100644 Binary files a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po index fffdae633946..dc91383fd7c2 100644 --- a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po @@ -3,7 +3,8 @@ # Translators: # Oleksandr Chernihov , 2014 # Andriy Sokolovskiy , 2015 -# Денис Подлесный , 2016 +# Denis Podlesniy , 2016 +# Illia Volochii , 2021 # Jannis Leidel , 2011 # Kirill Gagarski , 2016 # Max V. Stotsky , 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-01-20 00:21+0000\n" +"Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -110,10 +111,10 @@ msgstr "Будь ласка, встановіть docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." msgstr "" -"Система адміністраторською документації вимагає Python бібліотеку docutils." #, python-format @@ -165,13 +166,13 @@ msgid "Template: %(name)s" msgstr "Шаблон: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "Шаблон: «%(name)s»" +msgid "Template: %(name)s" +msgstr "Шаблон: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "Шляхи для пошуку шаблону «%(name)s»:" +msgid "Search path for template %(name)s:" +msgstr "Шлях для пошуку шаблону %(name)s:" msgid "(does not exist)" msgstr "(не існує)" diff --git a/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.mo index 53a8000621e0..497df3e5ef6c 100644 Binary files a/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.po index b9bc608c8c42..5241457d533a 100644 --- a/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/zh_Hans/LC_MESSAGES/django.po @@ -5,15 +5,17 @@ # Lele Long , 2015 # Liping Wang , 2016 # mozillazg , 2016 -# Ronald White , 2014 +# Ronald White , 2014 +# Veoco , 2021 +# wolf ice , 2020 # Kevin Sze , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2021-02-07 04:24+0000\n" +"Last-Translator: Veoco \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -97,9 +99,9 @@ msgstr "请安装 docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." -msgstr "该管理文档系统需要Python的 docutils 库。" +msgstr "该管理文档系统需要 Python 的 docutils 库。" #, python-format msgid "" @@ -148,13 +150,13 @@ msgid "Template: %(name)s" msgstr "模板: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "模板: \"%(name)s\"" +msgid "Template: %(name)s" +msgstr "模板：%(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "模版 “%(name)s“的查找路径：" +msgid "Search path for template %(name)s:" +msgstr "模板%(name)s的查找路径：" msgid "(does not exist)" msgstr "(不存在)" diff --git a/django/contrib/admindocs/middleware.py b/django/contrib/admindocs/middleware.py index 77d77af715fe..4779db8366a4 100644 --- a/django/contrib/admindocs/middleware.py +++ b/django/contrib/admindocs/middleware.py @@ -24,5 +24,5 @@ def process_view(self, request, view_func, view_args, view_kwargs): if request.method == 'HEAD' and (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (request.user.is_active and request.user.is_staff)): response = HttpResponse() - response['X-View'] = get_view_name(view_func) + response.headers['X-View'] = get_view_name(view_func) return response diff --git a/django/contrib/admindocs/templates/admin_doc/missing_docutils.html b/django/contrib/admindocs/templates/admin_doc/missing_docutils.html index 984aea6278d6..0f1b63e1df6d 100644 --- a/django/contrib/admindocs/templates/admin_doc/missing_docutils.html +++ b/django/contrib/admindocs/templates/admin_doc/missing_docutils.html @@ -14,9 +14,9 @@

    {% translate 'Documentation' %}

    -

    {% blocktranslate with "http://docutils.sf.net/" as link %}The admin documentation system requires Python's docutils library.{% endblocktranslate %}

    +

    {% blocktranslate with "https://docutils.sourceforge.io/" as link %}The admin documentation system requires Python’s docutils library.{% endblocktranslate %}

    -

    {% blocktranslate with "http://docutils.sf.net/" as link %}Please ask your administrators to install docutils.{% endblocktranslate %}

    +

    {% blocktranslate with "https://docutils.sourceforge.io/" as link %}Please ask your administrators to install docutils.{% endblocktranslate %}

    {% endblock %} diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index bd566cde4043..60b357e92715 100644 --- a/django/contrib/admindocs/views.py +++ b/django/contrib/admindocs/views.py @@ -16,6 +16,7 @@ from django.http import Http404 from django.template.engine import Engine from django.urls import get_mod_func, get_resolver, get_urlconf +from django.utils._os import safe_join from django.utils.decorators import method_decorator from django.utils.inspect import ( func_accepts_kwargs, func_accepts_var_args, get_func_full_args, @@ -329,7 +330,7 @@ def get_context_data(self, **kwargs): else: # This doesn't account for template loaders (#24128). for index, directory in enumerate(default_engine.dirs): - template_file = Path(directory) / template + template_file = Path(safe_join(directory, template)) if template_file.exists(): template_contents = template_file.read_text() else: diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index de2aa785e621..cad8eff1492a 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -7,6 +7,7 @@ from django.middleware.csrf import rotate_token from django.utils.crypto import constant_time_compare from django.utils.module_loading import import_string +from django.views.decorators.debug import sensitive_variables from .signals import user_logged_in, user_logged_out, user_login_failed @@ -37,6 +38,7 @@ def get_backends(): return _get_backends(return_tuples=False) +@sensitive_variables('credentials') def _clean_credentials(credentials): """ Clean a dictionary of credentials of potentially sensitive info before @@ -58,6 +60,7 @@ def _get_user_session_key(request): return get_user_model()._meta.pk.to_python(request.session[SESSION_KEY]) +@sensitive_variables('credentials') def authenticate(request=None, **credentials): """ If the given credentials are valid, return a User object. @@ -217,6 +220,3 @@ def update_session_auth_hash(request, user): request.session.cycle_key() if hasattr(user, 'get_session_auth_hash') and request.user == user: request.session[HASH_SESSION_KEY] = user.get_session_auth_hash() - - -default_app_config = 'django.contrib.auth.apps.AuthConfig' diff --git a/django/contrib/auth/apps.py b/django/contrib/auth/apps.py index b9d271bb1f0f..4e4ef06d271e 100644 --- a/django/contrib/auth/apps.py +++ b/django/contrib/auth/apps.py @@ -11,6 +11,7 @@ class AuthConfig(AppConfig): + default_auto_field = 'django.db.models.AutoField' name = 'django.contrib.auth' verbose_name = _("Authentication and Authorization") diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py index bb51cfbcc9a9..3a4a64ee19c8 100644 --- a/django/contrib/auth/base_user.py +++ b/django/contrib/auth/base_user.py @@ -4,6 +4,7 @@ """ import unicodedata +from django.conf import settings from django.contrib.auth import password_validation from django.contrib.auth.hashers import ( check_password, is_password_usable, make_password, @@ -130,7 +131,14 @@ def get_session_auth_hash(self): Return an HMAC of the password field. """ key_salt = "django.contrib.auth.models.AbstractBaseUser.get_session_auth_hash" - return salted_hmac(key_salt, self.password, algorithm='sha256').hexdigest() + return salted_hmac( + key_salt, + self.password, + # RemovedInDjango40Warning: when the deprecation ends, replace + # with: + # algorithm='sha256', + algorithm=settings.DEFAULT_HASHING_ALGORITHM, + ).hexdigest() @classmethod def get_email_field_name(cls): diff --git a/django/contrib/auth/checks.py b/django/contrib/auth/checks.py index 65fc266f7e0b..c08ed8a49a7b 100644 --- a/django/contrib/auth/checks.py +++ b/django/contrib/auth/checks.py @@ -52,7 +52,10 @@ def check_user_model(app_configs=None, **kwargs): ) # Check that the username field is unique - if not cls._meta.get_field(cls.USERNAME_FIELD).unique: + if not cls._meta.get_field(cls.USERNAME_FIELD).unique and not any( + constraint.fields == (cls.USERNAME_FIELD,) + for constraint in cls._meta.total_unique_constraints + ): if (settings.AUTHENTICATION_BACKENDS == ['django.contrib.auth.backends.ModelBackend']): errors.append( diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 4f33992028a6..fb7cfda2098d 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -56,20 +56,21 @@ class ReadOnlyPasswordHashField(forms.Field): def __init__(self, *args, **kwargs): kwargs.setdefault("required", False) + kwargs.setdefault('disabled', True) super().__init__(*args, **kwargs) - def bound_data(self, data, initial): - # Always return initial because the widget doesn't - # render an input field. - return initial - - def has_changed(self, initial, data): - return False - class UsernameField(forms.CharField): def to_python(self, value): - return unicodedata.normalize('NFKC', super().to_python(value)) + value = super().to_python(value) + if self.max_length is not None and len(value) > self.max_length: + # Normalization can increase the string length (e.g. + # "ff" -> "ff", "½" -> "1⁄2") but cannot reduce it, so there is no + # point in normalizing invalid data. Moreover, Unicode + # normalization is very slow on Windows and can be a DoS attack + # vector. + return value + return unicodedata.normalize("NFKC", value) def widget_attrs(self, widget): return { @@ -163,12 +164,6 @@ def __init__(self, *args, **kwargs): if user_permissions: user_permissions.queryset = user_permissions.queryset.select_related('content_type') - def clean_password(self): - # Regardless of what the user provides, return the initial value. - # This is done here, rather than on the field, because the - # field does not have access to the initial value - return self.initial.get('password') - class AuthenticationForm(forms.Form): """ @@ -428,12 +423,11 @@ def __init__(self, user, *args, **kwargs): def clean_password2(self): password1 = self.cleaned_data.get('password1') password2 = self.cleaned_data.get('password2') - if password1 and password2: - if password1 != password2: - raise ValidationError( - self.error_messages['password_mismatch'], - code='password_mismatch', - ) + if password1 and password2 and password1 != password2: + raise ValidationError( + self.error_messages['password_mismatch'], + code='password_mismatch', + ) password_validation.validate_password(password2, self.user) return password2 diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index 66fb94e7af01..86ae7f42a8b1 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -3,6 +3,7 @@ import functools import hashlib import importlib +import math import warnings from django.conf import settings @@ -10,7 +11,7 @@ from django.core.signals import setting_changed from django.dispatch import receiver from django.utils.crypto import ( - constant_time_compare, get_random_string, pbkdf2, + RANDOM_STRING_CHARS, constant_time_compare, get_random_string, pbkdf2, ) from django.utils.module_loading import import_string from django.utils.translation import gettext_noop as _ @@ -161,6 +162,11 @@ def mask_hash(hash, show=6, char="*"): return masked +def must_update_salt(salt, expected_entropy): + # Each character in the salt provides log_2(len(alphabet)) bits of entropy. + return len(salt) * math.log2(len(RANDOM_STRING_CHARS)) < expected_entropy + + class BasePasswordHasher: """ Abstract base class for password hashers @@ -172,6 +178,7 @@ class BasePasswordHasher: """ algorithm = None library = None + salt_entropy = 128 def _load_library(self): if self.library is not None: @@ -189,9 +196,14 @@ def _load_library(self): self.__class__.__name__) def salt(self): - """Generate a cryptographically secure nonce salt in ASCII.""" - # 12 returns a 71-bit value, log_2((26+26+10)^12) =~ 71 bits - return get_random_string(12) + """ + Generate a cryptographically secure nonce salt in ASCII with an entropy + of at least `salt_entropy` bits. + """ + # Each character in the salt provides + # log_2(len(alphabet)) bits of entropy. + char_count = math.ceil(self.salt_entropy / math.log2(len(RANDOM_STRING_CHARS))) + return get_random_string(char_count, allowed_chars=RANDOM_STRING_CHARS) def verify(self, password, encoded): """Check if the given password is correct.""" @@ -206,6 +218,18 @@ def encode(self, password, salt): """ raise NotImplementedError('subclasses of BasePasswordHasher must provide an encode() method') + def decode(self, encoded): + """ + Return a decoded database value. + + The result is a dictionary and should contain `algorithm`, `hash`, and + `salt`. Extra keys can be algorithm specific like `iterations` or + `work_factor`. + """ + raise NotImplementedError( + 'subclasses of BasePasswordHasher must provide a decode() method.' + ) + def safe_summary(self, encoded): """ Return a summary of safe values. @@ -241,7 +265,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher): safely but you must rename the algorithm if you change SHA256. """ algorithm = "pbkdf2_sha256" - iterations = 216000 + iterations = 260000 digest = hashlib.sha256 def encode(self, password, salt, iterations=None): @@ -252,31 +276,40 @@ def encode(self, password, salt, iterations=None): hash = base64.b64encode(hash).decode('ascii').strip() return "%s$%d$%s$%s" % (self.algorithm, iterations, salt, hash) - def verify(self, password, encoded): + def decode(self, encoded): algorithm, iterations, salt, hash = encoded.split('$', 3) assert algorithm == self.algorithm - encoded_2 = self.encode(password, salt, int(iterations)) + return { + 'algorithm': algorithm, + 'hash': hash, + 'iterations': int(iterations), + 'salt': salt, + } + + def verify(self, password, encoded): + decoded = self.decode(encoded) + encoded_2 = self.encode(password, decoded['salt'], decoded['iterations']) return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): - algorithm, iterations, salt, hash = encoded.split('$', 3) - assert algorithm == self.algorithm + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('iterations'): iterations, - _('salt'): mask_hash(salt), - _('hash'): mask_hash(hash), + _('algorithm'): decoded['algorithm'], + _('iterations'): decoded['iterations'], + _('salt'): mask_hash(decoded['salt']), + _('hash'): mask_hash(decoded['hash']), } def must_update(self, encoded): - algorithm, iterations, salt, hash = encoded.split('$', 3) - return int(iterations) != self.iterations + decoded = self.decode(encoded) + update_salt = must_update_salt(decoded['salt'], self.salt_entropy) + return (decoded['iterations'] != self.iterations) or update_salt def harden_runtime(self, password, encoded): - algorithm, iterations, salt, hash = encoded.split('$', 3) - extra_iterations = self.iterations - int(iterations) + decoded = self.decode(encoded) + extra_iterations = self.iterations - decoded['iterations'] if extra_iterations > 0: - self.encode(password, salt, extra_iterations) + self.encode(password, decoded['salt'], extra_iterations) class PBKDF2SHA1PasswordHasher(PBKDF2PasswordHasher): @@ -302,92 +335,92 @@ class Argon2PasswordHasher(BasePasswordHasher): library = 'argon2' time_cost = 2 - memory_cost = 512 - parallelism = 2 + memory_cost = 102400 + parallelism = 8 def encode(self, password, salt): argon2 = self._load_library() + params = self.params() data = argon2.low_level.hash_secret( password.encode(), salt.encode(), - time_cost=self.time_cost, - memory_cost=self.memory_cost, - parallelism=self.parallelism, - hash_len=argon2.DEFAULT_HASH_LENGTH, - type=argon2.low_level.Type.I, + time_cost=params.time_cost, + memory_cost=params.memory_cost, + parallelism=params.parallelism, + hash_len=params.hash_len, + type=params.type, ) return self.algorithm + data.decode('ascii') + def decode(self, encoded): + argon2 = self._load_library() + algorithm, rest = encoded.split('$', 1) + assert algorithm == self.algorithm + params = argon2.extract_parameters('$' + rest) + variety, *_, b64salt, hash = rest.split('$') + # Add padding. + b64salt += '=' * (-len(b64salt) % 4) + salt = base64.b64decode(b64salt).decode('latin1') + return { + 'algorithm': algorithm, + 'hash': hash, + 'memory_cost': params.memory_cost, + 'parallelism': params.parallelism, + 'salt': salt, + 'time_cost': params.time_cost, + 'variety': variety, + 'version': params.version, + 'params': params, + } + def verify(self, password, encoded): argon2 = self._load_library() algorithm, rest = encoded.split('$', 1) assert algorithm == self.algorithm try: - return argon2.low_level.verify_secret( - ('$' + rest).encode('ascii'), - password.encode(), - type=argon2.low_level.Type.I, - ) + return argon2.PasswordHasher().verify('$' + rest, password) except argon2.exceptions.VerificationError: return False def safe_summary(self, encoded): - (algorithm, variety, version, time_cost, memory_cost, parallelism, - salt, data) = self._decode(encoded) - assert algorithm == self.algorithm + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('variety'): variety, - _('version'): version, - _('memory cost'): memory_cost, - _('time cost'): time_cost, - _('parallelism'): parallelism, - _('salt'): mask_hash(salt), - _('hash'): mask_hash(data), + _('algorithm'): decoded['algorithm'], + _('variety'): decoded['variety'], + _('version'): decoded['version'], + _('memory cost'): decoded['memory_cost'], + _('time cost'): decoded['time_cost'], + _('parallelism'): decoded['parallelism'], + _('salt'): mask_hash(decoded['salt']), + _('hash'): mask_hash(decoded['hash']), } def must_update(self, encoded): - (algorithm, variety, version, time_cost, memory_cost, parallelism, - salt, data) = self._decode(encoded) - assert algorithm == self.algorithm - argon2 = self._load_library() - return ( - argon2.low_level.ARGON2_VERSION != version or - self.time_cost != time_cost or - self.memory_cost != memory_cost or - self.parallelism != parallelism - ) + decoded = self.decode(encoded) + current_params = decoded['params'] + new_params = self.params() + # Set salt_len to the salt_len of the current parameters because salt + # is explicitly passed to argon2. + new_params.salt_len = current_params.salt_len + update_salt = must_update_salt(decoded['salt'], self.salt_entropy) + return (current_params != new_params) or update_salt def harden_runtime(self, password, encoded): # The runtime for Argon2 is too complicated to implement a sensible # hardening algorithm. pass - def _decode(self, encoded): - """ - Split an encoded hash and return: ( - algorithm, variety, version, time_cost, memory_cost, - parallelism, salt, data, - ). - """ - bits = encoded.split('$') - if len(bits) == 5: - # Argon2 < 1.3 - algorithm, variety, raw_params, salt, data = bits - version = 0x10 - else: - assert len(bits) == 6 - algorithm, variety, raw_version, raw_params, salt, data = bits - assert raw_version.startswith('v=') - version = int(raw_version[len('v='):]) - params = dict(bit.split('=', 1) for bit in raw_params.split(',')) - assert len(params) == 3 and all(x in params for x in ('t', 'm', 'p')) - time_cost = int(params['t']) - memory_cost = int(params['m']) - parallelism = int(params['p']) - return ( - algorithm, variety, version, time_cost, memory_cost, parallelism, - salt, data, + def params(self): + argon2 = self._load_library() + # salt_len is a noop, because we provide our own salt. + return argon2.Parameters( + type=argon2.low_level.Type.ID, + version=argon2.low_level.ARGON2_VERSION, + salt_len=argon2.DEFAULT_RANDOM_SALT_LENGTH, + hash_len=argon2.DEFAULT_HASH_LENGTH, + time_cost=self.time_cost, + memory_cost=self.memory_cost, + parallelism=self.parallelism, ) @@ -421,6 +454,17 @@ def encode(self, password, salt): data = bcrypt.hashpw(password, salt) return "%s$%s" % (self.algorithm, data.decode('ascii')) + def decode(self, encoded): + algorithm, empty, algostr, work_factor, data = encoded.split('$', 4) + assert algorithm == self.algorithm + return { + 'algorithm': algorithm, + 'algostr': algostr, + 'checksum': data[22:], + 'salt': data[:22], + 'work_factor': int(work_factor), + } + def verify(self, password, encoded): algorithm, data = encoded.split('$', 1) assert algorithm == self.algorithm @@ -428,19 +472,17 @@ def verify(self, password, encoded): return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): - algorithm, empty, algostr, work_factor, data = encoded.split('$', 4) - assert algorithm == self.algorithm - salt, checksum = data[:22], data[22:] + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('work factor'): work_factor, - _('salt'): mask_hash(salt), - _('checksum'): mask_hash(checksum), + _('algorithm'): decoded['algorithm'], + _('work factor'): decoded['work_factor'], + _('salt'): mask_hash(decoded['salt']), + _('checksum'): mask_hash(decoded['checksum']), } def must_update(self, encoded): - algorithm, empty, algostr, rounds, data = encoded.split('$', 4) - return int(rounds) != self.rounds + decoded = self.decode(encoded) + return decoded['work_factor'] != self.rounds def harden_runtime(self, password, encoded): _, data = encoded.split('$', 1) @@ -482,21 +524,32 @@ def encode(self, password, salt): hash = hashlib.sha1((salt + password).encode()).hexdigest() return "%s$%s$%s" % (self.algorithm, salt, hash) - def verify(self, password, encoded): + def decode(self, encoded): algorithm, salt, hash = encoded.split('$', 2) assert algorithm == self.algorithm - encoded_2 = self.encode(password, salt) + return { + 'algorithm': algorithm, + 'hash': hash, + 'salt': salt, + } + + def verify(self, password, encoded): + decoded = self.decode(encoded) + encoded_2 = self.encode(password, decoded['salt']) return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): - algorithm, salt, hash = encoded.split('$', 2) - assert algorithm == self.algorithm + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('salt'): mask_hash(salt, show=2), - _('hash'): mask_hash(hash), + _('algorithm'): decoded['algorithm'], + _('salt'): mask_hash(decoded['salt'], show=2), + _('hash'): mask_hash(decoded['hash']), } + def must_update(self, encoded): + decoded = self.decode(encoded) + return must_update_salt(decoded['salt'], self.salt_entropy) + def harden_runtime(self, password, encoded): pass @@ -513,21 +566,32 @@ def encode(self, password, salt): hash = hashlib.md5((salt + password).encode()).hexdigest() return "%s$%s$%s" % (self.algorithm, salt, hash) - def verify(self, password, encoded): + def decode(self, encoded): algorithm, salt, hash = encoded.split('$', 2) assert algorithm == self.algorithm - encoded_2 = self.encode(password, salt) + return { + 'algorithm': algorithm, + 'hash': hash, + 'salt': salt, + } + + def verify(self, password, encoded): + decoded = self.decode(encoded) + encoded_2 = self.encode(password, decoded['salt']) return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): - algorithm, salt, hash = encoded.split('$', 2) - assert algorithm == self.algorithm + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('salt'): mask_hash(salt, show=2), - _('hash'): mask_hash(hash), + _('algorithm'): decoded['algorithm'], + _('salt'): mask_hash(decoded['salt'], show=2), + _('hash'): mask_hash(decoded['hash']), } + def must_update(self, encoded): + decoded = self.decode(encoded) + return must_update_salt(decoded['salt'], self.salt_entropy) + def harden_runtime(self, password, encoded): pass @@ -551,16 +615,23 @@ def encode(self, password, salt): hash = hashlib.sha1(password.encode()).hexdigest() return 'sha1$$%s' % hash + def decode(self, encoded): + assert encoded.startswith('sha1$$') + return { + 'algorithm': self.algorithm, + 'hash': encoded[6:], + 'salt': None, + } + def verify(self, password, encoded): encoded_2 = self.encode(password, '') return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): - assert encoded.startswith('sha1$$') - hash = encoded[6:] + decoded = self.decode(encoded) return { - _('algorithm'): self.algorithm, - _('hash'): mask_hash(hash), + _('algorithm'): decoded['algorithm'], + _('hash'): mask_hash(decoded['hash']), } def harden_runtime(self, password, encoded): @@ -587,6 +658,13 @@ def encode(self, password, salt): assert salt == '' return hashlib.md5(password.encode()).hexdigest() + def decode(self, encoded): + return { + 'algorithm': self.algorithm, + 'hash': encoded, + 'salt': None, + } + def verify(self, password, encoded): if len(encoded) == 37 and encoded.startswith('md5$$'): encoded = encoded[5:] @@ -594,9 +672,10 @@ def verify(self, password, encoded): return constant_time_compare(encoded, encoded_2) def safe_summary(self, encoded): + decoded = self.decode(encoded) return { - _('algorithm'): self.algorithm, - _('hash'): mask_hash(encoded, show=3), + _('algorithm'): decoded['algorithm'], + _('hash'): mask_hash(decoded['hash'], show=3), } def harden_runtime(self, password, encoded): @@ -618,24 +697,32 @@ def salt(self): def encode(self, password, salt): crypt = self._load_library() assert len(salt) == 2 - data = crypt.crypt(password, salt) - assert data is not None # A platform like OpenBSD with a dummy crypt module. + hash = crypt.crypt(password, salt) + assert hash is not None # A platform like OpenBSD with a dummy crypt module. # we don't need to store the salt, but Django used to do this - return "%s$%s$%s" % (self.algorithm, '', data) + return '%s$%s$%s' % (self.algorithm, '', hash) + + def decode(self, encoded): + algorithm, salt, hash = encoded.split('$', 2) + assert algorithm == self.algorithm + return { + 'algorithm': algorithm, + 'hash': hash, + 'salt': salt, + } def verify(self, password, encoded): crypt = self._load_library() - algorithm, salt, data = encoded.split('$', 2) - assert algorithm == self.algorithm - return constant_time_compare(data, crypt.crypt(password, data)) + decoded = self.decode(encoded) + data = crypt.crypt(password, decoded['hash']) + return constant_time_compare(decoded['hash'], data) def safe_summary(self, encoded): - algorithm, salt, data = encoded.split('$', 2) - assert algorithm == self.algorithm + decoded = self.decode(encoded) return { - _('algorithm'): algorithm, - _('salt'): salt, - _('hash'): mask_hash(data, show=3), + _('algorithm'): decoded['algorithm'], + _('salt'): decoded['salt'], + _('hash'): mask_hash(decoded['hash'], show=3), } def harden_runtime(self, password, encoded): diff --git a/django/contrib/auth/locale/af/LC_MESSAGES/django.mo b/django/contrib/auth/locale/af/LC_MESSAGES/django.mo index 44b95c63182a..f8fa02deb0bd 100644 Binary files a/django/contrib/auth/locale/af/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/af/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/af/LC_MESSAGES/django.po b/django/contrib/auth/locale/af/LC_MESSAGES/django.po index 28bf592004dd..bc93418fec47 100644 --- a/django/contrib/auth/locale/af/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/af/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# F Wolff , 2019 +# F Wolff , 2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2019-01-04 18:27+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-20 17:08+0000\n" "Last-Translator: F Wolff \n" "Language-Team: Afrikaans (http://www.transifex.com/django/django/language/" "af/)\n" @@ -52,8 +52,8 @@ msgstr "Geen wagwoord gestel nie." msgid "Invalid password format or unknown hashing algorithm." msgstr "Ongeldige wagwoordformaat of onbekende hutsalgoritme." -msgid "The two password fields didn't match." -msgstr "Die twee wagwoordvelde stem nie ooreen nie." +msgid "The two password fields didn’t match." +msgstr "Die twee wagwoordvelde stem nie ooreen nie" msgid "Password" msgstr "Wagwoord" @@ -65,12 +65,12 @@ msgid "Enter the same password as before, for verification." msgstr "Tik die wagwoord net soos tevore om te bevestig." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" -"Rou wagwoorde word nie gestoor nie. Daar is dus geen manier om ’n gebruiker " -"se wagwoord te sien nie, maar u kan die wagwoord met dié " -"vorm verander." +"Rou wagwoorde word nie gestoor nie, dus is daar geen manier om die gebruiker " +"se wagwoord te sien nie, maar die wagwoord kan gewysig word met hierdie vorm." #, python-format msgid "" @@ -245,21 +245,21 @@ msgstr[1] "’n Wagwoord moet ten minste %(min_length)d karakters bevat." msgid "The password is too similar to the %(verbose_name)s." msgstr "Die wagwoord is te soortgelyk aan die %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." +msgid "Your password can’t be too similar to your other personal information." msgstr "" -"Die wagwoord kan nie te soortgelyk aan die ander personeelinligting wees nie." +"Die wagwoord mag nie soortgelyk wees aan u ander persoonlike inligting nie." msgid "This password is too common." msgstr "Dié wagwoord is te algemeen." -msgid "Your password can't be a commonly used password." -msgstr "Die wagwoord kan nie ’n algemeen gebruikte wagwoord wees nie." +msgid "Your password can’t be a commonly used password." +msgstr "U wagwoord mag nie ’n algemeen gebruikte wagwoord wees nie." msgid "This password is entirely numeric." msgstr "Dié wagwoord is heeltemal numeries." -msgid "Your password can't be entirely numeric." -msgstr "Die wagwoord kan nie heeltemal numeries wees nie." +msgid "Your password can’t be entirely numeric." +msgstr "Die wagwoord mag nie geheel numeries wees nie." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo index 92fa4fda7c49..f4310c09a17f 100644 Binary files a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po index 4a1b6040843b..2b9853ce75e9 100644 --- a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po @@ -1,18 +1,19 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Ahmad Khayyat , 2013 +# Ahmad Khayyat , 2013,2021 # Bashar Al-Abdulhadi, 2015-2016 # Bashar Al-Abdulhadi, 2014 # Eyad Toma , 2013 # Jannis Leidel , 2011 +# Omar Lajam, 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2017-09-24 14:24+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-03 20:30+0000\n" +"Last-Translator: Ahmad Khayyat \n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "تواريخ مهمة" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود." +msgstr "العنصر من نوع %(name)s ذو الحقل الأساسي %(key)r غير موجود." msgid "Password changed successfully." msgstr "تم تغيير كلمة المرور بنجاح." @@ -42,7 +43,7 @@ msgid "Change password: %s" msgstr "غيّر كلمة المرور: %s" msgid "Authentication and Authorization" -msgstr "المصادقة والتخويل" +msgstr "المصادقة والتفويض" msgid "password" msgstr "كلمة المرور" @@ -51,13 +52,14 @@ msgid "last login" msgstr "آخر دخول" msgid "No password set." -msgstr "لا يوجد كلمة سر حتى الآن." +msgstr "لم يتم تعيين كلمة المرور." msgid "Invalid password format or unknown hashing algorithm." -msgstr "تنسيق كلمة المرور غير صالح أو خوارزمية التجزئة غير معروفة." +msgstr "" +"صيغة كلمة المرور غير صحيحة أو أن خوارزمية البعثرة (hashing) غير معروفة." -msgid "The two password fields didn't match." -msgstr "حقلا كلمتي المرور غير متطابقين." +msgid "The two password fields didn’t match." +msgstr "حقلا كلمة المرور غير متطابقين." msgid "Password" msgstr "كلمة المرور" @@ -69,15 +71,17 @@ msgid "Enter the same password as before, for verification." msgstr "أدخل كلمة المرور أعلاه مرة أخرى لتأكيدها." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" +"لا يتم حفظ كلمات المرور بصورتها الأصلية، لذلك لا يمكنك عرض كلمة مرور هذا " +"المستخدم، لكن يمكنك تغييرها باستخدام هذا النموذج" #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." -msgstr "الرجاء إدخال ال%(username)s و كلمة السر الصحيحين." +msgstr "الرجاء إدخال %(username)s وكلمة السر الصحيحين." msgid "This account is inactive." msgstr "هذا الحساب غير نشط." @@ -113,19 +117,19 @@ msgid "hash" msgstr "hash" msgid "variety" -msgstr "" +msgstr "منوّع" msgid "version" -msgstr "" +msgstr "إصدار" msgid "memory cost" -msgstr "" +msgstr "استهلاك الذاكرة" msgid "time cost" -msgstr "" +msgstr "المدة المطلوبة" msgid "parallelism" -msgstr "" +msgstr "التوازي" msgid "work factor" msgstr "عامل العمل" @@ -155,32 +159,32 @@ msgid "groups" msgstr "المجموعات" msgid "superuser status" -msgstr "حالة المستخدم الخارق" +msgstr "حالة المستخدم الفائق" msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا." +"يقضي بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لمنحها له تصريحاً." msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" -"المجموعات التي ينتمي إليها هذا المستخدم. ويمكن للمستخدم الحصول على كافة " -"الأذونات الممنوحة لكل من مجموعاتهم." +"المجموعات التي ينتمي إليها هذا المستخدم. يحصل المستخدم على كافة الصلاحيات " +"الممنوحة لكل مجموعة ينتمي إليها." msgid "user permissions" msgstr "صلاحيات المستخدم" msgid "Specific permissions for this user." -msgstr "صلاحيات خاصة لهذا المستخدم." +msgstr "صلاحيات خاصة بهذا المستخدم." msgid "username" msgstr "اسم المستخدم" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" +msgstr "مطلوب. 150 رمزاً أو أقل، مكونة من حروف وأرقام و @/./+/-/_ فقط" msgid "A user with that username already exists." msgstr "هناك مستخدم موجود مسبقاً بهذا الاسم." @@ -198,7 +202,7 @@ msgid "staff status" msgstr "حالة الطاقم" msgid "Designates whether the user can log into this admin site." -msgstr "يحدد ما إذا كان المستخدم يستطيع الدخول إلى موقع الإدارة هذا." +msgstr "يحدد ما إذا كان يمكن للمستخدم الدخول إلى موقع الإدارة هذا." msgid "active" msgstr "نشط" @@ -207,7 +211,7 @@ msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -"يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد ها الخيار بدلاً من حذف " +"يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد هذا الحقل بدلاً من حذف " "الحسابات." msgid "date joined" @@ -217,7 +221,7 @@ msgid "user" msgstr "مستخدم" msgid "users" -msgstr "المستخدمين" +msgstr "المستخدمون" #, python-format msgid "" @@ -237,7 +241,7 @@ msgstr[3] "" msgstr[4] "" "كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف على الأقل." msgstr[5] "" -"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف على الأقل." +"كلمة المرور هذه قصيرة جداً. يجب أن تتكون من %(min_length)d رمزاً على الأقل." #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -248,28 +252,26 @@ msgstr[1] "" msgstr[2] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرفين على الأقل." msgstr[3] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حروف على الأقل." msgstr[4] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d أحرف على الأقل." -msgstr[5] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرف على الأقل." +msgstr[5] "يجب أن تتكون كلمة المرور من %(min_length)d رمزاً على الأقل." #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "كلمة المرور هذه مشابة جدا لـ %(verbose_name)s." +msgstr "كلمة المرور مشابهة جداً لـ %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "" -"كلمة المرور الخاصة بكم لا يمكن أن تكون مشابة لأي من المعلومات الشخصية الأخرى " -"الخاصة بك." +msgid "Your password can’t be too similar to your other personal information." +msgstr "لا يمكن لكلمة المرور أن تكون مشابهة للمعلومات الشخصية الأخرى." msgid "This password is too common." -msgstr "كلمة المرور هذه شائعة جدا." +msgstr "كلمة المرور هذه شائعة جداً." -msgid "Your password can't be a commonly used password." -msgstr "كلمة المرور الخاصة بك لا يمكن أن تكون كلمة مرور مستخدمة بشكل شائع." +msgid "Your password can’t be a commonly used password." +msgstr "لا يمكن أن تكون كلمة المرور شائعة الاستخدام." msgid "This password is entirely numeric." msgstr "كلمة المرور هذه تتكون من أرقام فقط." -msgid "Your password can't be entirely numeric." -msgstr "كلمة المرور الخاصة بك لا يمكن أن تكون أرقام فقط." +msgid "Your password can’t be entirely numeric." +msgstr "لا يمكن أن تكون كلمة المرور مكونة من أرقام فقط." #, python-format msgid "Password reset on %(site_name)s" @@ -279,11 +281,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"أدخل اسم مستخدم صحيحاً. يمكن أن يتكون اسم المستخدم من أحرف إنجليزية وأرقام و " +"الرموز @/./+/-/_ فقط." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"أدخل اسم مستخدم صحيحاً. يمكن أن يتكون اسم المستخدم من حروف وأرقام و الرموز " +"@/./+/-/_ فقط." msgid "Logged out" msgstr "تم الخروج" @@ -292,7 +298,7 @@ msgid "Password reset" msgstr "إعادة ضبط كلمة المرور" msgid "Password reset sent" -msgstr "إعادة ضبط كلمة المرور تم ارسالها" +msgstr " تم ارسال إعادة ضبط كلمة المرور" msgid "Enter new password" msgstr "أدخل كلمة المرور الجديدة" @@ -301,7 +307,7 @@ msgid "Password reset unsuccessful" msgstr "فشل عملية إعادة تعيين كلمة المرور" msgid "Password reset complete" -msgstr "تم إعادة ضبط كلمة المرور بنجاح" +msgstr "تمت إعادة ضبط كلمة المرور" msgid "Password change" msgstr "تغيير كلمة المرور" diff --git a/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..fd61c62c7160 Binary files /dev/null and b/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..bed01f3f02a2 --- /dev/null +++ b/django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,316 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-12-14 22:38+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "Personal info" +msgstr "المعلومات الشخصية" + +msgid "Permissions" +msgstr "الصلاحيات" + +msgid "Important dates" +msgstr "تواريخ مهمة" + +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود." + +msgid "Password changed successfully." +msgstr "تم تغيير كلمة المرور بنجاح." + +#, python-format +msgid "Change password: %s" +msgstr "غيّر كلمة المرور: %s" + +msgid "Authentication and Authorization" +msgstr "المصادقة والتخويل" + +msgid "password" +msgstr "كلمة المرور" + +msgid "last login" +msgstr "آخر دخول" + +msgid "No password set." +msgstr "لا يوجد كلمة سر حتى الآن." + +msgid "Invalid password format or unknown hashing algorithm." +msgstr "تنسيق كلمة المرور غير صالح أو خوارزمية التجزئة غير معروفة." + +msgid "The two password fields didn’t match." +msgstr "حقلا كلمتي المرور غير متطابقين." + +msgid "Password" +msgstr "كلمة المرور" + +msgid "Password confirmation" +msgstr "تأكيد كلمة المرور" + +msgid "Enter the same password as before, for verification." +msgstr "أدخل كلمة المرور أعلاه مرة أخرى لتأكيدها." + +msgid "" +"Raw passwords are not stored, so there is no way to see this user’s " +"password, but you can change the password using this form." +msgstr "" +"لا يتم تخزين كلمات المرور الخام ، لذلك لا توجد طريقة لرؤية كلمة مرور هذا " +"المستخدم ، ولكن يمكنك تغيير كلمة المرور باستخدام هذا " +"النموذج." + +#, python-format +msgid "" +"Please enter a correct %(username)s and password. Note that both fields may " +"be case-sensitive." +msgstr "" +"الرجاء إدخال %(username)s وكلمة المرور الصحيحين. لاحظ أن كلا الحقلين قد يكون " +"حساسًا لحالة الأحرف." + +msgid "This account is inactive." +msgstr "هذا الحساب غير نشط." + +msgid "Email" +msgstr "بريد إلكتروني" + +msgid "New password" +msgstr "كلمة المرور الجديدة" + +msgid "New password confirmation" +msgstr "تأكيد كلمة المرور الجديدة" + +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "كلمة مرورك القديمة غير صحيحة. رجاءً أدخلها مرة أخرى." + +msgid "Old password" +msgstr "كلمة المرور القديمة" + +msgid "Password (again)" +msgstr "كلمة المرور (مجدداً)" + +msgid "algorithm" +msgstr "خوارزمية" + +msgid "iterations" +msgstr "التكرارات" + +msgid "salt" +msgstr "salt" + +msgid "hash" +msgstr "hash" + +msgid "variety" +msgstr "تنوع" + +msgid "version" +msgstr "إصدار" + +msgid "memory cost" +msgstr "تكلفة الذاكرة" + +msgid "time cost" +msgstr "تكلفة الوقت" + +msgid "parallelism" +msgstr "تواز" + +msgid "work factor" +msgstr "عامل العمل" + +msgid "checksum" +msgstr "تدقيق المجموع" + +msgid "name" +msgstr "الاسم" + +msgid "content type" +msgstr "نوع المحتوى" + +msgid "codename" +msgstr "الاسم الرمزي" + +msgid "permission" +msgstr "الصلاحية" + +msgid "permissions" +msgstr "الصلاحيات" + +msgid "group" +msgstr "مجموعة" + +msgid "groups" +msgstr "المجموعات" + +msgid "superuser status" +msgstr "حالة المستخدم الخارق" + +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا." + +msgid "" +"The groups this user belongs to. A user will get all permissions granted to " +"each of their groups." +msgstr "" +"المجموعات التي ينتمي إليها هذا المستخدم. ويمكن للمستخدم الحصول على كافة " +"الأذونات الممنوحة لكل من مجموعاتهم." + +msgid "user permissions" +msgstr "صلاحيات المستخدم" + +msgid "Specific permissions for this user." +msgstr "صلاحيات خاصة لهذا المستخدم." + +msgid "username" +msgstr "اسم المستخدم" + +msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "مطلوب. 150 حرف أو أقل. الحروف والأرقام و @ /. / + / - / _ فقط." + +msgid "A user with that username already exists." +msgstr "هناك مستخدم موجود مسبقاً بهذا الاسم." + +msgid "first name" +msgstr "الاسم الأول" + +msgid "last name" +msgstr "الاسم الأخير" + +msgid "email address" +msgstr "عنوان بريد إلكتروني" + +msgid "staff status" +msgstr "حالة الطاقم" + +msgid "Designates whether the user can log into this admin site." +msgstr "يحدد ما إذا كان المستخدم يستطيع الدخول إلى موقع الإدارة هذا." + +msgid "active" +msgstr "نشط" + +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد ها الخيار بدلاً من حذف " +"الحسابات." + +msgid "date joined" +msgstr "تاريخ الانضمام" + +msgid "user" +msgstr "مستخدم" + +msgid "users" +msgstr "المستخدمين" + +#, python-format +msgid "" +"This password is too short. It must contain at least %(min_length)d " +"character." +msgid_plural "" +"This password is too short. It must contain at least %(min_length)d " +"characters." +msgstr[0] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف على الأقل." +msgstr[1] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف واحد على الأقل." +msgstr[2] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرفين على الأقل." +msgstr[3] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حروف على الأقل." +msgstr[4] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف على الأقل." +msgstr[5] "" +"كلمة المرور هذه قصيرة جدا. يجب أن تتكون من %(min_length)d حرف على الأقل." + +#, python-format +msgid "Your password must contain at least %(min_length)d character." +msgid_plural "Your password must contain at least %(min_length)d characters." +msgstr[0] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرف على الأقل." +msgstr[1] "" +"كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرف واحد على الأقل." +msgstr[2] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرفين على الأقل." +msgstr[3] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حروف على الأقل." +msgstr[4] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d أحرف على الأقل." +msgstr[5] "كلمة المرور الخاصة بك يجب أن تتضمن %(min_length)d حرف على الأقل." + +#, python-format +msgid "The password is too similar to the %(verbose_name)s." +msgstr "كلمة المرور هذه مشابة جدا لـ %(verbose_name)s." + +msgid "Your password can’t be too similar to your other personal information." +msgstr "" +"كلمة المرور الخاصة بكم لا يمكن أن تكون مشابة لأي من المعلومات الشخصية الأخرى " +"الخاصة بك." + +msgid "This password is too common." +msgstr "كلمة المرور هذه شائعة جدا." + +msgid "Your password can’t be a commonly used password." +msgstr "كلمة المرور الخاصة بك لا يمكن أن تكون كلمة مرور مستخدمة بشكل شائع." + +msgid "This password is entirely numeric." +msgstr "كلمة المرور هذه تتكون من أرقام فقط." + +msgid "Your password can’t be entirely numeric." +msgstr "كلمة المرور الخاصة بك لا يمكن أن تكون أرقام فقط." + +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "إعادة تعيين كلمة المرور على %(site_name)s" + +msgid "" +"Enter a valid username. This value may contain only English letters, " +"numbers, and @/./+/-/_ characters." +msgstr "" +"أدخل اسم مستخدم صالح. قد تحتوي هذه القيمة على الأحرف الإنجليزية والأرقام " +"والأحرف @ /. / + / - / _." + +msgid "" +"Enter a valid username. This value may contain only letters, numbers, and " +"@/./+/-/_ characters." +msgstr "" +"أدخل اسم مستخدم صالح. قد تحتوي هذه القيمة على الأحرف والأرقام والأحرف @ /. / " +"+ / - / _." + +msgid "Logged out" +msgstr "تم الخروج" + +msgid "Password reset" +msgstr "إعادة ضبط كلمة المرور" + +msgid "Password reset sent" +msgstr "إعادة ضبط كلمة المرور تم ارسالها" + +msgid "Enter new password" +msgstr "أدخل كلمة المرور الجديدة" + +msgid "Password reset unsuccessful" +msgstr "فشل عملية إعادة تعيين كلمة المرور" + +msgid "Password reset complete" +msgstr "تم إعادة ضبط كلمة المرور بنجاح" + +msgid "Password change" +msgstr "تغيير كلمة المرور" + +msgid "Password change successful" +msgstr "تم تغيير كلمة المرور بنجاح" diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo index b070522e4fb0..9618560e7ae3 100644 Binary files a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po index fa65fe34264b..3ce3a8fc9d18 100644 --- a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po @@ -4,16 +4,18 @@ # Antoni Aloy , 2015,2017 # Carles Barrobés , 2011-2012,2014-2015 # Gil Obradors Via , 2019 -# Gil Obradors Via , 2019 +# Gil Obradors Via , 2019-2020 # Jannis Leidel , 2011 +# Marc Compte , 2021 # Roger Pons , 2015 +# Xavier RG , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-11-03 20:53+0000\n" -"Last-Translator: Gil Obradors Via \n" +"PO-Revision-Date: 2021-04-08 22:44+0000\n" +"Last-Translator: Marc Compte \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -73,6 +75,9 @@ msgid "" "Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" +"Les contrasenyes no es guarden en text clar, així que no hi ha forma de " +"conèixer-les, però pots canviar la contrasenya utilitzant " +"aquest formulari." #, python-format msgid "" @@ -241,7 +246,7 @@ msgstr[1] "" msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "La contrasenya és ha de tenir al menys %(min_length)d caràcter." -msgstr[1] "La contrasenya és ha de tenir un mínim de %(min_length)d caràcters." +msgstr[1] "La contrasenya ha de tenir un mínim de %(min_length)d caràcters." #, python-format msgid "The password is too similar to the %(verbose_name)s." @@ -249,18 +254,20 @@ msgstr "La contrasenya és massa semblant a %(verbose_name)s." msgid "Your password can’t be too similar to your other personal information." msgstr "" +"La teva contrasenya no pot ser tan similar a alguna de la teva informació " +"personal" msgid "This password is too common." msgstr "Aquesta contrasenya és massa comuna." msgid "Your password can’t be a commonly used password." -msgstr "" +msgstr "La teva contrasenya no pot ser la típica contrasenya comuna." msgid "This password is entirely numeric." msgstr "La contrasenya està formada només per números." msgid "Your password can’t be entirely numeric." -msgstr "" +msgstr "La teva contrasenya no potser únicament numèrica." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo index 40d3609de39b..fcbece08401f 100644 Binary files a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po index ebe016a6978a..ec7130da70cc 100644 --- a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po @@ -5,13 +5,13 @@ # Jannis Leidel , 2011 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2013-2014 -# Vláďa Macek , 2015-2017,2019 +# Vláďa Macek , 2015-2017,2019,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-19 08:58+0000\n" +"PO-Revision-Date: 2021-03-18 23:35+0000\n" "Last-Translator: Vláďa Macek \n" "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgid "memory cost" msgstr "spotřeba paměti" msgid "time cost" -msgstr "doba" +msgstr "časový náklad" msgid "parallelism" msgstr "paralelismus" diff --git a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo index c0fd145ac646..58435fdc9ec6 100644 Binary files a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po index abe465c51700..d57936fe4057 100644 --- a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2017 +# Michael Wolf , 2016-2017,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2017-10-02 10:01+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-25 16:01+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -53,8 +53,8 @@ msgstr "Žedno gronidło nastajone." msgid "Invalid password format or unknown hashing algorithm." msgstr "Njepłaśiwy gronidłowy format abo njeznaty kontrolny algoritmus." -msgid "The two password fields didn't match." -msgstr "Gronidle njejstej jadnak." +msgid "The two password fields didn’t match." +msgstr "Dwě gronidlowej póli njejstej jadnakej." msgid "Password" msgstr "Gronidło" @@ -66,7 +66,7 @@ msgid "Enter the same password as before, for verification." msgstr "Zapódajśo to samske gronidło, za pśespytanje." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" "Grube gronidła se njeskładuju, togodla njejo móžno, gronidło wužywarja " @@ -257,19 +257,19 @@ msgstr[3] "" msgid "The password is too similar to the %(verbose_name)s." msgstr "Gronidło jo na %(verbose_name)s pśepódobne." -msgid "Your password can't be too similar to your other personal information." +msgid "Your password can’t be too similar to your other personal information." msgstr "Wašo gronidło njesmějo na waše druge wósobinske daty pśepódobne byś." msgid "This password is too common." msgstr "Toś to gronidło jo pśepowšykne." -msgid "Your password can't be a commonly used password." +msgid "Your password can’t be a commonly used password." msgstr "Wašo gronidło njesmějo cesto wužywane gronidło byś." msgid "This password is entirely numeric." msgstr "Toś to gronidło jo cele numeriske." -msgid "Your password can't be entirely numeric." +msgid "Your password can’t be entirely numeric." msgstr "Wašo gronidło njesmějo cele numeriske byś." #, python-format diff --git a/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo index 77154a3a187e..5405971b5d8d 100644 Binary files a/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/eo/LC_MESSAGES/django.po b/django/contrib/auth/locale/eo/LC_MESSAGES/django.po index 6390b30937c8..a1d711d50a50 100644 --- a/django/contrib/auth/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/eo/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Baptiste Darthenay , 2012-2013 -# Baptiste Darthenay , 2013-2019 +# Batist D 🐍 , 2012-2013 +# Batist D 🐍 , 2013-2019 +# Matthieu Desplantes , 2021 # Robin van der Vliet , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2019-02-13 19:03+0000\n" -"Last-Translator: Baptiste Darthenay \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-04-13 08:08+0000\n" +"Last-Translator: Matthieu Desplantes \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -54,8 +55,8 @@ msgstr "Neniu pasvorto agordita." msgid "Invalid password format or unknown hashing algorithm." msgstr "Nevalida pasvorta formato, aŭ nekonata haketa algoritmo." -msgid "The two password fields didn't match." -msgstr "La du pasvotaj kampoj ne kongruas." +msgid "The two password fields didn’t match." +msgstr "La du pasvortaj kampoj ne kongruas." msgid "Password" msgstr "Pasvorto" @@ -67,12 +68,12 @@ msgid "Enter the same password as before, for verification." msgstr "Entajpu la saman pasvorton kiel supre, por konfirmo." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" -"Krudaj pasvortoj ne estas entenitaj, do ne eblas vidi la pasvorton de tiu " -"uzanto, sed vi povas ŝanĝi la pasvorton uzante tiun " -"formalaron." +"La pasvortoj ne estas konservitaj en klara formo, do ne eblas vidi la " +"pasvorton de ĉi tiu uzanto, sed vi povas ŝanĝi la pasvorton per ĉi tiu formularo." #, python-format msgid "" @@ -83,7 +84,7 @@ msgstr "" "povas esti usklecodistingaj." msgid "This account is inactive." -msgstr "Ĉi-tiu konto ne estas aktiva." +msgstr "Ĉi tiu konto ne estas aktiva." msgid "Email" msgstr "Retpoŝto" @@ -247,21 +248,20 @@ msgstr[1] "Via pasvorto devas enhavi almenaŭ %(min_length)d signojn." msgid "The password is too similar to the %(verbose_name)s." msgstr "La pasvorto estas tro simila al la %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "" -"Via pasvorto ne povas esti tro similaj al viaj aliaj personaj informoj." +msgid "Your password can’t be too similar to your other personal information." +msgstr "Via pasvorto ne povas esti tro simila al viaj aliaj personaj informoj." msgid "This password is too common." msgstr "Tiu pasvorto estas tro kutima." -msgid "Your password can't be a commonly used password." -msgstr "Via pasvorto ne povas esti kutime uzata pasvorto." +msgid "Your password can’t be a commonly used password." +msgstr "Via pasvorto ne povas esti ofte uzata pasvorto." msgid "This password is entirely numeric." msgstr "Tiu pasvorto estas tute cefera." -msgid "Your password can't be entirely numeric." -msgstr "Via pasvorto ne povas esti tute cifera." +msgid "Your password can’t be entirely numeric." +msgstr "Via pasvorto ne povas konsisti nur el ciferoj." #, python-format msgid "Password reset on %(site_name)s" @@ -285,19 +285,19 @@ msgid "Logged out" msgstr "Adiaŭita" msgid "Password reset" -msgstr "Pasvorta rekomencigo" +msgstr "Restarigo de pasvorto" msgid "Password reset sent" -msgstr "Pasvorta rekomencigo sendita" +msgstr "Restarigo de pasvorto sendita" msgid "Enter new password" msgstr "Enigu novan pasvorton" msgid "Password reset unsuccessful" -msgstr "Pasvorta rekomencigo malsuksesis" +msgstr "Restarigo de pasvorto malsukcesa" msgid "Password reset complete" -msgstr "Pasvorta rekomencigo plenumita" +msgstr "Restarigo de pasvorto plenumita" msgid "Password change" msgstr "Pasvorta ŝanĝo" diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo index c1227aa62b94..11a9f951d75c 100644 Binary files a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.po b/django/contrib/auth/locale/es/LC_MESSAGES/django.po index aad0b39c9d8a..b77ccab3997f 100644 --- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po @@ -11,14 +11,15 @@ # Jannis Leidel , 2011 # Josue Naaman Nistal Guerra , 2014 # Leonardo J. Caballero G. , 2011 +# Uriel Medina , 2020 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-08 08:16+0000\n" -"Last-Translator: Ernesto Avilés\n" +"PO-Revision-Date: 2020-09-25 17:48+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -119,7 +120,7 @@ msgid "iterations" msgstr "iteraciones" msgid "salt" -msgstr "sal" +msgstr "salto" msgid "hash" msgstr "función resumen" @@ -167,7 +168,7 @@ msgid "groups" msgstr "grupos" msgid "superuser status" -msgstr "es superusuario" +msgstr "estado de superusuario" msgid "" "Designates that this user has all permissions without explicitly assigning " diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo index 4319f61f138c..a5b173bd4e72 100644 Binary files a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po index c0c36f876133..5329a8d57bc8 100644 --- a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Ahmad Hosseini , 2020 # Ali Nikneshan , 2015 # Eric Hamiter , 2013 # Jannis Leidel , 2011 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2018-06-23 23:12+0000\n" -"Last-Translator: MJafar Mashhadi \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-08-20 15:54+0000\n" +"Last-Translator: Ahmad Hosseini \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -58,7 +59,7 @@ msgstr "هیچ رمزی انتخاب نشده است." msgid "Invalid password format or unknown hashing algorithm." msgstr "رمز نامعتبر یا الگوریتم رمزنگاری ناشناس" -msgid "The two password fields didn't match." +msgid "The two password fields didn’t match." msgstr "دو فیلد گذرواژه با هم مطابقت ندارند." msgid "Password" @@ -71,7 +72,7 @@ msgid "Enter the same password as before, for verification." msgstr "برای تائید، رمز عبور قبلی را وارد کنید." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" "گذرواژه‌ها به صورت خام نگهداری نمی‌شوند لذا راهی برای مشاهدهٔ گذرواژهٔ این کاربر " @@ -250,20 +251,20 @@ msgstr[1] "رمز عبور شما می‌بایست حداقل از %(min_length msgid "The password is too similar to the %(verbose_name)s." msgstr "این رمز عبور بسیار شبیه %(verbose_name)s می‌باشد." -msgid "Your password can't be too similar to your other personal information." -msgstr "رمز عبور شما نمی‌تواند شبیه سایر اطلاعات شخصی شما باشد." +msgid "Your password can’t be too similar to your other personal information." +msgstr "گذرواژه شما نمی‌تواند شبیه سایر اطلاعات شخصی شما باشد." msgid "This password is too common." msgstr "این رمز عبور بسیار رایج است." -msgid "Your password can't be a commonly used password." -msgstr "رمز شما نمی تواند از عبارات معروف باشد." +msgid "Your password can’t be a commonly used password." +msgstr "گذرواژه شما نمی تواند یک گذرواژه معمول باشد." msgid "This password is entirely numeric." msgstr "رمز شما کلا عدد است" -msgid "Your password can't be entirely numeric." -msgstr "رمز شما نمی تواند کلا عدد باشد" +msgid "Your password can’t be entirely numeric." +msgstr "گذرواژه شما نمی تواند کلا عدد باشد" #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo index 7116b1d8016d..958b2f72c7c7 100644 Binary files a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.po b/django/contrib/auth/locale/id/LC_MESSAGES/django.po index 3986518f0074..6af7984b7f0c 100644 --- a/django/contrib/auth/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/id/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Fery Setiawan , 2015-2016,2018 +# Fery Setiawan , 2015-2016,2018,2020 # Jannis Leidel , 2011 # oon arfiandwi , 2016 # rodin , 2011,2013 @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2019-05-04 11:49+0000\n" -"Last-Translator: sage \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-06 01:43+0000\n" +"Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -57,8 +57,8 @@ msgstr "Belum ada sandi yang disetel." msgid "Invalid password format or unknown hashing algorithm." msgstr "Format sandi tidak valid atau algoritma hash yang tidak dikenal." -msgid "The two password fields didn't match." -msgstr "Kedua bidang sandi tidak cocok." +msgid "The two password fields didn’t match." +msgstr "Dua bidang sandi tidak cocok." msgid "Password" msgstr "Sandi" @@ -70,11 +70,11 @@ msgid "Enter the same password as before, for verification." msgstr "Masukkan sandi yang sama seperti sebelumnya, untuk verifikasi." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" "Sandi mentah tidak disimpan, jadi tidak ada cara melihat sandi pengguna ini, " -"tetapi Anda dapat mengubah sandi menggunakan formulir ini." +"tetapi anda dapat merubah sandi menggunakan formulir ini." #, python-format msgid "" @@ -245,20 +245,20 @@ msgstr[0] "Kata sandi Anda harus memuat setidaknya %(min_length)d karakter." msgid "The password is too similar to the %(verbose_name)s." msgstr "Kata sandi terlalu mirip dengan %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "Kata sandi tidak boleh terlalu mirip dengan informasi pribadi lainnya." +msgid "Your password can’t be too similar to your other personal information." +msgstr "Sandi anda tidak dapat terlalu mirip terhadap informasi pribadi anda." msgid "This password is too common." msgstr "Kata sandi ini terlalu umum." -msgid "Your password can't be a commonly used password." -msgstr "Kata sandi Anda tidak boleh kata sandi yang umum digunakan." +msgid "Your password can’t be a commonly used password." +msgstr "Sandi anda tidak dapat berupa sandi umum digunakan." msgid "This password is entirely numeric." msgstr "Kata sandi ini seluruhnya terdiri dari angka." -msgid "Your password can't be entirely numeric." -msgstr "Kata sandi Anda tidak dapat seluruhnya numerik." +msgid "Your password can’t be entirely numeric." +msgstr "Sandi anda tidak bisa sepenuhnya numerik." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo index 9aab45856257..83d34e553e70 100644 Binary files a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po index 29741a882276..85782cfe7144 100644 --- a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Bumsoo Kim , 2017 +# Churow Park , 2020 # Jiyoon, Ha , 2016 # DaHae Sung , 2016 # Geonho Kim / Leo Kim , 2019 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-05 07:00+0000\n" -"Last-Translator: Geonho Kim / Leo Kim \n" +"PO-Revision-Date: 2020-05-07 08:17+0000\n" +"Last-Translator: Churow Park \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,16 +98,16 @@ msgid "Email" msgstr "이메일" msgid "New password" -msgstr "새 비밀번호:" +msgstr "새 비밀번호" msgid "New password confirmation" -msgstr "새 비밀번호 (확인):" +msgstr "새 비밀번호 (확인)" msgid "Your old password was entered incorrectly. Please enter it again." msgstr "기존 비밀번호를 잘못 입력하셨습니다. 다시 입력해 주세요." msgid "Old password" -msgstr "기존 비밀번호:" +msgstr "기존 비밀번호" msgid "Password (again)" msgstr "비밀번호 (확인)" diff --git a/django/contrib/auth/locale/ky/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..d74d3ba16e4a Binary files /dev/null and b/django/contrib/auth/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ky/LC_MESSAGES/django.po b/django/contrib/auth/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..1eb0f8d33736 --- /dev/null +++ b/django/contrib/auth/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,296 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-11-23 00:49+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Personal info" +msgstr "Өздүк маалымат" + +msgid "Permissions" +msgstr "Жеткилер" + +msgid "Important dates" +msgstr "Маанилүү күндөр" + +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "ID%(key)r болгон %(name)s табылган жок." + +msgid "Password changed successfully." +msgstr "Сырсөз ийгиликтүү өзгөрдү." + +#, python-format +msgid "Change password: %s" +msgstr "сырсөздү өзгөрт: %s" + +msgid "Authentication and Authorization" +msgstr "Катталуу жана жетки алуу" + +msgid "password" +msgstr "сырсөз" + +msgid "last login" +msgstr "акыркы кирүү" + +msgid "No password set." +msgstr "сырсөз жок." + +msgid "Invalid password format or unknown hashing algorithm." +msgstr "Туура эмес сырсөз калыбы же белгисиз бекитүү алгоритми" + +msgid "The two password fields didn’t match." +msgstr "Сырсөздүн эки талаасы бири бирине окшош болбой жатат." + +msgid "Password" +msgstr "Сырсөз" + +msgid "Password confirmation" +msgstr "Сырсөз тастыктоосу" + +msgid "Enter the same password as before, for verification." +msgstr "Тастыктоо үчүн жогоруга окшош сырсөз тер." + +msgid "" +"Raw passwords are not stored, so there is no way to see this user’s " +"password, but you can change the password using this form." +msgstr "" +"Сырсөздөр кам түрүндө сакталбайт, мындан улам сиз аны эч качан көрө " +"албайсыз. Бирок аны сиз бул формду колдонуп өзгөртсөңүз " +"болот." + +#, python-format +msgid "" +"Please enter a correct %(username)s and password. Note that both fields may " +"be case-sensitive." +msgstr "" +"Туура %(username)s жана сырсөз тер. Алар экөө тең СезГичТүү болушу мүмкүн." + +msgid "This account is inactive." +msgstr "Бул эсеп жанык эмес." + +msgid "Email" +msgstr "экат" + +msgid "New password" +msgstr "Жаңы сырсөз" + +msgid "New password confirmation" +msgstr "Жаңы сырсөз тастыктоосу" + +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "Сиздин эски сырсөзүңүз туура эмес терилди. Кайрадан териңиз." + +msgid "Old password" +msgstr "Эски сырсөз" + +msgid "Password (again)" +msgstr "сырсөз (кайра)" + +msgid "algorithm" +msgstr "алгоритм" + +msgid "iterations" +msgstr "аттоолор" + +msgid "salt" +msgstr "туз" + +msgid "hash" +msgstr "бекитүү" + +msgid "variety" +msgstr "тууралык" + +msgid "version" +msgstr "муун" + +msgid "memory cost" +msgstr "эс баасы" + +msgid "time cost" +msgstr "убакыт баасы" + +msgid "parallelism" +msgstr "удаалык" + +msgid "work factor" +msgstr "жумуш фактору" + +msgid "checksum" +msgstr "текшерүү" + +msgid "name" +msgstr "аты" + +msgid "content type" +msgstr "мазмун түрү" + +msgid "codename" +msgstr "кодаты" + +msgid "permission" +msgstr "жетки" + +msgid "permissions" +msgstr "жеткилер" + +msgid "group" +msgstr "тайпа" + +msgid "groups" +msgstr "тайпалар" + +msgid "superuser status" +msgstr "супер колдонуучу акыбалы" + +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "Бул колдонуучуга бүт жеткилер берилишин көмүскө түрдө аныктайт." + +msgid "" +"The groups this user belongs to. A user will get all permissions granted to " +"each of their groups." +msgstr "" +"Колдонуучунун тиешелүү болгон тайпасы. Колдонуучу тайпасына берилген бүт " +"жеткилерге ээ болот." + +msgid "user permissions" +msgstr "колдонуучу жеткиси" + +msgid "Specific permissions for this user." +msgstr "Бул колдонуучу үчүн кээ бир жеткилер" + +msgid "username" +msgstr "колдонуучу аты" + +msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Талап кылынат. 150 же аз арип, сан жана @/./+/-/_ лар гана." + +msgid "A user with that username already exists." +msgstr "Бул колдонуучу аты мурдатан эле бар" + +msgid "first name" +msgstr "аты" + +msgid "last name" +msgstr "атасынын аты" + +msgid "email address" +msgstr "эдарек" + +msgid "staff status" +msgstr "кызматкер статусу" + +msgid "Designates whether the user can log into this admin site." +msgstr "Колдонуучу башкаруу сайтына киришин же кире албашын дайындайт." + +msgid "active" +msgstr "жанык" + +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"Бул колдонуучунун активдүүлүгүн дайындайт. Бул аккаунтту өчүрүү үчүн бул " +"жердеги тандоону алып салыңыз." + +msgid "date joined" +msgstr "кошулуу күнү" + +msgid "user" +msgstr "колдонуучу" + +msgid "users" +msgstr "колдонуучулар" + +#, python-format +msgid "" +"This password is too short. It must contain at least %(min_length)d " +"character." +msgid_plural "" +"This password is too short. It must contain at least %(min_length)d " +"characters." +msgstr[0] "" +"Бул сырсөз өтө эле кыска. Ал өзүнө жок дегенде %(min_length)d символ камтышы " +"керек." + +#, python-format +msgid "Your password must contain at least %(min_length)d character." +msgid_plural "Your password must contain at least %(min_length)d characters." +msgstr[0] "Сиздин сырсөз жок дегенде %(min_length)d символ камтышы керек." + +#, python-format +msgid "The password is too similar to the %(verbose_name)s." +msgstr "Сырсөз жана %(verbose_name)s өтө эле окшош." + +msgid "Your password can’t be too similar to your other personal information." +msgstr "Сиздин сырсөз башка жеке маалыматыңызга окшош болбоосу керек." + +msgid "This password is too common." +msgstr "Бул сырсөз өтө эле жалпы" + +msgid "Your password can’t be a commonly used password." +msgstr "Сиздин сырсөз өтө эле жалпы колдонуудагы сырсөз болбоосу керек." + +msgid "This password is entirely numeric." +msgstr "Бул сырсөз жалаң сандан турат." + +msgid "Your password can’t be entirely numeric." +msgstr "Сиздин сырсөз жалаң эле сандардан турбашы керек." + +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s дан сырсөздү жокко чыгырыңыз" + +msgid "" +"Enter a valid username. This value may contain only English letters, " +"numbers, and @/./+/-/_ characters." +msgstr "" +"Туура колдонуучу атын киргизиңиз. Бул маани жалаң латын арибин, сан жана @/./" +"+/-/_ белгилерин камтый алат." + +msgid "" +"Enter a valid username. This value may contain only letters, numbers, and " +"@/./+/-/_ characters." +msgstr "" +"Туура колдонуучу атын киргизиңиз. Бул маани жалаң арип, сан жана @/./+/-/_ " +"белгилерин камтый алат." + +msgid "Logged out" +msgstr "Катталып чыкты" + +msgid "Password reset" +msgstr "Сырсөдү жокко чыгаруу" + +msgid "Password reset sent" +msgstr "Сырсөз жок кылууга жөнөтүлдү" + +msgid "Enter new password" +msgstr "Жаңы сырсөз киргиз" + +msgid "Password reset unsuccessful" +msgstr "Сырсөздү жокко чыгаруу ийгиликсиз" + +msgid "Password reset complete" +msgstr "Сырсөздү жокко чыгаруу аяктады" + +msgid "Password change" +msgstr "Сырсөз өзгөртүү" + +msgid "Password change successful" +msgstr "Сырсөздү жокко чыгаруу ийгиликтүү" diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo index 15570091f3c6..bdaa778cf15d 100644 Binary files a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po index 14f065d38d1c..dc391942a2f8 100644 --- a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po @@ -4,16 +4,17 @@ # Bogdan Mateescu, 2018 # Daniel Ursache-Dogariu, 2011 # Denis Darii , 2011 +# Eugenol Man , 2020 # Jannis Leidel , 2011 -# Răzvan Ionescu , 2015 +# razvan ionescu , 2015 # Razvan Stefanescu , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2018-02-28 17:47+0000\n" -"Last-Translator: Bogdan Mateescu\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-15 11:11+0000\n" +"Last-Translator: Eugenol Man \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -59,8 +60,8 @@ msgid "Invalid password format or unknown hashing algorithm." msgstr "" "Parolă nu are formatarea corectă sau algoritmul de criptare nu este cunoscut." -msgid "The two password fields didn't match." -msgstr "Cele două câmpuri pentru parole nu coincid." +msgid "The two password fields didn’t match." +msgstr "Cele două parole nu corespund." msgid "Password" msgstr "Parolă" @@ -72,12 +73,11 @@ msgid "Enter the same password as before, for verification." msgstr "Introduceți parola precedentă pentru confirmare." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" -"Parolele nu sunt stocate în forma lor brută, astfel încât nu există nici o " -"modalitate de a vedea parola acestui utilizator, însă puteţi schimba parola " -"folosind acest formular." +"Parolele nu sunt salvate în clar așa că nu poți vedea parola. O poți schimba " +"de aici." #, python-format msgid "" @@ -260,22 +260,22 @@ msgstr[2] "Parola trebuie să conțină cel puțin %(min_length)d de caractere." msgid "The password is too similar to the %(verbose_name)s." msgstr "Parola este prea asemănătoare cu %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." +msgid "Your password can’t be too similar to your other personal information." msgstr "" -"Se recomandă ca parola să nu conțină elemente similare cu datele de " -"identificare personală." +"Nu este recomandabil ca parola sa fie asemănătoare cu celelalte date " +"personale." msgid "This password is too common." msgstr "Această parolă este prea răspândită." -msgid "Your password can't be a commonly used password." -msgstr "Parola Dvs. nu poate fi o parolă folosită în mod uzual." +msgid "Your password can’t be a commonly used password." +msgstr "Parola nu poate fi atât de comună. " msgid "This password is entirely numeric." msgstr "Acestă parolă este compusă exclusiv din elemente numerice." -msgid "Your password can't be entirely numeric." -msgstr "Parola Dvs. nu poate fi alcătuită exclusiv din elemente numerice." +msgid "Your password can’t be entirely numeric." +msgstr "Parola nu poate fi doar cu numere." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo index 10371fba7ab9..6fdaf745066d 100644 Binary files a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po index 38e0ddaf69f4..84eec34dba91 100644 --- a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po @@ -1,18 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: +# crazyzubr , 2020 # Ivan Khomutov , 2017 # Jannis Leidel , 2011 # Алексей Борискин , 2012-2015 # Андрей Щуров , 2016 +# Влад Мещеряков , 2021 # Дмитрий Шатера , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2017-09-30 20:31+0000\n" -"Last-Translator: Ivan Khomutov \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-05-02 03:02+0000\n" +"Last-Translator: Влад Мещеряков \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -58,8 +60,8 @@ msgstr "Пароль не задан." msgid "Invalid password format or unknown hashing algorithm." msgstr "Неизвестный формат пароля или алгоритм хеширования." -msgid "The two password fields didn't match." -msgstr "Два поля с паролями не совпадают." +msgid "The two password fields didn’t match." +msgstr "Введенные пароли не совпадают." msgid "Password" msgstr "Пароль" @@ -71,12 +73,12 @@ msgid "Enter the same password as before, for verification." msgstr "Для подтверждения введите, пожалуйста, пароль ещё раз." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" -"Пароли не хранятся в открытом виде, поэтому нет возможности увидеть пароль " -"этого пользователя, но вы можете изменить пароль, воспользовавшисьэтой формой." +"Пароли хранятся в зашифрованном виде, поэтому нет возможности посмотреть " +"пароль этого пользователя, но вы можете изменить его используя эту форму." #, python-format msgid "" @@ -260,22 +262,20 @@ msgstr[3] "Ваш пароль должен содержать как миним msgid "The password is too similar to the %(verbose_name)s." msgstr "Введённый пароль слишком похож на %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "" -"Ваш пароль не должен совпадать с вашим именем или другой персональной " -"информацией или быть слишком похожим на неё." +msgid "Your password can’t be too similar to your other personal information." +msgstr "Пароль не должен быть слишком похож на другую вашу личную информацию." msgid "This password is too common." msgstr "Введённый пароль слишком широко распространён." -msgid "Your password can't be a commonly used password." -msgstr "Ваш пароль не может быть одним из широко распространённых паролей." +msgid "Your password can’t be a commonly used password." +msgstr "Пароль не должен быть слишком простым и распространенным." msgid "This password is entirely numeric." msgstr "Введённый пароль состоит только из цифр." -msgid "Your password can't be entirely numeric." -msgstr "Ваш пароль не может состоять только из цифр." +msgid "Your password can’t be entirely numeric." +msgstr "Пароль не может состоять только из цифр." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo index d202498db56f..040a1e582951 100644 Binary files a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po index d824ec2b1598..d04385e6036d 100644 --- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po @@ -11,13 +11,14 @@ # Petter Strandmark , 2019 # Samuel Linde , 2011 # Thomas Lundqvist, 2013,2016 +# Tomas Lööw , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2019-01-28 13:46+0000\n" -"Last-Translator: Petter Strandmark \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-05-06 05:59+0000\n" +"Last-Translator: Tomas Lööw \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -61,8 +62,8 @@ msgstr "Inget lösenord angivet." msgid "Invalid password format or unknown hashing algorithm." msgstr "Ogiltigt lösenordsformat eller okänd hashalgoritm." -msgid "The two password fields didn't match." -msgstr "De två lösenordsfälten stämde inte överens." +msgid "The two password fields didn’t match." +msgstr "De två lösenordsfälten stämmer inte överens." msgid "Password" msgstr "Lösenord" @@ -74,7 +75,7 @@ msgid "Enter the same password as before, for verification." msgstr "Fyll i samma lösenord som tidigare för verifiering." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" "Lösenord lagras inte direkt, så det finns inget sätt att se denna användares " @@ -253,19 +254,20 @@ msgstr[1] "Ditt lösenord måste innehålla minst %(min_length)d tecken." msgid "The password is too similar to the %(verbose_name)s." msgstr "Ditt lösenord är alltför likt %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "Ditt lösenord kan inte vara alltför lik din personliga information." +msgid "Your password can’t be too similar to your other personal information." +msgstr "" +"Ditt lösenord kan inte vara alltför likt din övriga personliga information." msgid "This password is too common." msgstr "Detta lösenord är alldeles för vanligt." -msgid "Your password can't be a commonly used password." +msgid "Your password can’t be a commonly used password." msgstr "Ditt lösenord kan inte vara ett allmänt använt lösenord." msgid "This password is entirely numeric." msgstr "Detta lösenord är enbart numeriskt." -msgid "Your password can't be entirely numeric." +msgid "Your password can’t be entirely numeric." msgstr "Ditt lösenord kan inte bara vara numeriskt." #, python-format diff --git a/django/contrib/auth/locale/tg/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..301132d31895 Binary files /dev/null and b/django/contrib/auth/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/tg/LC_MESSAGES/django.po b/django/contrib/auth/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..984b9699e684 --- /dev/null +++ b/django/contrib/auth/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,299 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-15 00:26+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Personal info" +msgstr "Маълумоти хусусӣ" + +msgid "Permissions" +msgstr "Салоҳият" + +msgid "Important dates" +msgstr "Санаҳои муҳим" + +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "%(name)s бо калидҳои ягонаи(pk) %(key)r вуҷуд надорад." + +msgid "Password changed successfully." +msgstr "Рамз муваффақона иваз карда шуд." + +#, python-format +msgid "Change password: %s" +msgstr "Ивазкунии рамз: %s" + +msgid "Authentication and Authorization" +msgstr "Истифодабарандагон ва гурӯҳҳо" + +msgid "password" +msgstr "рамз" + +msgid "last login" +msgstr "охирин вуруд" + +msgid "No password set." +msgstr "Рамзро ворид созед." + +msgid "Invalid password format or unknown hashing algorithm." +msgstr "Формати рамз ё алгоритми ҳеш(hash) ношинос аст." + +msgid "The two password fields didn’t match." +msgstr "" + +msgid "Password" +msgstr "Рамз" + +msgid "Password confirmation" +msgstr "Тасдиқи рамз" + +msgid "Enter the same password as before, for verification." +msgstr "Барои тасдиқсозӣ хоҳишмандем, бори дигар рамзро ворид созед." + +msgid "" +"Raw passwords are not stored, so there is no way to see this user’s " +"password, but you can change the password using this form." +msgstr "" + +#, python-format +msgid "" +"Please enter a correct %(username)s and password. Note that both fields may " +"be case-sensitive." +msgstr "" +"Хоҳишмандем %(username)s ва рамзро дуруст ворид созед. Ҳарду майдон " +"духӯра(case-sensitive) ҳастанд." + +msgid "This account is inactive." +msgstr "Ин ҳисоби корбарӣ хомӯш аст." + +msgid "Email" +msgstr "Суроғаи почтаи электронӣ" + +msgid "New password" +msgstr "Рамзи нав" + +msgid "New password confirmation" +msgstr "Тасдиқи рамзи нав" + +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "" +"Рамзи пешинаро нодуруст ворид кардед. Хоҳишмандем аз нав шакли дурусташро " +"ворид созед." + +msgid "Old password" +msgstr "Рамзи кӯҳна" + +msgid "Password (again)" +msgstr "Рамз (такроран)" + +msgid "algorithm" +msgstr "алгоритм" + +msgid "iterations" +msgstr "итератсияҳо" + +msgid "salt" +msgstr "намак" + +msgid "hash" +msgstr "ҳэш" + +msgid "variety" +msgstr "маҷмӯа" + +msgid "version" +msgstr "версия" + +msgid "memory cost" +msgstr "истифодаи ҳофиза" + +msgid "time cost" +msgstr "истифодаи вақт" + +msgid "parallelism" +msgstr "параллелизм" + +msgid "work factor" +msgstr "омили корӣ" + +msgid "checksum" +msgstr "натиҷаи санҷиш" + +msgid "name" +msgstr "ном" + +msgid "content type" +msgstr "намуди контент" + +msgid "codename" +msgstr "номи рамзӣ" + +msgid "permission" +msgstr "салоҳият" + +msgid "permissions" +msgstr "салоҳият" + +msgid "group" +msgstr "гурӯҳ" + +msgid "groups" +msgstr "гурӯҳҳо" + +msgid "superuser status" +msgstr "статуси истифодабарӣ аввалиндараҷа(superuser)" + +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "Нишон медиҳад, ки истифодабаранда дорои ҳама гуна салоҳиятҳост." + +msgid "" +"The groups this user belongs to. A user will get all permissions granted to " +"each of their groups." +msgstr "" +"Гуруҳҳое, ки истифодабарандаи мазкур ба онҳо шомил аст.Истифодабаранда ҳамаи " +"салоҳиятҳои дар гуруҳҳо мавҷудбударо дорост" + +msgid "user permissions" +msgstr "ҳуқуқҳои истифодабаранда" + +msgid "Specific permissions for this user." +msgstr "салоҳиятҳои шахсии истифодабаранда" + +msgid "username" +msgstr "номи истифодабаранда" + +msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" +"Майдони пуркаданаш зарурӣ. На беш аз 150 аломат. Танҳо аз ҳарфҳо, рақамҳо ва " +"аломатҳо @/./+/-/_." + +msgid "A user with that username already exists." +msgstr "Чунин номи истифодабаранда алакай вуҷуд дорад." + +msgid "first name" +msgstr "ном" + +msgid "last name" +msgstr "насаб" + +msgid "email address" +msgstr "суроғаи почтаи электронӣ" + +msgid "staff status" +msgstr "статуси шахс" + +msgid "Designates whether the user can log into this admin site." +msgstr "" +"Қайд кунед, агар истифодабаранда ҳуқуқи воридшавӣ ба қисми маъмурии сомонаро " +"дошта бошад." + +msgid "active" +msgstr "фаъол" + +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"Қайд кунед, агар истифодабаранда фаъол ҳисобида шавад. Қайдро бекор кунед, " +"дар ҳолати нест сохтани ҳисоби корбарӣ" + +msgid "date joined" +msgstr "санаи бақайдгирӣ" + +msgid "user" +msgstr "истифодабаранда" + +msgid "users" +msgstr "истифодабарандаҳо" + +#, python-format +msgid "" +"This password is too short. It must contain at least %(min_length)d " +"character." +msgid_plural "" +"This password is too short. It must contain at least %(min_length)d " +"characters." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Your password must contain at least %(min_length)d character." +msgid_plural "Your password must contain at least %(min_length)d characters." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "The password is too similar to the %(verbose_name)s." +msgstr "Рамзи воридкардашуда ба %(verbose_name)s монанд аст." + +msgid "Your password can’t be too similar to your other personal information." +msgstr "" + +msgid "This password is too common." +msgstr "Рамзи воридкардашуда хеле серистеъмол аст." + +msgid "Your password can’t be a commonly used password." +msgstr "" + +msgid "This password is entirely numeric." +msgstr "Рамзи воридкардашуда танҳо аз рақамҳо иборат аст." + +msgid "Your password can’t be entirely numeric." +msgstr "" + +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Барҳамдиҳии рамз дар сайти мазкур %(site_name)s" + +msgid "" +"Enter a valid username. This value may contain only English letters, " +"numbers, and @/./+/-/_ characters." +msgstr "" +"Номи истифодабарандаро дуруст ворид созед. Қимати ин майдон бояд танҳоаз " +"ҳуруфи англисӣ, рақамҳо ва аломатҳо @/./+/-/_ иборат бошад." + +msgid "" +"Enter a valid username. This value may contain only letters, numbers, and " +"@/./+/-/_ characters." +msgstr "" +"Номи истифодабарандаро дуруст ворид созед. Қимати ин майдон бояд танҳоаз " +"ҳарфҳо, рақамҳо ва аломатҳо @/./+/-/_ иборат бошад." + +msgid "Logged out" +msgstr "Рухсатшуда(Logged out)" + +msgid "Password reset" +msgstr "Барқарорсозии рамз" + +msgid "Password reset sent" +msgstr "Мактуби дастурамал оиди барқарорсозии рамз равон карда шуд." + +msgid "Enter new password" +msgstr "Рамзи навро ворид созед" + +msgid "Password reset unsuccessful" +msgstr "Мушкилӣ ҳангоми барқарорсозии рамз." + +msgid "Password reset complete" +msgstr "Барқарорсозии рамз ба анҷом расид." + +msgid "Password change" +msgstr "Ивази рамз" + +msgid "Password change successful" +msgstr "рамз муваффақона иваз карда шуд" diff --git a/django/contrib/auth/locale/tk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tk/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..fdf3f71af85f Binary files /dev/null and b/django/contrib/auth/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/tk/LC_MESSAGES/django.po b/django/contrib/auth/locale/tk/LC_MESSAGES/django.po new file mode 100644 index 000000000000..9b66dadd6433 --- /dev/null +++ b/django/contrib/auth/locale/tk/LC_MESSAGES/django.po @@ -0,0 +1,303 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Resulkary , 2020 +# Welbeck Garli , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-06 17:52+0000\n" +"Last-Translator: Resulkary \n" +"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"tk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tk\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Personal info" +msgstr "Şahsy maglumat" + +msgid "Permissions" +msgstr "Rugsatlar" + +msgid "Important dates" +msgstr "Möhüm seneler" + +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Esasy açary %(key)r bolan %(name)s obýekt ýok." + +msgid "Password changed successfully." +msgstr "Parol üstünlikli üýtgedildi." + +#, python-format +msgid "Change password: %s" +msgstr "Paroly üýtgetmek: %s" + +msgid "Authentication and Authorization" +msgstr "Şahsyýet tanamak we Ygtyýarnama" + +msgid "password" +msgstr "parol" + +msgid "last login" +msgstr "soňky giriş" + +msgid "No password set." +msgstr "Parol goýulmady." + +msgid "Invalid password format or unknown hashing algorithm." +msgstr "Nädogry parol formaty ýa-da näbelli hashing algoritmi." + +msgid "The two password fields didn’t match." +msgstr "Iki parol meýdançasy gabat gelmedi." + +msgid "Password" +msgstr "Parol" + +msgid "Password confirmation" +msgstr "Parol tassyklamasy" + +msgid "Enter the same password as before, for verification." +msgstr "Barlamak üçin öňküsi ýaly paroly giriziň." + +msgid "" +"Raw passwords are not stored, so there is no way to see this user’s " +"password, but you can change the password using this form." +msgstr "" +"Çig parollar saklanmaýar, şonuň üçin bu ulanyjynyň parolyny görmegiň " +"mümkinçiligi ýok, ýöne şu formany ulanyp üýtgedip " +"bilersiňiz." + +#, python-format +msgid "" +"Please enter a correct %(username)s and password. Note that both fields may " +"be case-sensitive." +msgstr "" +"Haýyş, dogry %(username)s we paroly giriziň. Iki meýdançanyň hem baş-setir " +"harpa duýgur bolup biljekdigine üns beriň." + +msgid "This account is inactive." +msgstr "Bu hasap hereketsiz." + +msgid "Email" +msgstr "E-mail" + +msgid "New password" +msgstr "Täze parol" + +msgid "New password confirmation" +msgstr "Täze parol tassyklamasy" + +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "" +"Köne parolyňyz nädogry girizildi. Gaýtadan girizmegiňizi haýyş edýäris." + +msgid "Old password" +msgstr "Köne parol" + +msgid "Password (again)" +msgstr "Parol (gaýtadan)" + +msgid "algorithm" +msgstr "algoritm" + +msgid "iterations" +msgstr "gaýtalama" + +msgid "salt" +msgstr "duz" + +msgid "hash" +msgstr "hash" + +msgid "variety" +msgstr "dürlülik" + +msgid "version" +msgstr "wersiýa" + +msgid "memory cost" +msgstr "ýadyň bahasy" + +msgid "time cost" +msgstr "wagt bahasy" + +msgid "parallelism" +msgstr "parallellik" + +msgid "work factor" +msgstr "iş faktory" + +msgid "checksum" +msgstr "çek" + +msgid "name" +msgstr "at" + +msgid "content type" +msgstr "mazmunyň görnüşi" + +msgid "codename" +msgstr "kod ady" + +msgid "permission" +msgstr "rugsat" + +msgid "permissions" +msgstr "rugsatlar" + +msgid "group" +msgstr "topar" + +msgid "groups" +msgstr "toparlar" + +msgid "superuser status" +msgstr "superuser ýagdaýy" + +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Bu ulanyjynyň aç-açan bellemezden ähli rugsatlarynyň bardygyny belleýär." + +msgid "" +"The groups this user belongs to. A user will get all permissions granted to " +"each of their groups." +msgstr "" +"Bu ulanyjynyň degişli toparlary. Ulanyjy her bir topara berlen ähli " +"rugsatlary alar." + +msgid "user permissions" +msgstr "ulanyjy rugsatlary" + +msgid "Specific permissions for this user." +msgstr "Bu ulanyjy üçin ýörite rugsatlar." + +msgid "username" +msgstr "ulanyjy ady" + +msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" +"Gerekli. 150 harp ýa-da azyrak. Diňe harplar, sanlar we @/./+/-/_ mümkin." + +msgid "A user with that username already exists." +msgstr "Bu ulanyjy adyny ulanýan ulanyjy eýýäm bar." + +msgid "first name" +msgstr "at" + +msgid "last name" +msgstr "familiýa" + +msgid "email address" +msgstr "email salgy" + +msgid "staff status" +msgstr "işgärleriň ýagdaýy" + +msgid "Designates whether the user can log into this admin site." +msgstr "Ulanyjynyň bu administrator sahypasyna girip biljekdigini kesgitleýär." + +msgid "active" +msgstr "işjeň" + +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"Bu ulanyja işjeň garalmalydygyny ýa-da ýokdugyny kesgitleýär. Hasaplary " +"pozmagyň ýerine şuny saýlaň." + +msgid "date joined" +msgstr "goşulan senesi" + +msgid "user" +msgstr "ulanyjy" + +msgid "users" +msgstr "ulanyjylar" + +#, python-format +msgid "" +"This password is too short. It must contain at least %(min_length)d " +"character." +msgid_plural "" +"This password is too short. It must contain at least %(min_length)d " +"characters." +msgstr[0] "" +"Bu parol gaty gysga. Iň azyndan %(min_length)d nyşandan ybarat bolmaly." +msgstr[1] "" +"Bu parol gaty gysga. Iň azyndan %(min_length)d nyşandan ybarat bolmaly." + +#, python-format +msgid "Your password must contain at least %(min_length)d character." +msgid_plural "Your password must contain at least %(min_length)d characters." +msgstr[0] "Parolyňyzda azyndan %(min_length)d nyşan bolmaly." +msgstr[1] "Parolyňyzda azyndan %(min_length)d nyşan bolmaly." + +#, python-format +msgid "The password is too similar to the %(verbose_name)s." +msgstr "Parol %(verbose_name)s-e gaty meňzeýär." + +msgid "Your password can’t be too similar to your other personal information." +msgstr "Parolyňyz beýleki şahsy maglumatlaryňyza gaty meňzeş bolmaly däl." + +msgid "This password is too common." +msgstr "Bu parol gaty ýygy ulanylýar." + +msgid "Your password can’t be a commonly used password." +msgstr "Parolyňyz köplenç ulanylýan parol bolmaly däl." + +msgid "This password is entirely numeric." +msgstr "Bu parol diňe sanlardan ybarat." + +msgid "Your password can’t be entirely numeric." +msgstr "Parolyňyz diňe sanlardan ybarat bolup bilmez." + +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s-de paroly täzeden düzüldi" + +msgid "" +"Enter a valid username. This value may contain only English letters, " +"numbers, and @/./+/-/_ characters." +msgstr "" +"Dogry ulanyjy adyny giriziň. Bu bahada diňe iňlis harplary, sanlar we @/./" +"+/-/_ nyşanlary bolup biler." + +msgid "" +"Enter a valid username. This value may contain only letters, numbers, and " +"@/./+/-/_ characters." +msgstr "" +"Dogry ulanyjy adyny giriziň. Bu bahada diňe harplar, sanlar we @/./+/-/_ " +"nyşanlary bolup biler." + +msgid "Logged out" +msgstr "Çykyldy" + +msgid "Password reset" +msgstr "Paroly täzeden düzmek" + +msgid "Password reset sent" +msgstr "Paroly täzeden düzmek boýunça görkezmeler iberildi" + +msgid "Enter new password" +msgstr "Täze parol giriziň" + +msgid "Password reset unsuccessful" +msgstr "Paroly täzeden düzüp bolmady" + +msgid "Password reset complete" +msgstr "Paroly täzeden düzüldi" + +msgid "Password change" +msgstr "Parol üýtgetmek" + +msgid "Password change successful" +msgstr "Parol üýtgetmek üstünlikli tamamlandy" diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo index 22c793de17d6..79ac2cb990aa 100644 Binary files a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po index 499098bb2a60..9215f67538a8 100644 --- a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po @@ -2,21 +2,21 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2017,2019 +# BouRock, 2015-2017,2019-2020 # BouRock, 2014-2015 -# Caner Başaran , 2013 +# Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2014 # Gökmen Görgen , 2013 # Jannis Leidel , 2011 # Metin Amiroff , 2012 -# Murat Çorlu , 2012 +# Murat Çorlu , 2012 # U. Ozan Basar , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-17 07:59+0000\n" +"PO-Revision-Date: 2020-09-29 18:52+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -86,7 +86,7 @@ msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" -"Lütfen doğru %(username)s ve parola girin. Her iki alanında büyük küçük " +"Lütfen doğru %(username)s ve parola girin. Her iki alanın da büyük/küçük " "harfe duyarlı olabileceğini unutmayın." msgid "This account is inactive." @@ -246,7 +246,7 @@ msgstr[1] "Bu parola çok kısa. En az %(min_length)d karakter içermek zorunda. msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "Parolanız en az %(min_length)d karakter içermek zorunda." -msgstr[1] "Parolanız en az %(min_length)d karakter içermek zorunda." +msgstr[1] "Parolanız en az %(min_length)d karakter içermek zorundadır." #, python-format msgid "The password is too similar to the %(verbose_name)s." @@ -259,7 +259,7 @@ msgid "This password is too common." msgstr "Bu parola çok geneldir." msgid "Your password can’t be a commonly used password." -msgstr "Parolanız genelde kullanılan bir parola olamaz." +msgstr "Parolanız yaygın olarak kullanılan bir parola olamaz." msgid "This password is entirely numeric." msgstr "Bu parola tamamıyla sayısaldır." diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo index ee052c0f1579..c86d3981399a 100644 Binary files a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po index 5d98e5fbb48d..36a17a14bc81 100644 --- a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # captain_m4l , 2012 # Igor Melnyk, 2014-2015 +# Illia Volochii , 2021 # Jannis Leidel , 2011 # Kirill Gagarski , 2015 # Max V. Stotsky , 2014 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2017-11-08 15:37+0000\n" -"Last-Translator: Zoriana Zaiats\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-19 23:40+0000\n" +"Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -64,8 +65,8 @@ msgstr "Пароль не встановлено." msgid "Invalid password format or unknown hashing algorithm." msgstr "Невірний формат пароля або невідомий алгоритм хешування." -msgid "The two password fields didn't match." -msgstr "Паролі у двох полях не співпадають." +msgid "The two password fields didn’t match." +msgstr "Паролі не збігаються" msgid "Password" msgstr "Пароль" @@ -77,7 +78,7 @@ msgid "Enter the same password as before, for verification." msgstr "Введіть той же пароль, що і раніше, для підтвердження." msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" "Паролі не зберігаються у відкритому вигляді, тому немає можливості " @@ -261,20 +262,20 @@ msgstr[3] "Ваш пароль повинен містити як мінімум msgid "The password is too similar to the %(verbose_name)s." msgstr "Пароль надто схожий на %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." -msgstr "Пароль не повинен бути надто схожим на іншу персональну інформацію." +msgid "Your password can’t be too similar to your other personal information." +msgstr "Пароль не може бути надто схожим на іншу особисту інформацію." msgid "This password is too common." msgstr "Пароль надто відомий." -msgid "Your password can't be a commonly used password." -msgstr "Ваш пароль не повинен бути загальновідомим." +msgid "Your password can’t be a commonly used password." +msgstr "Пароль не може бути одним із дуже поширених." msgid "This password is entirely numeric." msgstr "Цей пароль повністю складається із цифр." -msgid "Your password can't be entirely numeric." -msgstr "Ваш пароль не може складається лише із цифр." +msgid "Your password can’t be entirely numeric." +msgstr "Пароль не може складається лише із цифр." #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo index 150791bd4d06..9e9ca6942fa1 100644 Binary files a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po index 207a8581d8cc..f8d18978295a 100644 --- a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Bo Li , 2020 # David , 2019 # ausaki , 2017 # jamin M , 2019 @@ -10,6 +11,7 @@ # Liping Wang , 2016-2017 # mozillazg , 2016 # pylemon , 2012-2013 +# Wentao Han , 2020 # hizyn , 2016 # ced773123cfad7b4e8b79ca80f736af9, 2011 # Kevin Sze , 2012 @@ -17,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2019-05-26 10:59+0000\n" -"Last-Translator: jamin M \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-12-09 02:32+0000\n" +"Last-Translator: Bo Li \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -63,8 +65,8 @@ msgstr "密码未设置。" msgid "Invalid password format or unknown hashing algorithm." msgstr "不可用的密码格式或未知的哈希算法。" -msgid "The two password fields didn't match." -msgstr "两个密码字段不一致。" +msgid "The two password fields didn’t match." +msgstr "输入的两个密码不一致。" msgid "Password" msgstr "密码" @@ -76,17 +78,17 @@ msgid "Enter the same password as before, for verification." msgstr "为了校验，请输入与上面相同的密码。" msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"Raw passwords are not stored, so there is no way to see this user’s " "password, but you can change the password using this form." msgstr "" -"由于没有存储明文密码，所以无法查看该用户的密码，但是可以通过这个表单修改密码。" +"密码原文未存储在系统中，因此无法看到该用户的密码。然而你可以通过这个表单来修改密码。" #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." -msgstr "请输入一个正确的 %(username)s 和密码. 注意他们都是大区分大小写的." +msgstr "请输入一个正确的%(username)s和密码。注意，两者都区分大小写。" msgid "This account is inactive." msgstr "该帐号未激活。" @@ -107,7 +109,7 @@ msgid "Old password" msgstr "旧密码" msgid "Password (again)" -msgstr "密码(重复)" +msgstr "密码（重复）" msgid "algorithm" msgstr "算法" @@ -186,7 +188,8 @@ msgid "username" msgstr "用户名" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "必填。150个字符或者更少。包含字母，数字和仅有的@/./+/-/_符号。" +msgstr "" +"必填；长度为150个字符或以下；只能包含字母、数字、特殊字符“@”、“.”、“-”和“_”。" msgid "A user with that username already exists." msgstr "已存在一位使用该名字的用户。" @@ -201,7 +204,7 @@ msgid "email address" msgstr "电子邮件地址" msgid "staff status" -msgstr "人员状态" +msgstr "工作人员状态" msgid "Designates whether the user can log into this admin site." msgstr "指明用户是否可以登录到这个管理站点。" @@ -241,20 +244,20 @@ msgstr[0] "你的密码必须包含至少 %(min_length)d 个字符。" msgid "The password is too similar to the %(verbose_name)s." msgstr "密码跟 %(verbose_name)s 太相似了。" -msgid "Your password can't be too similar to your other personal information." +msgid "Your password can’t be too similar to your other personal information." msgstr "你的密码不能与你的其他个人信息太相似。" msgid "This password is too common." msgstr "这个密码太常见了。" -msgid "Your password can't be a commonly used password." -msgstr "你的密码不能是大家都爱用的常见密码。" +msgid "Your password can’t be a commonly used password." +msgstr "你的密码不能是一个常见密码。" msgid "This password is entirely numeric." msgstr "密码只包含数字。" -msgid "Your password can't be entirely numeric." -msgstr "你的密码不能全部为数字。" +msgid "Your password can’t be entirely numeric." +msgstr "你的密码不能全都是数字。" #, python-format msgid "Password reset on %(site_name)s" @@ -263,12 +266,14 @@ msgstr "重置 %(site_name)s 的密码" msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." -msgstr "请输入合法的用户名。只能包含英文字母，数字和@/./+/-/_字符。" +msgstr "" +"请输入合法的用户名。只能包含英文字母、数字、特殊字符“@”、“.”、“-”和“_”。" msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." -msgstr "请输入合法用户名。只能包含字母，数字和@/./+/-/_ 字符。" +msgstr "" +"请输入合法的用户名。只能包含英文字母、数字、特殊字符“@”、“.”、“-”和“_”。" msgid "Logged out" msgstr "登出" diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py index deda238c78d3..1170cb0b20a4 100644 --- a/django/contrib/auth/management/__init__.py +++ b/django/contrib/auth/management/__init__.py @@ -101,14 +101,15 @@ def get_system_username(): return result -def get_default_username(check_db=True): +def get_default_username(check_db=True, database=DEFAULT_DB_ALIAS): """ Try to determine the current system user's username to use as a default. :param check_db: If ``True``, requires that the username does not match an existing ``auth.User`` (otherwise returns an empty string). + :param database: The database where the unique check will be performed. :returns: The username, or an empty string if no username can be - determined. + determined or the suggested username is already taken. """ # This file is used in apps.py, it should not trigger models import. from django.contrib.auth import models as auth_app @@ -137,7 +138,9 @@ def get_default_username(check_db=True): # Don't return the default username if it is already taken. if check_db and default_username: try: - auth_app.User._default_manager.get(username=default_username) + auth_app.User._default_manager.db_manager(database).get( + username=default_username, + ) except auth_app.User.DoesNotExist: pass else: diff --git a/django/contrib/auth/management/commands/__init__.py b/django/contrib/auth/management/commands/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py index 619ce8710af8..b0c0a7f59a79 100644 --- a/django/contrib/auth/management/commands/changepassword.py +++ b/django/contrib/auth/management/commands/changepassword.py @@ -12,7 +12,7 @@ class Command(BaseCommand): help = "Change a user's password for django.contrib.auth." requires_migrations_checks = True - requires_system_checks = False + requires_system_checks = [] def _get_pass(self, prompt="Password: "): p = getpass.getpass(prompt=prompt) diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py index 3b76477f0185..3eb8abff0667 100644 --- a/django/contrib/auth/management/commands/createsuperuser.py +++ b/django/contrib/auth/management/commands/createsuperuser.py @@ -97,7 +97,7 @@ def handle(self, *args, **options): fake_user_data = {} if hasattr(self.stdin, 'isatty') and not self.stdin.isatty(): raise NotRunningInTTYException - default_username = get_default_username() + default_username = get_default_username(database=database) if username: error_msg = self._validate_username(username, verbose_field_name, database) if error_msg: diff --git a/django/contrib/auth/mixins.py b/django/contrib/auth/mixins.py index e83e0ee8054a..02f9d23f0750 100644 --- a/django/contrib/auth/mixins.py +++ b/django/contrib/auth/mixins.py @@ -1,7 +1,10 @@ +from urllib.parse import urlparse + from django.conf import settings from django.contrib.auth import REDIRECT_FIELD_NAME from django.contrib.auth.views import redirect_to_login from django.core.exceptions import ImproperlyConfigured, PermissionDenied +from django.shortcuts import resolve_url class AccessMixin: @@ -41,7 +44,23 @@ def get_redirect_field_name(self): def handle_no_permission(self): if self.raise_exception or self.request.user.is_authenticated: raise PermissionDenied(self.get_permission_denied_message()) - return redirect_to_login(self.request.get_full_path(), self.get_login_url(), self.get_redirect_field_name()) + + path = self.request.build_absolute_uri() + resolved_login_url = resolve_url(self.get_login_url()) + # If the login url is the same scheme and net location then use the + # path as the "next" url. + login_scheme, login_netloc = urlparse(resolved_login_url)[:2] + current_scheme, current_netloc = urlparse(path)[:2] + if ( + (not login_scheme or login_scheme == current_scheme) and + (not login_netloc or login_netloc == current_netloc) + ): + path = self.request.get_full_path() + return redirect_to_login( + path, + resolved_login_url, + self.get_redirect_field_name(), + ) class LoginRequiredMixin(AccessMixin): diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 84962b9d0eb7..5f092f0ae8c8 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -1,5 +1,7 @@ +from django.apps import apps from django.contrib import auth from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager +from django.contrib.auth.hashers import make_password from django.contrib.contenttypes.models import ContentType from django.core.exceptions import PermissionDenied from django.core.mail import send_mail @@ -134,9 +136,13 @@ def _create_user(self, username, email, password, **extra_fields): if not username: raise ValueError('The given username must be set') email = self.normalize_email(email) - username = self.model.normalize_username(username) + # Lookup the real model class from the global app registry so this + # manager method can be used in migrations. This is fine because + # managers are by definition working on the real model. + GlobalUserModel = apps.get_model(self.model._meta.app_label, self.model._meta.object_name) + username = GlobalUserModel.normalize_username(username) user = self.model(username=username, email=email, **extra_fields) - user.set_password(password) + user.password = make_password(password) user.save(using=self._db) return user diff --git a/django/contrib/auth/password_validation.py b/django/contrib/auth/password_validation.py index 61a482fdadb3..7beb4bdc0ff2 100644 --- a/django/contrib/auth/password_validation.py +++ b/django/contrib/auth/password_validation.py @@ -115,6 +115,36 @@ def get_help_text(self): ) % {'min_length': self.min_length} +def exceeds_maximum_length_ratio(password, max_similarity, value): + """ + Test that value is within a reasonable range of password. + + The following ratio calculations are based on testing SequenceMatcher like + this: + + for i in range(0,6): + print(10**i, SequenceMatcher(a='A', b='A'*(10**i)).quick_ratio()) + + which yields: + + 1 1.0 + 10 0.18181818181818182 + 100 0.019801980198019802 + 1000 0.001998001998001998 + 10000 0.00019998000199980003 + 100000 1.999980000199998e-05 + + This means a length_ratio of 10 should never yield a similarity higher than + 0.2, for 100 this is down to 0.02 and for 1000 it is 0.002. This can be + calculated via 2 / length_ratio. As a result we avoid the potentially + expensive sequence matching. + """ + pwd_len = len(password) + length_bound_similarity = max_similarity / 2 * pwd_len + value_len = len(value) + return pwd_len >= 10 * value_len and value_len < length_bound_similarity + + class UserAttributeSimilarityValidator: """ Validate whether the password is sufficiently different from the user's @@ -130,19 +160,25 @@ class UserAttributeSimilarityValidator: def __init__(self, user_attributes=DEFAULT_USER_ATTRIBUTES, max_similarity=0.7): self.user_attributes = user_attributes + if max_similarity < 0.1: + raise ValueError('max_similarity must be at least 0.1') self.max_similarity = max_similarity def validate(self, password, user=None): if not user: return + password = password.lower() for attribute_name in self.user_attributes: value = getattr(user, attribute_name, None) if not value or not isinstance(value, str): continue - value_parts = re.split(r'\W+', value) + [value] + value_lower = value.lower() + value_parts = re.split(r'\W+', value_lower) + [value_lower] for value_part in value_parts: - if SequenceMatcher(a=password.lower(), b=value_part.lower()).quick_ratio() >= self.max_similarity: + if exceeds_maximum_length_ratio(password, self.max_similarity, value_part): + continue + if SequenceMatcher(a=password, b=value_part).quick_ratio() >= self.max_similarity: try: verbose_name = str(user._meta.get_field(attribute_name).verbose_name) except FieldDoesNotExist: @@ -167,7 +203,7 @@ class CommonPasswordValidator: https://gist.github.com/roycewilliams/281ce539915a947a23db17137d91aeb7 The password list must be lowercased to match the comparison in validate(). """ - DEFAULT_PASSWORD_LIST_PATH = Path(__file__).resolve(strict=True).parent / 'common-passwords.txt.gz' + DEFAULT_PASSWORD_LIST_PATH = Path(__file__).resolve().parent / 'common-passwords.txt.gz' def __init__(self, password_list_path=DEFAULT_PASSWORD_LIST_PATH): try: diff --git a/django/contrib/auth/tokens.py b/django/contrib/auth/tokens.py index 15a3b0ce8801..c3863d1dea52 100644 --- a/django/contrib/auth/tokens.py +++ b/django/contrib/auth/tokens.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, time from django.conf import settings from django.utils.crypto import constant_time_compare, salted_hmac @@ -11,8 +11,14 @@ class PasswordResetTokenGenerator: reset mechanism. """ key_salt = "django.contrib.auth.tokens.PasswordResetTokenGenerator" - algorithm = 'sha256' - secret = settings.SECRET_KEY + algorithm = None + secret = None + + def __init__(self): + self.secret = self.secret or settings.SECRET_KEY + # RemovedInDjango40Warning: when the deprecation ends, replace with: + # self.algorithm = self.algorithm or 'sha256' + self.algorithm = self.algorithm or settings.DEFAULT_HASHING_ALGORITHM def make_token(self, user): """ @@ -30,6 +36,8 @@ def check_token(self, user, token): # Parse the token try: ts_b36, _ = token.split("-") + # RemovedInDjango40Warning. + legacy_token = len(ts_b36) < 4 except ValueError: return False @@ -49,8 +57,14 @@ def check_token(self, user, token): ): return False + # RemovedInDjango40Warning: convert days to seconds and round to + # midnight (server time) for pre-Django 3.1 tokens. + now = self._now() + if legacy_token: + ts *= 24 * 60 * 60 + ts += int((now - datetime.combine(now.date(), time.min)).total_seconds()) # Check the timestamp is within limit. - if (self._num_seconds(self._now()) - ts) > settings.PASSWORD_RESET_TIMEOUT: + if (self._num_seconds(now) - ts) > settings.PASSWORD_RESET_TIMEOUT: return False return True @@ -67,14 +81,14 @@ def _make_token_with_timestamp(self, user, timestamp, legacy=False): # legacy argument and replace with: # algorithm=self.algorithm, algorithm='sha1' if legacy else self.algorithm, - ).hexdigest()[::2] # Limit to 20 characters to shorten the URL. + ).hexdigest()[::2] # Limit to shorten the URL. return "%s-%s" % (ts_b36, hash_string) def _make_hash_value(self, user, timestamp): """ - Hash the user's primary key and some user state that's sure to change - after a password reset to produce a token that invalidated when it's - used: + Hash the user's primary key, email (if available), and some user state + that's sure to change after a password reset to produce a token that is + invalidated when it's used: 1. The password field will change upon a password reset (even if the same password is chosen, due to password salting). 2. The last_login field will usually be updated very shortly after @@ -88,7 +102,9 @@ def _make_hash_value(self, user, timestamp): # Truncate microseconds so that tokens are consistent even if the # database doesn't support microseconds. login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None) - return str(user.pk) + user.password + str(login_timestamp) + str(timestamp) + email_field = user.get_email_field_name() + email = getattr(user, email_field, '') or '' + return f'{user.pk}{user.password}{login_timestamp}{timestamp}{email}' def _num_seconds(self, dt): return int((dt - datetime(2001, 1, 1)).total_seconds()) diff --git a/django/contrib/auth/urls.py b/django/contrib/auth/urls.py index c3306807e5da..cd4af69a55bd 100644 --- a/django/contrib/auth/urls.py +++ b/django/contrib/auth/urls.py @@ -1,4 +1,4 @@ -# The views used below are normally mapped in django.contrib.admin.urls.py +# The views used below are normally mapped in the AdminSite instance. # This URLs file is used to provide a reliable view deployment for test purposes. # It is also provided as a convenience to those who want to deploy these URLs # elsewhere. diff --git a/django/contrib/contenttypes/__init__.py b/django/contrib/contenttypes/__init__.py index 9789f36eff61..e69de29bb2d1 100644 --- a/django/contrib/contenttypes/__init__.py +++ b/django/contrib/contenttypes/__init__.py @@ -1 +0,0 @@ -default_app_config = 'django.contrib.contenttypes.apps.ContentTypesConfig' diff --git a/django/contrib/contenttypes/admin.py b/django/contrib/contenttypes/admin.py index d1790258af7c..dd3e77c4c283 100644 --- a/django/contrib/contenttypes/admin.py +++ b/django/contrib/contenttypes/admin.py @@ -28,9 +28,7 @@ def _check_relation(self, obj, parent_model): if not gfks: return [ checks.Error( - "'%s.%s' has no GenericForeignKey." % ( - obj.model._meta.app_label, obj.model._meta.object_name - ), + "'%s' has no GenericForeignKey." % obj.model._meta.label, obj=obj.__class__, id='admin.E301' ) @@ -42,8 +40,8 @@ def _check_relation(self, obj, parent_model): except FieldDoesNotExist: return [ checks.Error( - "'ct_field' references '%s', which is not a field on '%s.%s'." % ( - obj.ct_field, obj.model._meta.app_label, obj.model._meta.object_name + "'ct_field' references '%s', which is not a field on '%s'." % ( + obj.ct_field, obj.model._meta.label, ), obj=obj.__class__, id='admin.E302' @@ -55,8 +53,8 @@ def _check_relation(self, obj, parent_model): except FieldDoesNotExist: return [ checks.Error( - "'ct_fk_field' references '%s', which is not a field on '%s.%s'." % ( - obj.ct_fk_field, obj.model._meta.app_label, obj.model._meta.object_name + "'ct_fk_field' references '%s', which is not a field on '%s'." % ( + obj.ct_fk_field, obj.model._meta.label, ), obj=obj.__class__, id='admin.E303' @@ -71,8 +69,8 @@ def _check_relation(self, obj, parent_model): return [ checks.Error( - "'%s.%s' has no GenericForeignKey using content type field '%s' and object ID field '%s'." % ( - obj.model._meta.app_label, obj.model._meta.object_name, obj.ct_field, obj.ct_fk_field + "'%s' has no GenericForeignKey using content type field '%s' and object ID field '%s'." % ( + obj.model._meta.label, obj.ct_field, obj.ct_fk_field, ), obj=obj.__class__, id='admin.E304' diff --git a/django/contrib/contenttypes/apps.py b/django/contrib/contenttypes/apps.py index 1a8e25b98e21..390afb3fcf95 100644 --- a/django/contrib/contenttypes/apps.py +++ b/django/contrib/contenttypes/apps.py @@ -12,6 +12,7 @@ class ContentTypesConfig(AppConfig): + default_auto_field = 'django.db.models.AutoField' name = 'django.contrib.contenttypes' verbose_name = _("Content Types") diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py index 3282fd6d4bee..4aa3ddaf98e1 100644 --- a/django/contrib/contenttypes/fields.py +++ b/django/contrib/contenttypes/fields.py @@ -70,8 +70,7 @@ def get_forward_related_filter(self, obj): def __str__(self): model = self.model - app = model._meta.app_label - return '%s.%s.%s' % (app, model._meta.object_name, self.name) + return '%s.%s' % (model._meta.label, self.name) def check(self, **kwargs): return [ @@ -277,6 +276,7 @@ class GenericRelation(ForeignObject): # Field flags auto_created = False + empty_strings_allowed = False many_to_many = False many_to_one = False @@ -295,6 +295,9 @@ def __init__(self, to, object_id_field='object_id', content_type_field='content_ limit_choices_to=limit_choices_to, ) + # Reverse relations are always nullable (Django can't enforce that a + # foreign key on the related model points to this model). + kwargs['null'] = True kwargs['blank'] = True kwargs['on_delete'] = models.CASCADE kwargs['editable'] = False @@ -339,9 +342,8 @@ def _check_generic_foreign_key_existence(self): return [ checks.Error( "The GenericRelation defines a relation with the model " - "'%s.%s', but that model does not have a GenericForeignKey." % ( - target._meta.app_label, target._meta.object_name - ), + "'%s', but that model does not have a GenericForeignKey." + % target._meta.label, obj=self, id='contenttypes.E004', ) diff --git a/django/contrib/contenttypes/forms.py b/django/contrib/contenttypes/forms.py index de1fcaf4bb83..92a58d49f8c9 100644 --- a/django/contrib/contenttypes/forms.py +++ b/django/contrib/contenttypes/forms.py @@ -56,7 +56,8 @@ def generic_inlineformset_factory(model, form=ModelForm, extra=3, can_order=False, can_delete=True, max_num=None, formfield_callback=None, validate_max=False, for_concrete_model=True, - min_num=None, validate_min=False): + min_num=None, validate_min=False, + absolute_max=None, can_delete_extra=True): """ Return a ``GenericInlineFormSet`` for the given kwargs. @@ -75,6 +76,7 @@ def generic_inlineformset_factory(model, form=ModelForm, formset=formset, extra=extra, can_delete=can_delete, can_order=can_order, fields=fields, exclude=exclude, max_num=max_num, validate_max=validate_max, min_num=min_num, validate_min=validate_min, + absolute_max=absolute_max, can_delete_extra=can_delete_extra, ) FormSet.ct_field = ct_field FormSet.ct_fk_field = fk_field diff --git a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo index 7165259e29aa..612d4a03ae57 100644 Binary files a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po index e587fb12d91e..afebdd78b1ca 100644 --- a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po @@ -4,13 +4,15 @@ # Bashar Al-Abdulhadi, 2014 # Jannis Leidel , 2011 # AlMeer , 2014 +# Muaaz Alsaied, 2020 +# صفا الفليج , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-06 19:57+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,25 +22,25 @@ msgstr "" "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" msgid "Content Types" -msgstr "نوع المحتوى" +msgstr "أنواع المحتوى" msgid "python model class name" -msgstr "اسم صنف النموذج في python" +msgstr "اسم صنف النموذج في بايثون" msgid "content type" -msgstr "نوع البيانات" +msgstr "نوع المحتوى" msgid "content types" -msgstr "أنواع البيانات" +msgstr "أنواع المحتوى" #, python-format msgid "Content type %(ct_id)s object has no associated model" -msgstr "لا يوجد كائن مرتبط بنوع البيانات %(ct_id)s ." +msgstr "ليس لكائن نوع المحتوى %(ct_id)s أيّ نموذج مرتبط" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "نوع المحتوى %(ct_id)s الكائن %(obj_id)s غير موجود" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "كائن نوع المحتوى %(ct_id)s بالمعرّف %(obj_id)s غير موجود" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "%(ct_name)s كائن لا يحتوي على دالة get_absolute_url() ." +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "ليس لكائنات %(ct_name)s الدالة التابِعة get_absolute_url()‎" diff --git a/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..fc230cafded9 Binary files /dev/null and b/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..276a4d46c01f --- /dev/null +++ b/django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,43 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-12-14 18:35+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "Content Types" +msgstr "نوع المحتوى" + +msgid "python model class name" +msgstr "اسم صنف النموذج في python" + +msgid "content type" +msgstr "نوع البيانات" + +msgid "content types" +msgstr "أنواع البيانات" + +#, python-format +msgid "Content type %(ct_id)s object has no associated model" +msgstr "لا يوجد كائن مرتبط بنوع البيانات %(ct_id)s ." + +#, python-format +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "نوع المحتوى %(ct_id)s الكائن %(obj_id)s غير موجود" + +#, python-format +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "%(ct_name)s كائن لا يحتوي على دالة get_absolute_url() ." diff --git a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo index c2463747b49b..2a67471a8910 100644 Binary files a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po index c8f4d01bf417..5d6f7f3cd770 100644 --- a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Carles Barrobés , 2012,2014 # Jannis Leidel , 2011 +# Manel Clos , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-28 20:05+0000\n" +"Last-Translator: Manel Clos \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -35,9 +36,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "L'objecte del tipus de contingut %(ct_id)s no té un model associat" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "L'objecte %(obj_id)s del tipus de contingut %(ct_id)s no existeix" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Els objectes %(ct_name)s no tenen un mètode get_absolute_url()" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "Els objectes %(ct_name)s no tenen el mètode get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.mo index ee13b655cd05..3ecc0644725e 100644 Binary files a/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.po index 1fd20e22dbc4..fa401653e68f 100644 --- a/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/dsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016 +# Michael Wolf , 2016,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 00:02+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-25 16:03+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -35,9 +35,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Objekt wopśimjeśowego typa %(ct_id)s njama zwězany model" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "Objekt %(obj_id)s wopśimjeśowego typa %(ct_id)s njeeksistěrujo" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "Objekty %(ct_name)s njamaju metodu get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo index d0df2705a8a9..d49b9f65db46 100644 Binary files a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po index 21021574a3c7..fc107e8f00b1 100644 --- a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po @@ -4,13 +4,13 @@ # Jannis Leidel , 2011 # Nikolas Demiridis , 2014 # Pãnoș , 2014 -# Pãnoș , 2016 +# Pãnoș , 2016,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-04 07:05+0000\n" "Last-Translator: Pãnoș \n" "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n" "MIME-Version: 1.0\n" @@ -37,9 +37,9 @@ msgstr "" "Το αντικείμενο %(ct_id)s τύπου περιεχομένου δεν έχει συσχετισμένο μοντέλο" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "Το αντικείμενο %(obj_id)s τύπου περιεχομένου %(ct_id)s δεν υπάρχει" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "τα αντικείμενα %(ct_name)s δεν έχουν μέθοδο get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo index 016cd05d638f..5bdc5a24e242 100644 Binary files a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po index 80ac42cc9d0c..dd7398ba6731 100644 --- a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po @@ -4,13 +4,14 @@ # Antoni Aloy , 2012 # Jannis Leidel , 2011 # Josue Naaman Nistal Guerra , 2014 +# Uriel Medina , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-09-25 17:13+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -37,9 +38,9 @@ msgstr "" "El objeto de tipo de contenido %(ct_id)s no tiene ningún modelo asociado." #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "El objeto de tipo de contenido %(ct_id)s objeto %(obj_id)s no existe" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "El tipo de contenido %(ct_id)s del objeto %(obj_id)s no existe" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "El objeto %(ct_name)s no tiene un método get_absolute_url () " +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "%(ct_name)s objetos no tienen un método get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo index 9b0ec57ddd59..c11cd46a30b8 100644 Binary files a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po index 55b01ebd1d4c..f4bea178429c 100644 --- a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # Translators: # Ali Nikneshan , 2012 # Jannis Leidel , 2011 +# rahim agh , 2020 # Reza Mohammadi , 2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-27 09:31+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -36,9 +37,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "نوع محتوای %(ct_id)s به هیچ مدلی مرتبط نشده است" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "نوع محتوای %(ct_id)s شیی %(obj_id)s وجود ندارد" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "شیء %(obj_id)s از نمونه محتوای %(ct_id)s وجود ندارد" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr " اشیای %(ct_name)s متد get_absolute_url()‎ را ندارند" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "شیء %(ct_name)s متد get_absolute_url() را ندارد" diff --git a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo index 74353a91649f..af15679aa6ec 100644 Binary files a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po index ecf1ba3abe55..ea4db91272c1 100644 --- a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015 +# Aarni Koskela, 2015,2020 # Jannis Leidel , 2011 # Klaus Dahlén , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-12-09 06:31+0000\n" "Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" @@ -36,9 +36,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Sisältötyypin %(ct_id)s objektiin ei ole liitetty mallia" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "Sisältötyypin %(ct_id)s objektia %(obj_id)s ei ole olemassa" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "%(ct_name)s-objekteilla ei ole get_absolute_url()-metodia" diff --git a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo index 861f60ec2c2a..0bcdcd3bad8c 100644 Binary files a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po index 8008a69542f8..43bd82eeae82 100644 --- a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# Meir Kriheli , 2012,2014 +# Meir Kriheli , 2012,2014,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-08-02 13:30+0000\n" +"Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,9 +35,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "לא משוייך מודל לאובייקט מסוג התוכן %(ct_id)s" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "אובייקט %(obj_id)s מסוג תוכן %(ct_id)s אינו קיים" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "סוג תוכן %(ct_id)s אובייקט %(obj_id)s אינו קיים" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "אובייקטי %(ct_name)s אינם כוללים מתודת get_absolute_url()" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "אובייקטי %(ct_name)s אינם כוללים מתודת get_absolute_url()‎" diff --git a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo index f9b2faa72a73..ea0373efda47 100644 Binary files a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po index d5738c656f01..c6db9d478dd4 100644 --- a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Fery Setiawan , 2020 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 # rodin , 2011-2012 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: rodin \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-06 02:33+0000\n" +"Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -37,9 +38,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Tipe konten objek %(ct_id)s tidak memiliki model yang terkait" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "Tipe konten %(ct_id)s objek %(obj_id)s tidak ada" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "Jenis isi %(ct_id)s object %(obj_id)s tidak ada" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Objek %(ct_name)s tidak memiliki metode get_absolute_url()" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "objek %(ct_name)s tidak memiliki metode get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo index 1f12b9a402a2..97eb95ca1197 100644 Binary files a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po index 6834c8558568..a691279f1067 100644 --- a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # Translators: # Hafsteinn Einarsson , 2012 # Jannis Leidel , 2011 -# Thordur Sigurdsson , 2016 +# Thordur Sigurdsson , 2016,2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-11-20 05:05+0000\n" "Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" @@ -36,9 +36,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Gerð innihalds %(ct_id)s hefur ekkert tengt módel" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "Gerð innihalds %(ct_id)s hlutar %(obj_id)s er ekki til" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "%(ct_name)s hlutir hafa ekki get_absolute_url () aðferð" diff --git a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo index fa1a9e462f3f..dcdb640489e4 100644 Binary files a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po index c66c3a0d2319..8984cb0d4364 100644 --- a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po @@ -3,15 +3,16 @@ # Translators: # Jannis Leidel , 2011 # Marco Bonetti, 2014 +# Mirco Grillo , 2020 # Nicola Larosa , 2012 # Stefano Brentegani , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: palmux \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-23 09:00+0000\n" +"Last-Translator: Mirco Grillo \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -37,9 +38,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "L'oggetto con content type %(ct_id)s non ha alcun modello associato" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "L'oggetto %(obj_id)s con content type %(ct_id)s non esiste" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "Gli oggetti %(ct_name)s non hanno un metodo get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo index dfb334ac81ce..7a0ce28217a7 100644 Binary files a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po index 3519a4419294..af298397a1ae 100644 --- a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Jannis Leidel , 2011 # Shinya Okano , 2012,2014 +# Takuya N , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-07 16:03+0000\n" +"Last-Translator: Takuya N \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -37,10 +38,10 @@ msgstr "" "せん" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "コンテンツタイプ %(ct_id)s のオブジェクト %(obj_id)s は存在しません" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "" "%(ct_name)s のオブジェクトは get_absolute_url() メソッドを持っていません" diff --git a/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..f9cd08109cf6 Binary files /dev/null and b/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..9c6495aba2c1 --- /dev/null +++ b/django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,42 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-23 06:00+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Content Types" +msgstr "Мазмун түрү" + +msgid "python model class name" +msgstr "питон модел класс ысымы" + +msgid "content type" +msgstr "мазмун түрү" + +msgid "content types" +msgstr "мазмун түрлөрү" + +#, python-format +msgid "Content type %(ct_id)s object has no associated model" +msgstr "%(ct_id)s мазмун түрүнүн өзүнө байланышкан модели жок." + +#, python-format +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "%(ct_id)sмазмун түрүнүн %(obj_id)sобектисинде жашабайт." + +#, python-format +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "%(ct_name)sобекттеринде get_absolute_url() ыкмасы жок" diff --git a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo index 7ed00f87398e..eec927d73300 100644 Binary files a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po index 77175d74c636..26b3adf52805 100644 --- a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po @@ -2,16 +2,17 @@ # # Translators: # Allisson Azevedo , 2014 -# Carlos E C Leite - Cadu , 2016,2019 +# Carlos C. Leite , 2016,2019 # semente, 2012 # Jannis Leidel , 2011 +# Rafael Fontenelle , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-09 16:05+0000\n" -"Last-Translator: Carlos E C Leite - Cadu \n" +"PO-Revision-Date: 2021-01-17 06:36+0000\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -38,8 +39,8 @@ msgstr "Objeto do tipo de conteúdo %(ct_id)s não tem nenhum model associado" #, python-format msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" -msgstr "O objeto %(obj_id)s do Content Type %(ct_id)s não existe." +msgstr "O objeto %(obj_id)s do tipo de conteúdo %(ct_id)s não existe." #, python-format msgid "%(ct_name)s objects don’t have a get_absolute_url() method" -msgstr "os objetos %(ct_name)s não tem o método get_absolute_url()." +msgstr "os objetos %(ct_name)s não têm o método get_absolute_url()." diff --git a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo index 2a8806fa439b..27f7ed2f06a7 100644 Binary files a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po index 5c3e70e0bd22..0d36e2aea8e5 100644 --- a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Eugene MechanisM , 2012 +# Eugene , 2012 +# crazyzubr , 2020 # Jannis Leidel , 2011 # Алексей Борискин , 2012,2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Eugene MechanisM \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-14 18:22+0000\n" +"Last-Translator: crazyzubr \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -38,11 +39,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Тип содержимого %(ct_id)s не имеет связанной модели" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "" -"Объект с идентификатором %(obj_id)s, имеющий тип содержимого %(ct_id)s, не " -"существует" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "Объекта типа %(ct_id)s с идентификатором %(obj_id)s не существует" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" msgstr "Объекты типа \"%(ct_name)s\" не имеют метода get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..8f0140d489a6 Binary files /dev/null and b/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..9150d449e3d8 --- /dev/null +++ b/django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,41 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-15 00:27+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Content Types" +msgstr "Намуди контент" + +msgid "python model class name" +msgstr "номи класси модел" + +msgid "content type" +msgstr "намуди контент" + +msgid "content types" +msgstr "намуди контентҳо" + +#, python-format +msgid "Content type %(ct_id)s object has no associated model" +msgstr "Намуди контенти %(ct_id)s модели алоқаманд надорад" + +#, python-format +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "" + +#, python-format +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "" diff --git a/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..0bafb0705430 Binary files /dev/null and b/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.po new file mode 100644 index 000000000000..44d8f8060d5b --- /dev/null +++ b/django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.po @@ -0,0 +1,42 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Resulkary , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-07 20:28+0000\n" +"Last-Translator: Resulkary \n" +"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"tk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tk\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Content Types" +msgstr "Mazmunyň görnüşleri" + +msgid "python model class name" +msgstr "python model synpynyň ady" + +msgid "content type" +msgstr "mazmunyň görnüşi" + +msgid "content types" +msgstr "mazmunyň görnüşleri" + +#, python-format +msgid "Content type %(ct_id)s object has no associated model" +msgstr "Mazmun görnüşi %(ct_id)s obýekti bilen baglanyşykly model ýok" + +#, python-format +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "Mazmun görnüşi %(ct_id)s %(obj_id)s ýok" + +#, python-format +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "%(ct_name)s obýektlerde get_absolute_url() metody ýok" diff --git a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po index 0b956aef2bd7..b33b267ebad3 100644 --- a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # BouRock, 2019 # BouRock, 2014 # Jannis Leidel , 2011 -# Murat Çorlu , 2012 +# Murat Çorlu , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" diff --git a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo index 028d4ce10d84..5ca84fad7ec5 100644 Binary files a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po index d7af4ce16d79..a798bb1078f5 100644 --- a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Oleksandr Chernihov , 2014 +# Illia Volochii , 2021 # Jannis Leidel , 2011 # Sergey Lysach , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-20 00:17+0000\n" +"Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -23,10 +24,10 @@ msgstr "" "(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" msgid "Content Types" -msgstr "Content Types" +msgstr "Типи вмісту" msgid "python model class name" -msgstr "ім'я класу моделі" +msgstr "імʼя класу моделі" msgid "content type" msgstr "тип вмісту" @@ -39,10 +40,10 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Тип вмісту %(ct_id)s не має пов'язанної моделі" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "" -"Об'єкт з ідентифікатором %(ct_id)s, що має тип вмісту %(obj_id)s не існує" +"Обʼєкт з ідентифікатором %(ct_id)s, що має тип вмісту %(obj_id)s не існує" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Об'єкт типу %(ct_name)s не має методу get_absolute_url()" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "Обʼєкт типу %(ct_name)s не має методу get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.mo index 78be1a30f74c..7f9dc8cc25bc 100644 Binary files a/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.po index b6f4f7d0c4ae..2acb647d8f4b 100644 --- a/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,16 +2,17 @@ # # Translators: # Jannis Leidel , 2011 -# Ronald White , 2014 +# Ronald White , 2014 # slene , 2011 +# wolf ice , 2020 # Kevin Sze , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-03-04 02:33+0000\n" +"Last-Translator: wolf ice \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -37,9 +38,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "内容类型 %(ct_id)s 对象没有关联的模型" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "内容类型 %(ct_id)s 对象 %(obj_id)s 不存在" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "内容类型%(ct_id)s对象%(obj_id)s不存在" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "%(ct_name)s 对象没有 a get_absolute_url() 方法" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "%(ct_name)s对象不包含get_absolute_url()方法" diff --git a/django/contrib/contenttypes/management/commands/__init__.py b/django/contrib/contenttypes/management/commands/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/contrib/flatpages/__init__.py b/django/contrib/flatpages/__init__.py index 865acd855b51..e69de29bb2d1 100644 --- a/django/contrib/flatpages/__init__.py +++ b/django/contrib/flatpages/__init__.py @@ -1 +0,0 @@ -default_app_config = 'django.contrib.flatpages.apps.FlatPagesConfig' diff --git a/django/contrib/flatpages/apps.py b/django/contrib/flatpages/apps.py index 330ee0506362..4f5ef17004c5 100644 --- a/django/contrib/flatpages/apps.py +++ b/django/contrib/flatpages/apps.py @@ -3,5 +3,6 @@ class FlatPagesConfig(AppConfig): + default_auto_field = 'django.db.models.AutoField' name = 'django.contrib.flatpages' verbose_name = _("Flat Pages") diff --git a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo index e8d5f55f6210..be793dec01d2 100644 Binary files a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po index 8d576b636c16..984d77d21fbb 100644 --- a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Bashar Al-Abdulhadi, 2014 # Eyad Toma , 2013 # Jannis Leidel , 2011 +# Muaaz Alsaied, 2020 # Ossama Khayat , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Bashar Al-Abdulhadi\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-02 11:30+0000\n" +"Last-Translator: Muaaz Alsaied\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +32,8 @@ msgid "URL" msgstr "رابط" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "مثال: '/about/contact/'. تأكد من وضع شرطات في البداية والنهاية." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "مثال: “/about/contact/”. تأكد من وضع فواصل مائلة في البداية والنهاية." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -40,6 +41,9 @@ msgid "" msgstr "" "يجب أن تحتوي هذه القيمة الأحرف والأرقام والنقاط وعلامات _ و - و / أو ~ فقط." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "مثال: “/about/contact/”. تأكد من وضع فواصل مائلة في البداية." + msgid "URL is missing a leading slash." msgstr "العنوان URL يفقد رمز / في بدايته." @@ -63,10 +67,10 @@ msgid "template name" msgstr "اسم القالب" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"مثال: 'flatpages/contact_page.html'. إن لم تكن الصفحة موجودة، فسوف يستخدم " +"مثال: “flatpages/contact_page.html”. إن لم يكن هذا موجوداً، فسوف يستخدم " "النظام 'flatpages/default.html'." msgid "registration required" diff --git a/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..e494972273c5 Binary files /dev/null and b/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..8e87c9b98973 --- /dev/null +++ b/django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,87 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-12-14 18:57+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "Advanced options" +msgstr "خيارات متقدمة" + +msgid "Flat Pages" +msgstr "صفحات مسطحة" + +msgid "URL" +msgstr "رابط" + +msgid "" +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "مثال: '/about/contact/'. تأكد من وضع شرطات في البداية والنهاية." + +msgid "" +"This value must contain only letters, numbers, dots, underscores, dashes, " +"slashes or tildes." +msgstr "" +"يجب أن تحتوي هذه القيمة الأحرف والأرقام والنقاط وعلامات _ و - و / أو ~ فقط." + +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "مثال: '/about/contact/'. تأكد من وضع شرطات في البداية." + +msgid "URL is missing a leading slash." +msgstr "العنوان URL يفقد رمز / في بدايته." + +msgid "URL is missing a trailing slash." +msgstr "العنوان URL يفقد رمز / في نهايته." + +#, python-format +msgid "Flatpage with url %(url)s already exists for site %(site)s" +msgstr "الصفحة ذو العنوان %(url)s موجودة سابقاً في موقع %(site)s" + +msgid "title" +msgstr "العنوان" + +msgid "content" +msgstr "المحتوى" + +msgid "enable comments" +msgstr "السماح بالتعليقات" + +msgid "template name" +msgstr "اسم القالب" + +msgid "" +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." +msgstr "" +"مثال: 'flatpages/contact_page.html'. إن لم تكن الصفحة موجودة، فسوف يستخدم " +"النظام 'flatpages/default.html'." + +msgid "registration required" +msgstr "التسجيل مطلوب" + +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"إذا كان هذا الخيار محددا، فإن المستخدمين الداخلين فقط سيتمكنون من مشاهدة " +"الصفحة." + +msgid "sites" +msgstr "المواقع" + +msgid "flat page" +msgstr "صفحة مسطحة" + +msgid "flat pages" +msgstr "صفحات مسطحة" diff --git a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo index bebf1fbffd57..9d5dcc1ea659 100644 Binary files a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po index 3a75b896fd83..ff25561c3ff0 100644 --- a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Carles Barrobés , 2012,2014 # Gil Obradors Via , 2019 # Jannis Leidel , 2011 +# Manel Clos , 2020 # Roger Pons , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-29 07:52+0000\n" -"Last-Translator: Gil Obradors Via \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-28 20:26+0000\n" +"Last-Translator: Manel Clos \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -31,7 +32,7 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" "Exemple: '/about/contact/'. Assegureu-vos de posar les barres al principi i " "al final." @@ -43,8 +44,9 @@ msgstr "" "Aquest valor sols pot contenir lletres, nombres, punts, subratllats, guions, " "barres o accents." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "Exemple: '/quanta/contacte'. Assegura l'última barra inversa" +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "" +"Exemple: '/about/contact/'. Assegureu-vos de posar la barra al principi." msgid "URL is missing a leading slash." msgstr "La URL no comença amb \"/\"." @@ -69,8 +71,8 @@ msgid "template name" msgstr "nom de la plantilla" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" "Exemple: 'flatpages/contact_page.html'. Si no es proporciona, el sistema " "utilitzarà 'flatpages/default.html'." diff --git a/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.mo index 54861984c96a..61c6eb0f33d4 100644 Binary files a/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.po index 43d190a768a7..c6fc553f88d1 100644 --- a/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/dsb/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016,2019 +# Michael Wolf , 2016,2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 10:23+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-25 16:06+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -28,10 +28,10 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Pśikład: '/about/contact/'. Pśeznańśo se, až sćo wócynjajucu a zacynjajucu " -"nakósnu smužku pódał." +"Pśikład: „/about/contact/“. Pśeznańśo se, až sćo pódał wócynjajucu a " +"zacynjajucu nakósnu smužku." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -40,9 +40,9 @@ msgstr "" "Toś ta gódnota smějo jano pismiki, licby, dypki, pódsmužki, , wězawki, " "nakósne smužki abo tildy wopśimowaś." -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "" -"Pśikład: '/about/contact'. Pśeznańśo se, až maśo wjeducu nakósnu smužku." +"Pśikład: „/about/contact“. Pśeznańśo se, až maśo wjeducu nakósnu smužku." msgid "URL is missing a leading slash." msgstr "URL njama wócynjajucu nakósnu smužku." @@ -67,11 +67,11 @@ msgid "template name" msgstr "mě pśedłogi" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Pśikład: 'flatpages/contact_page.html'. Jolic to njejo pódane, buźo system " -"'flatpages/default.html' wužywaś." +"Pśikład: „flatpages/contact_page.html“. Jolic to njejo pódane, buźo system " +"„flatpages/default.html“ wužywaś." msgid "registration required" msgstr "registrěrowanje trěbne" diff --git a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo index 82829ab3ecd6..19f2a2d62d42 100644 Binary files a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po index 4c8e79aadcc2..151f971ba44d 100644 --- a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Baptiste Darthenay , 2011-2012 -# Baptiste Darthenay , 2014-2015,2017,2019 +# Batist D 🐍 , 2011-2012 +# Batist D 🐍 , 2014-2015,2017,2019 +# Matthieu Desplantes , 2021 # Robin van der Vliet , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-04 21:33+0000\n" -"Last-Translator: Robin van der Vliet \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-04-13 08:09+0000\n" +"Last-Translator: Matthieu Desplantes \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -29,9 +30,10 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Ekzemplo: '/pri/kontakto/'. Certigu, ke estas kondukaj kaj sekvaj strekoj." +"Ekzemple: “/about/contact/”. Certigu, ke estas suprenstrekoj komence kaj " +"fine." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -40,8 +42,8 @@ msgstr "" "Ĉi tiu valoro devus enhavi sole leterojn, nombrojn, punktojn, substrekoj, " "haltostrekoj, oblikvoj aŭ tildoj." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "Ekzemple: “/pri-ni/kontakto”. Certiĝu, ke ekas per oblikva streko." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "Ekzemple: “/about/contact”. Certigu, ke estas suprenstreko komence." msgid "URL is missing a leading slash." msgstr "La streka signo \"/\" ne ĉeestas en komenco de ĉeno." @@ -66,11 +68,9 @@ msgid "template name" msgstr "ŝablono nomo" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Ekzemplo: 'flatpages/contact_page.html'. Se ĉi tiu ne provizas, la sistemo " -"uzos 'flatpages/default.html'." msgid "registration required" msgstr "registrado postulita" diff --git a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo index d6249af96bef..33d67b0714ea 100644 Binary files a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po index 886f65f6808e..060a38578aea 100644 --- a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po @@ -2,18 +2,19 @@ # # Translators: # Antoni Aloy , 2011-2012 -# Ernesto Avilés Vázquez , 2015 -# Ernesto Avilés Vázquez , 2014 +# Ernesto Avilés, 2015 +# Ernesto Avilés, 2014 # Ignacio José Lizarán Rus , 2019 # Jannis Leidel , 2011 +# Uriel Medina , 2020 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 08:53+0000\n" -"Last-Translator: Ignacio José Lizarán Rus \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-09-25 17:43+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -32,9 +33,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al " +"Ejemplo: “/about/contact/”. Asegúrese de tener barras al principio y al " "final." msgid "" @@ -44,10 +45,8 @@ msgstr "" "Este valor solo puede contener letras, números, puntos, guiones bajos o " "medios, barras o tildes." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "" -"Ejemplo: '/about/contact'. Asegúrese de que pone una barra oblicua al " -"principio." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "Ejemplo: \"/about/contact”. Asegúrese de tener una barra al principio." msgid "URL is missing a leading slash." msgstr "A la URL le falta la barra inicial." @@ -57,7 +56,7 @@ msgstr "A la URL le falta la barra final." #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr " En el sitio %(site)s ya hay un Flatpage con la url %(url)s" +msgstr " En el sitio %(site)s ya hay una pagina estática con la url %(url)s" msgid "title" msgstr "título" @@ -72,14 +71,14 @@ msgid "template name" msgstr "nombre de plantilla" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Ejemplo: 'flatpages/contact_page.html'. Si no se proporciona uno, el sistema " -"usará 'flatpages/default.html'." +"Ejemplo: \"flatpages/contact_page.html\". Si no se proporciona, el sistema " +"utilizará \"flatpages/default.html\"." msgid "registration required" -msgstr "debe estar registrado" +msgstr "Se requiere registro" msgid "If this is checked, only logged-in users will be able to view the page." msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página." diff --git a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo index 091b0afc48bb..d884e7eb4131 100644 Binary files a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po index 0412ace95b8a..cf0477c05b1a 100644 --- a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po @@ -3,22 +3,24 @@ # Translators: # Ali Nikneshan , 2011-2012 # Ali Vakilzade , 2015 +# Fariman Ghaedi , 2019 # Jannis Leidel , 2011 +# rahim agh , 2021 # Reza Mohammadi , 2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Mohammad Hossein Mojtahedi \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-04-19 03:16+0000\n" +"Last-Translator: rahim agh \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fa\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Advanced options" msgstr "گزینه‌های پیشرفته" @@ -30,7 +32,7 @@ msgid "URL" msgstr "نشانی اینترنتی" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" "مثال: '/about/contact/'. مطمئن شوید که اسلش را هم در ابتدا و هم در انتها " "گذاشته‌اید." @@ -40,6 +42,9 @@ msgid "" "slashes or tildes." msgstr "این مقدار فقط باید حاوی حروف، اعداد، خط زیر، خط تیره و یا اسلش باشد." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "مثال: 'about/contact/'. مطمئن شوید که یک اسلش در ابتدا وجود دارد. " + msgid "URL is missing a leading slash." msgstr "در آدرس اسلش آغازین فراموش شده است." @@ -63,8 +68,8 @@ msgid "template name" msgstr "نام قالب" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" "مثال: 'flatpages/contact_page.html'. اگر این مشخص نشود، سیستم از 'flatpages/" "default.html' استفاده خواهد کرد." diff --git a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo index dcb70356fceb..c71b4ec4b7af 100644 Binary files a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po index df95fb4d52cb..789cd92d4231 100644 --- a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015 +# Aarni Koskela, 2015,2020 # Jannis Leidel , 2011 # Klaus Dahlén , 2012 # Ville Säävuori , 2011 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-12-09 06:32+0000\n" "Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" @@ -30,9 +30,9 @@ msgid "URL" msgstr "URL-osoite" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Esimerkki: '/tietoja/yhteystiedot/'. Varmista, että sekä alussa että lopussa " +"Esimerkki: '/tietoja/yhteystiedot/'. Varmista että sekä alussa että lopussa " "on kauttaviiva." msgid "" @@ -42,6 +42,10 @@ msgstr "" "Tämä arvo saa sisältää vain kirjaimia, numeroita, pisteitä sekä ala-, tavu-, " "kautta- ja aaltoviivoja." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "" +"Esimerkki: \"/tietoja/yhteystiedot/\". Varmista että alussa on kauttaviiva." + msgid "URL is missing a leading slash." msgstr "URL:n alusta puuttuu kauttaviiva." @@ -65,11 +69,11 @@ msgid "template name" msgstr "mallipohjan nimi" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Esimerkiksi: 'flatpages/yhteydenotto.html'. Jos tämä jätetään tyhjäksi, " -"käytetään oletuspohjaa 'flatpages/default.html'." +"Esimerkiksi: \"flatpages/yhteydenotto.html'\" Jos tämä jätetään tyhjäksi, " +"käytetään oletuspohjaa \"flatpages/default.html\"." msgid "registration required" msgstr "vaaditaan rekisteröityminen" diff --git a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo index 4fb58e41ab38..4d5347ee737c 100644 Binary files a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po index ef4a19775ccc..e703c63a16c4 100644 --- a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Alex Gaynor , 2011 +# 534b44a19bf18d20b71ecc4eb77c572f_db336e9 , 2011 # Jannis Leidel , 2011 -# Meir Kriheli , 2012,2014-2015,2019 +# Meir Kriheli , 2012,2014-2015,2019-2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-03-19 16:25+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-08-02 13:26+0000\n" "Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" @@ -29,9 +29,8 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"לדוגמא: '/about/contact/'. יש לוודא הימצאות הקווים הנטויים בהתחלה ובסוף." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "דוגמה: “/about/contact/”. יש לוודא שמכיל קווים נטויים בהתחלה ובסוף." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -40,8 +39,8 @@ msgstr "" "הערך הזאת חייב להכיל רק אותיות, מספרים, נקודות, מקפים, קווים תחתונים, חתכים " "או סימני טילדה בלבד." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "לדוגמה:‏ '‎/about/contact'. יש לוודא הימצאות הקו הנטוי בהתחלה." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "דוגמה: “‎/about/contact”. יש לוודא שמכיל קו נטוי בהתחלה." msgid "URL is missing a leading slash." msgstr "חסר קו נטוי בתחילת URL." @@ -66,11 +65,11 @@ msgid "template name" msgstr "שם תבנית" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"דוגמא: 'flatpages/contact_page.html'. אם לא צויין, המערכת תשתמש ב-'flatpages/" -"default.html'." +"דוגמה: “flatpages/contact_page.html”. אם לא צוין, המערכת תשתמש ב־“flatpages/" +"default.html”." msgid "registration required" msgstr "הרשמה נדרשת" diff --git a/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.mo index 3af36d04ee24..b8111a21b4df 100644 Binary files a/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.po index 91678cae6b10..3df5cab27656 100644 --- a/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/hsb/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-03-04 13:53+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-09-21 19:28+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -28,7 +28,7 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" "Přikład: '/about/contact/'. Přeswědčće so, zo sće wočinjace a začinjace " "nakósne smužki podał." @@ -40,7 +40,7 @@ msgstr "" "Tuta hódnota smě jenož pismiki, ličby, dypki, podsmužki, wjazawki, nakósne " "smužki abo tildy wobsahować." -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "Přikład: 'about/contact'. Zawěsćće, zo maće nawodnu nakósnu smužku." msgid "URL is missing a leading slash." @@ -66,8 +66,8 @@ msgid "template name" msgstr "mjeno předłohi" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" "Přikład: 'flatpages/contact_page.html'. Jeli to njeje podate, budźe system " "'flatpages/default.html' wužiwać." diff --git a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo index f4ee27758098..4426268ea741 100644 Binary files a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po index b8b3527a51a4..9057580f4277 100644 --- a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Fery Setiawan , 2015-2016,2019 +# Fery Setiawan , 2015-2016,2019-2020 # Jannis Leidel , 2011 # rodin , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-26 23:58+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-06 02:33+0000\n" "Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" @@ -29,10 +29,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Contoh: '/about/contact/'. Pastikan dimulai dan diakhiri dengan garis miring " -"(/)." +"Contoh: “/about/contact/”. Pastikan memiliki awalan dan akhiran garis miring." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -41,8 +40,8 @@ msgstr "" "Nilai hanya hanya dapat berisi huruf, angka, titik, garis bawah, tanda " "minus, garis miring, atau tanda tilde." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "Contoh: '/about/contact'. Pastikan anda memiliki awalan garis miring." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "Contoh: “/about/contact”. Pastikan memiliki awalan garis miring." msgid "URL is missing a leading slash." msgstr "Tidak ada garis miring awal pada URL." @@ -67,11 +66,11 @@ msgid "template name" msgstr "nama templat" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Contoh: 'flatpages/contact_page.html'. Jika tidak tersedia, sistem akan " -"menggunakan 'flatpages/default.html'." +"Contoh: “flatpages/contact_page.html”. Jika tidak disediakan, sistem akan " +"menggunakan “flatpages/default.html”." msgid "registration required" msgstr "pendaftaran diwajibkan" diff --git a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo index 9f0f539b453f..7bc06b2e2ded 100644 Binary files a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po index 2a50f97a8d05..606a8d2dacbc 100644 --- a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Carlo Miron , 2019 # Jannis Leidel , 2011 # Marco Bonetti, 2014 -# palmux , 2015 +# Mirco Grillo , 2020 +# palmux , 2015,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-19 10:31+0000\n" -"Last-Translator: Carlo Miron \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-15 16:01+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -30,10 +31,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Esempio: '/about/contact/'. Assicurati di inserire le barre diagonali " -"iniziali e finali." +"Per esempio: '/about/contact'. Assicurati che inizi e finisca con uno slash." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -42,7 +42,7 @@ msgstr "" "Questo valore deve contenere solo lettere, numeri, punti, underscore, " "trattini, barre diagonali o tilde." -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "Per esempio: '/about/contact'. Assicurati che inizi con uno slash." msgid "URL is missing a leading slash." @@ -68,11 +68,11 @@ msgid "template name" msgstr "nome template" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Esempio: 'flatpages/contact_page.html'. Se non specificato, il sistema userà " -"'flatpages/default.html'." +"Esempio: \"flatpages/contact_page.html\". Se non specificato, il sistema " +"userà \"flatpages/default.html\"." msgid "registration required" msgstr "registrazione obbligatoria" diff --git a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo index 61e4b0307fd0..6369ad4e4ab4 100644 Binary files a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po index cd18b2a604e0..67b7abd90e0f 100644 --- a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Jannis Leidel , 2011 # Shinichi Katsumata , 2019 # Shinya Okano , 2012,2014-2015 +# Takuya N , 2020 # Tetsuya Morimoto , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-01-19 06:54+0000\n" -"Last-Translator: Shinichi Katsumata \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-07 16:07+0000\n" +"Last-Translator: Takuya N \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -30,9 +31,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"例: '/about/contact/'. 先頭と最後にスラッシュがあるか確認してください。" +"例: “/about/contact/”. 先頭と最後にスラッシュがあるか確認してください。" msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -41,9 +42,8 @@ msgstr "" "この値は文字、数字、ドット、アンダースコア、ダッシュ、スラッシュかチルダのみ" "でなければいけません。" -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "" -"例: '/about/contact/'. 先頭と最後にスラッシュがあるか確認してください。" +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "例: “/about/contact”. 先頭にスラッシュがあるか確認してください。" msgid "URL is missing a leading slash." msgstr "URLの先頭はスラッシュが必要です。" @@ -68,11 +68,11 @@ msgid "template name" msgstr "テンプレート名" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"例: 'flatpages/contact_page.html'. 指定しなければ、デフォルト設定" -"の'flatpages/default.html' を使います。" +"例: “flatpages/contact_page.html”. 指定しなければ、デフォルト値の “flatpages/" +"default.html” を使います。" msgid "registration required" msgstr "登録が必要です" diff --git a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo index e6868dbf9870..6f13b0d4b5e2 100644 Binary files a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po index 40542971cdf2..f0f117aa90be 100644 --- a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po @@ -5,6 +5,7 @@ # Ian Y. Choi , 2015 # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jay Oh , 2020 # Le Tartuffe , 2014 # Jonghwa Seo , 2019 # JunGu Kang , 2015 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-04-28 14:37+0000\n" -"Last-Translator: Jonghwa Seo \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-04 14:22+0000\n" +"Last-Translator: Jay Oh \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "앞, 뒤에 슬래시(/)를 넣으세요. 예:'/about/contact/' " msgid "" @@ -41,7 +42,7 @@ msgid "" msgstr "" "이 문자열은 문자, 숫자, 점, 언더스코어, 대쉬, 슬래시, 틸드만 사용해야 합니다." -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "맨앞에 슬래시(/)를 반드시 넣으세요. 예: '/about/contact'" msgid "URL is missing a leading slash." @@ -67,8 +68,8 @@ msgid "template name" msgstr "템플릿 이름" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" "예: 'flatpages/contact_page.html' 를 사용할 수 없는 경우 시스템이 'flatpages/" "default.html' 을/를 사용합니다." diff --git a/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..c4aa02ffc15a Binary files /dev/null and b/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..7f420f3100b5 --- /dev/null +++ b/django/contrib/flatpages/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,89 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-23 06:23+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Advanced options" +msgstr "Дагы мүмкүнчүлүктөр" + +msgid "Flat Pages" +msgstr "Туруктуу барактар" + +msgid "URL" +msgstr "URL" + +msgid "" +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "" +"Мисалы: “/about/contact/”. Башында жана аягында бөлчөк бар экендигин " +"текшериңиз." + +msgid "" +"This value must contain only letters, numbers, dots, underscores, dashes, " +"slashes or tildes." +msgstr "" +"Бул маани жалаң арип, сан, чекит, астсызык, сызык, бөлчөк же тилда камтый " +"алат." + +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "Мисалы: “/about/contact”. Башында бөлчөк бар экендигин текшериңиз." + +msgid "URL is missing a leading slash." +msgstr "URL башында бөлчөгү жок." + +msgid "URL is missing a trailing slash." +msgstr "URL аягында бөлчөгү жок." + +#, python-format +msgid "Flatpage with url %(url)s already exists for site %(site)s" +msgstr "%(url)s URLдүү барак %(site)sсайтында мурдатан эле бар." + +msgid "title" +msgstr "наам" + +msgid "content" +msgstr "мазмун" + +msgid "enable comments" +msgstr "пикирлерди күйгүзүү" + +msgid "template name" +msgstr "калып аты" + +msgid "" +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." +msgstr "" +"Мисалы: “flatpages/contact_page.html”. Эгер бул көрсөтүлбөсө, систем " +"“flatpages/default.html” колдоно берет." + +msgid "registration required" +msgstr "катталуу талап кылынат." + +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Эгер бул тандалса жалаң гана катталып кирген колдонуучулар бул баракты көрө " +"алышат." + +msgid "sites" +msgstr "сайттар" + +msgid "flat page" +msgstr "туруктуу барак" + +msgid "flat pages" +msgstr "туруктуу барактар" diff --git a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo index 75d12f86ad16..d4cf1e3a06cc 100644 Binary files a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po index 31bde8478a49..4d5fd10790fc 100644 --- a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Aby Thomas , 2014 -# Hrishikesh , 2019 +# Hrishikesh , 2019-2020 # Jannis Leidel , 2011 # Rajeesh Nair , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-03-04 08:19+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-13 21:22+0000\n" "Last-Translator: Hrishikesh \n" "Language-Team: Malayalam (http://www.transifex.com/django/django/language/" "ml/)\n" @@ -30,9 +30,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"ഉദാഹരണം: '/about/contact/'. തുടക്കത്തിലും അവസാനവും സ്ലാഷുകൾ ഉണ്ടെന്ന് ഉറപ്പുവരുത്തുക." +"ഉദാഹരണം: “/about/contact/”. തുടക്കത്തിലും അവസാനവും സ്ലാഷുകൾ ഉണ്ടെന്ന് ഉറപ്പുവരുത്തുക." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -41,8 +41,8 @@ msgstr "" "ഇതിൽ അക്ഷരങ്ങൾ, നമ്പറുകൾ, കുത്തുകൾ, അണ്ടർസ്കോറുകൾ, ഡാഷുകൾ, സ്ലാഷുകൾ അതുമല്ലെങ്കിൽ ടിൽഡുകൾ " "എന്നിവ മാത്രമേ അനുവദിക്കുള്ളൂ." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "ഉദാഹരണം: '/about/contact'. തുടക്കത്തിൽ ഒരു സ്ലാഷ് ഉണ്ടെന്ന് ഉറപ്പുവരുത്തുക." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "ഉദാഹരണം: “/about/contact”. തുടക്കത്തിൽ ഒരു സ്ലാഷ് ഉണ്ടെന്ന് ഉറപ്പുവരുത്തുക." msgid "URL is missing a leading slash." msgstr "URLന്റെ മുന്‍വശത്ത് ഒരു സ്ലാഷിന്റെ കുറവുണ്ട്." @@ -67,8 +67,8 @@ msgid "template name" msgstr "ടെമ്പ്ലേറ്റിന്റെ പേര്" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" "ഉദാ: 'flatpages/contact_page.html'. ഇതു നല്കിയില്ലെങ്കില്‍, പകരമായി 'flatpages/" "default.html' ആയിരിക്കും ഉപയോഗിക്കുക." diff --git a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo index 6fe334ab997b..3677d3d45721 100644 Binary files a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po index e68513d29af9..e28cabebadad 100644 --- a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po @@ -10,6 +10,7 @@ # semente, 2012-2013 # Jannis Leidel , 2011 # Lucas Infante , 2015 +# Rafael Fontenelle , 2021 # Sergio Oliveira , 2013 # Thiago Avelino , 2013 msgid "" @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-12-11 00:26+0000\n" -"Last-Translator: Amanda Savluchinske \n" +"PO-Revision-Date: 2021-01-17 06:37+0000\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -39,8 +40,7 @@ msgstr "URL" msgid "" "Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Exemplo: “/about/contact/”. Assegure que se tenha barras no início e no " -"final." +"Exemplo: “/about/contact/”. Certifique-se de ter barras no início e no final." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -50,7 +50,7 @@ msgstr "" "barras ou til." msgid "Example: “/about/contact”. Make sure to have a leading slash." -msgstr "Exemplo: “/about/contact”. Assegure que se tenha uma barra no início." +msgstr "Exemplo: “/about/contact”. Certifique-se de ter uma barra no início." msgid "URL is missing a leading slash." msgstr "Está faltando uma barra no início da URL." diff --git a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo index 7b74bfa32811..669d7e17bbac 100644 Binary files a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po index c738eeab3de3..bfe344c36f1a 100644 --- a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Eugene , 2012 +# crazyzubr , 2020 # Jannis Leidel , 2011 # Mike Yumatov , 2011 # Алексей Борискин , 2012,2014-2015,2019 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-18 21:16+0000\n" -"Last-Translator: Алексей Борискин \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-14 18:19+0000\n" +"Last-Translator: crazyzubr \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -32,9 +33,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Пример: '/about/contact/'. Убедитесь, что ввели начальную и конечную косые " +"Пример: “/about/contact/”. Убедитесь, что ввели начальную и конечную косые " "черты." msgid "" @@ -44,9 +45,9 @@ msgstr "" "Значение должно состоять только из букв, цифр и символов точки, " "подчеркивания, тире, косой черты и тильды." -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "" -"Например: '/about/contact'. Убедитесь, что в начале адреса находится косая " +"Пример: “/about/contact”. Убедитесь, что в начале адреса находится косая " "черта." msgid "URL is missing a leading slash." @@ -72,11 +73,11 @@ msgid "template name" msgstr "имя шаблона" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Пример: 'flatpages/contact_page.html'. Если не указано, система будет " -"использовать 'flatpages/default.html'." +"Пример: “flatpages/contact_page.html“. Если не указано, система будет " +"использовать “flatpages/default.html“." msgid "registration required" msgstr "требуется регистрация" diff --git a/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..2ce72c0c5a8b Binary files /dev/null and b/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..e0f76ccebdf7 --- /dev/null +++ b/django/contrib/flatpages/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,86 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-15 00:29+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Advanced options" +msgstr "Танзимоти васеъ" + +msgid "Flat Pages" +msgstr "Саҳифаҳои муқарарӣ" + +msgid "URL" +msgstr "URL" + +msgid "" +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "" + +msgid "" +"This value must contain only letters, numbers, dots, underscores, dashes, " +"slashes or tildes." +msgstr "" +"Қимат бояд танҳо аз ҳарф, рақам, ва аломатҳои нуқта, зерхат, дефис, слеш ва " +"зада иборат бошад." + +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "" + +msgid "URL is missing a leading slash." +msgstr "Дар аввали URL слеш(/) мавҷуд нест" + +msgid "URL is missing a trailing slash." +msgstr "Дар охири URL слеш(/) мавҷуд нест" + +#, python-format +msgid "Flatpage with url %(url)s already exists for site %(site)s" +msgstr "" +"Саҳифаи муқарарӣ бо чунин суроға %(url)s барои сомонаи %(site)s алакай " +"мавҷуд аст." + +msgid "title" +msgstr "сархат" + +msgid "content" +msgstr "контент" + +msgid "enable comments" +msgstr "фаъолсозии 'андешаҳо'" + +msgid "template name" +msgstr "номи нусха" + +msgid "" +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." +msgstr "" + +msgid "registration required" +msgstr "Бақайдгирӣ талаб карда мешавад" + +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Агар қайд шуда бошад, танҳо истифодабарандагони рухсатдор метавонанд аз " +"назар гузаронанд." + +msgid "sites" +msgstr "сомонаҳо" + +msgid "flat page" +msgstr "саҳифаи муқарарӣ" + +msgid "flat pages" +msgstr "саҳифаҳои муқарарӣ" diff --git a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..2248000f4864 Binary files /dev/null and b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po new file mode 100644 index 000000000000..ba5baf3c7b10 --- /dev/null +++ b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po @@ -0,0 +1,83 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Welbeck Garli , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-15 16:35+0000\n" +"Last-Translator: Welbeck Garli \n" +"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"tk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tk\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Advanced options" +msgstr "Has çylşyrymly wariantlar" + +msgid "Flat Pages" +msgstr "Tekiz Sahypalar" + +msgid "URL" +msgstr "URL" + +msgid "" +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "" +"Meselem: \"about/contact/\". Dogry we yzygiderli çyzgylaryň bardygyna göz " +"ýetiriň." + +msgid "" +"This value must contain only letters, numbers, dots, underscores, dashes, " +"slashes or tildes." +msgstr "" + +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "" + +msgid "URL is missing a leading slash." +msgstr "" + +msgid "URL is missing a trailing slash." +msgstr "" + +#, python-format +msgid "Flatpage with url %(url)s already exists for site %(site)s" +msgstr "" + +msgid "title" +msgstr "" + +msgid "content" +msgstr "" + +msgid "enable comments" +msgstr "" + +msgid "template name" +msgstr "" + +msgid "" +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." +msgstr "" + +msgid "registration required" +msgstr "" + +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" + +msgid "sites" +msgstr "" + +msgid "flat page" +msgstr "" + +msgid "flat pages" +msgstr "" diff --git a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo index 45dad58c3012..72d6b06700a3 100644 Binary files a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po index 7b6c62f8b567..8ba1e76989bb 100644 --- a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po @@ -2,17 +2,18 @@ # # Translators: # Oleksandr Chernihov , 2014 +# Illia Volochii , 2021 # Jannis Leidel , 2011 -# panasoft , 2016 +# Panasoft, 2016 # Sergey Lysach , 2011-2012 # tarasyyyk , 2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-21 16:31+0000\n" -"Last-Translator: tarasyyyk \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-20 00:29+0000\n" +"Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -34,10 +35,10 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Приклад: '/about/contact/'. Переконайтеся у наявності слешу на початку та у " -"кінці." +"Наприклад, “/about/contact/”. Переконайтеся у наявності скісної риски на " +"початку та вкінці." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -46,8 +47,10 @@ msgstr "" "Це значення повинне містити тільки літери, цифри, крапки, підкреслення, " "тире, косі риси чи тільди." -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "Наприклад: '/about/contact'. Переконайтеся, що на початку є слеш." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "" +"Наприклад, “/about/contact/”. Переконайтеся у наявності скісної риски на " +"початку." msgid "URL is missing a leading slash." msgstr "На початку URL відсутня коса риса." @@ -72,11 +75,11 @@ msgid "template name" msgstr "ім'я шаблона" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Приклад: 'flatpages/contact_page'. Якщо це не надано, система буда " -"використовувати 'flatpages/default'." +"Наприклад, “/about/contact/”. Якщо не вказано, система використовуватиме " +"“flatpages/default.html”." msgid "registration required" msgstr "потрібна реєстрація" diff --git a/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.mo index 7cf6a6f0aba4..58e3c9e570f7 100644 Binary files a/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.po index ac4adb2c5ab5..a1e058baa404 100644 --- a/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/zh_Hans/LC_MESSAGES/django.po @@ -6,14 +6,15 @@ # mozillazg , 2016 # Ronald White , 2014 # Suntravel Chris , 2019 +# wolf ice , 2020 # Kevin Sze , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-02-01 07:11+0000\n" -"Last-Translator: Suntravel Chris \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-03-04 04:05+0000\n" +"Last-Translator: wolf ice \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -32,16 +33,16 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "例如：'/about/contact/'。请确保开始和结尾的斜杠。" +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." +msgstr "例如：“/about/contact/”。确保有开头和结尾的斜杠。" msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "该值必须只能包含字母，数字，点号，下划线，破折号，和" -msgid "Example: '/about/contact'. Make sure to have a leading slash." -msgstr "Example: '/about/contact'. 请确保开头的正斜杠。" +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "例如：“/about/contact”。确保有一个开头的斜杠。" msgid "URL is missing a leading slash." msgstr "URL头部缺失斜线." @@ -66,11 +67,11 @@ msgid "template name" msgstr "模板名称" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"例如：'flatpages/contact_page.html'。若未提供，系统将使用'flatpages/default." -"html'。" +"例如：“flatpages/contact_page.html”。如果它未被提供，系统将使用“flatpages/" +"default.html”。" msgid "registration required" msgstr "请先注册" diff --git a/django/contrib/gis/__init__.py b/django/contrib/gis/__init__.py index 458c90eb5840..e69de29bb2d1 100644 --- a/django/contrib/gis/__init__.py +++ b/django/contrib/gis/__init__.py @@ -1 +0,0 @@ -default_app_config = 'django.contrib.gis.apps.GISConfig' diff --git a/django/contrib/gis/admin/__init__.py b/django/contrib/gis/admin/__init__.py index e014f12ceb77..b0edaf0193a0 100644 --- a/django/contrib/gis/admin/__init__.py +++ b/django/contrib/gis/admin/__init__.py @@ -1,12 +1,12 @@ from django.contrib.admin import ( HORIZONTAL, VERTICAL, AdminSite, ModelAdmin, StackedInline, TabularInline, - autodiscover, register, site, + action, autodiscover, display, register, site, ) from django.contrib.gis.admin.options import GeoModelAdmin, OSMGeoAdmin from django.contrib.gis.admin.widgets import OpenLayersWidget __all__ = [ 'HORIZONTAL', 'VERTICAL', 'AdminSite', 'ModelAdmin', 'StackedInline', - 'TabularInline', 'autodiscover', 'register', 'site', + 'TabularInline', 'action', 'autodiscover', 'display', 'register', 'site', 'GeoModelAdmin', 'OSMGeoAdmin', 'OpenLayersWidget', ] diff --git a/django/contrib/gis/apps.py b/django/contrib/gis/apps.py index 662ae43d8dee..e582e7676027 100644 --- a/django/contrib/gis/apps.py +++ b/django/contrib/gis/apps.py @@ -4,6 +4,7 @@ class GISConfig(AppConfig): + default_auto_field = 'django.db.models.AutoField' name = 'django.contrib.gis' verbose_name = _("GIS") diff --git a/django/contrib/gis/db/backends/base/adapter.py b/django/contrib/gis/db/backends/base/adapter.py index 604711eb6a87..f6f271915d8f 100644 --- a/django/contrib/gis/db/backends/base/adapter.py +++ b/django/contrib/gis/db/backends/base/adapter.py @@ -17,3 +17,8 @@ def __hash__(self): def __str__(self): return self.wkt + + @classmethod + def _fix_polygon(cls, poly): + # Hook for Oracle. + return poly diff --git a/django/contrib/gis/db/backends/base/features.py b/django/contrib/gis/db/backends/base/features.py index 019b11876570..cf52c4e1226e 100644 --- a/django/contrib/gis/db/backends/base/features.py +++ b/django/contrib/gis/db/backends/base/features.py @@ -14,6 +14,8 @@ class BaseSpatialFeatures: # Does the backend introspect GeometryField to its subtypes? supports_geometry_field_introspection = True + # Does the database have a geography type? + supports_geography = False # Does the backend support storing 3D geometries? supports_3d_storage = False # Reference implementation of 3D functions is: @@ -33,9 +35,6 @@ class BaseSpatialFeatures: # Is the database able to count vertices on polygons (with `num_points`)? supports_num_points_poly = True - # The following properties indicate if the database backend support - # certain lookups (dwithin, left and right, relate, ...) - supports_left_right_lookups = False # Does the backend support expressions for specifying distance in the # dwithin lookup? supports_dwithin_distance_expr = True @@ -46,6 +45,19 @@ class BaseSpatialFeatures: # Does the database support a unique index on geometry fields? supports_geometry_field_unique_index = True + # Can SchemaEditor alter geometry fields? + can_alter_geometry_field = True + + # Do the database functions/aggregates support the tolerance parameter? + supports_tolerance_parameter = False + + # Set of options that AsGeoJSON() doesn't support. + unsupported_geojson_options = {} + + # Does Intersection() return None (rather than an empty GeometryCollection) + # for empty results? + empty_intersection_returns_none = True + @property def supports_bbcontains_lookup(self): return 'bbcontains' in self.connection.ops.gis_operators diff --git a/django/contrib/gis/db/backends/base/operations.py b/django/contrib/gis/db/backends/base/operations.py index 63fcf93c9124..84b1785a1cca 100644 --- a/django/contrib/gis/db/backends/base/operations.py +++ b/django/contrib/gis/db/backends/base/operations.py @@ -12,6 +12,7 @@ class BaseSpatialOperations: # an attribute for the spatial database version tuple (if applicable) postgis = False spatialite = False + mariadb = False mysql = False oracle = False spatial_version = None @@ -23,10 +24,6 @@ class BaseSpatialOperations: def select_extent(self): return self.select - # Does the spatial database have a geometry or geography type? - geography = False - geometry = False - # Aggregates disallowed_aggregates = () @@ -36,7 +33,7 @@ def select_extent(self): # match; used in spatial_function_name(). function_names = {} - # Blacklist/set of known unsupported functions of the backend + # Set of known unsupported functions of the backend unsupported_functions = { 'Area', 'AsGeoJSON', 'AsGML', 'AsKML', 'AsSVG', 'Azimuth', 'BoundingCircle', 'Centroid', 'Difference', 'Distance', 'Envelope', diff --git a/django/contrib/gis/db/backends/mysql/features.py b/django/contrib/gis/db/backends/mysql/features.py index 424df28d9497..613ccce9c521 100644 --- a/django/contrib/gis/db/backends/mysql/features.py +++ b/django/contrib/gis/db/backends/mysql/features.py @@ -14,12 +14,30 @@ class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures): supports_transform = False supports_null_geometries = False supports_num_points_poly = False + unsupported_geojson_options = {'crs'} @cached_property - def supports_empty_geometry_collection(self): - return self.connection.mysql_version >= (5, 7, 5) + def empty_intersection_returns_none(self): + return ( + not self.connection.mysql_is_mariadb and + self.connection.mysql_version < (5, 7, 5) + ) @cached_property def supports_geometry_field_unique_index(self): # Not supported in MySQL since https://dev.mysql.com/worklog/task/?id=11808 return self.connection.mysql_is_mariadb + + @cached_property + def django_test_skips(self): + skips = super().django_test_skips + if ( + not self.connection.mysql_is_mariadb and + self.connection.mysql_version < (8, 0, 0) + ): + skips.update({ + 'MySQL < 8 gives different results.': { + 'gis_tests.geoapp.tests.GeoLookupTest.test_disjoint_lookup', + }, + }) + return skips diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index e5000e99fa84..3ca609f6c4b7 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -12,13 +12,19 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations): - - mysql = True name = 'mysql' geom_func_prefix = 'ST_' Adapter = WKTAdapter + @cached_property + def mariadb(self): + return self.connection.mysql_is_mariadb + + @cached_property + def mysql(self): + return not self.connection.mysql_is_mariadb + @cached_property def select(self): return self.geom_func_prefix + 'AsBinary(%s)' diff --git a/django/contrib/gis/db/backends/oracle/adapter.py b/django/contrib/gis/db/backends/oracle/adapter.py index 6b19349ed2d8..3f961780917a 100644 --- a/django/contrib/gis/db/backends/oracle/adapter.py +++ b/django/contrib/gis/db/backends/oracle/adapter.py @@ -16,17 +16,31 @@ def __init__(self, geom): * Inner ring(s) - clockwise """ if isinstance(geom, Polygon): - self._fix_polygon(geom) + if self._polygon_must_be_fixed(geom): + geom = self._fix_polygon(geom) elif isinstance(geom, GeometryCollection): - self._fix_geometry_collection(geom) + if any(isinstance(g, Polygon) and self._polygon_must_be_fixed(g) for g in geom): + geom = self._fix_geometry_collection(geom) self.wkt = geom.wkt self.srid = geom.srid - def _fix_polygon(self, poly): + @staticmethod + def _polygon_must_be_fixed(poly): + return ( + not poly.empty and + ( + not poly.exterior_ring.is_counterclockwise or + any(x.is_counterclockwise for x in poly) + ) + ) + + @classmethod + def _fix_polygon(cls, poly, clone=True): """Fix single polygon orientation as described in __init__().""" - if poly.empty: - return poly + if clone: + poly = poly.clone() + if not poly.exterior_ring.is_counterclockwise: poly.exterior_ring = list(reversed(poly.exterior_ring)) @@ -36,11 +50,14 @@ def _fix_polygon(self, poly): return poly - def _fix_geometry_collection(self, coll): + @classmethod + def _fix_geometry_collection(cls, coll): """ Fix polygon orientations in geometry collections as described in __init__(). """ + coll = coll.clone() for i, geom in enumerate(coll): if isinstance(geom, Polygon): - coll[i] = self._fix_polygon(geom) + coll[i] = cls._fix_polygon(geom, clone=False) + return coll diff --git a/django/contrib/gis/db/backends/oracle/features.py b/django/contrib/gis/db/backends/oracle/features.py index f2ed4d30760c..c458eb33c69a 100644 --- a/django/contrib/gis/db/backends/oracle/features.py +++ b/django/contrib/gis/db/backends/oracle/features.py @@ -10,3 +10,5 @@ class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures): supports_geometry_field_unique_index = False supports_perimeter_geodetic = True supports_dwithin_distance_expr = False + supports_tolerance_parameter = True + unsupported_geojson_options = {'bbox', 'crs', 'precision'} diff --git a/django/contrib/gis/db/backends/oracle/introspection.py b/django/contrib/gis/db/backends/oracle/introspection.py index f97f0e1446d2..493fe74b4642 100644 --- a/django/contrib/gis/db/backends/oracle/introspection.py +++ b/django/contrib/gis/db/backends/oracle/introspection.py @@ -1,14 +1,19 @@ import cx_Oracle from django.db.backends.oracle.introspection import DatabaseIntrospection +from django.utils.functional import cached_property class OracleIntrospection(DatabaseIntrospection): # Associating any OBJECTVAR instances with GeometryField. This won't work # right on Oracle objects that aren't MDSYS.SDO_GEOMETRY, but it is the # only object type supported within Django anyways. - data_types_reverse = DatabaseIntrospection.data_types_reverse.copy() - data_types_reverse[cx_Oracle.OBJECT] = 'GeometryField' + @cached_property + def data_types_reverse(self): + return { + **super().data_types_reverse, + cx_Oracle.OBJECT: 'GeometryField', + } def get_geometry_type(self, table_name, description): with self.connection.cursor() as cursor: diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index 8cd0bfdf5663..9b363aaf4ef6 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -186,11 +186,15 @@ def spatial_aggregate_name(self, agg_name): # Routines for getting the OGC-compliant models. def geometry_columns(self): - from django.contrib.gis.db.backends.oracle.models import OracleGeometryColumns + from django.contrib.gis.db.backends.oracle.models import ( + OracleGeometryColumns, + ) return OracleGeometryColumns def spatial_ref_sys(self): - from django.contrib.gis.db.backends.oracle.models import OracleSpatialRefSys + from django.contrib.gis.db.backends.oracle.models import ( + OracleSpatialRefSys, + ) return OracleSpatialRefSys def modify_insert_params(self, placeholder, params): diff --git a/django/contrib/gis/db/backends/postgis/adapter.py b/django/contrib/gis/db/backends/postgis/adapter.py index 84c19c7e3b1d..6611442cae09 100644 --- a/django/contrib/gis/db/backends/postgis/adapter.py +++ b/django/contrib/gis/db/backends/postgis/adapter.py @@ -42,6 +42,10 @@ def __hash__(self): def __str__(self): return self.getquoted() + @classmethod + def _fix_polygon(cls, poly): + return poly + def prepare(self, conn): """ This method allows escaping the binary in the style required by the diff --git a/django/contrib/gis/db/backends/postgis/features.py b/django/contrib/gis/db/backends/postgis/features.py index 60158ca5c30b..29a107963108 100644 --- a/django/contrib/gis/db/backends/postgis/features.py +++ b/django/contrib/gis/db/backends/postgis/features.py @@ -5,8 +5,9 @@ class DatabaseFeatures(BaseSpatialFeatures, Psycopg2DatabaseFeatures): + supports_geography = True supports_3d_storage = True supports_3d_functions = True - supports_left_right_lookups = True supports_raster = True supports_empty_geometries = True + empty_intersection_returns_none = False diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index b59393909bcb..f068f28f48d6 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -98,7 +98,6 @@ def output_field(self): class PostGISOperations(BaseSpatialOperations, DatabaseOperations): name = 'postgis' postgis = True - geography = True geom_func_prefix = 'ST_' Adapter = PostGISAdapter @@ -180,7 +179,7 @@ def spatial_version(self): raise ImproperlyConfigured( 'Cannot determine PostGIS version for database "%s" ' 'using command "SELECT postgis_lib_version()". ' - 'GeoDjango requires at least PostGIS version 2.2. ' + 'GeoDjango requires at least PostGIS version 2.3. ' 'Was the database created from a spatial database ' 'template?' % self.connection.settings_dict['NAME'] ) @@ -314,7 +313,7 @@ def postgis_lib_version(self): return self._get_postgis_func('postgis_lib_version') def postgis_proj_version(self): - "Return the version of the PROJ.4 library used with PostGIS." + """Return the version of the PROJ library used with PostGIS.""" return self._get_postgis_func('postgis_proj_version') def postgis_version(self): @@ -335,7 +334,7 @@ def postgis_version_tuple(self): def proj_version_tuple(self): """ - Return the version of PROJ.4 used by PostGIS as a tuple of the + Return the version of PROJ used by PostGIS as a tuple of the major, minor, and subminor release numbers. """ proj_regex = re.compile(r'(\d+)\.(\d+)\.(\d+)') @@ -344,7 +343,7 @@ def proj_version_tuple(self): if m: return tuple(map(int, m.groups())) else: - raise Exception('Could not determine PROJ.4 version from PostGIS.') + raise Exception('Could not determine PROJ version from PostGIS.') def spatial_aggregate_name(self, agg_name): if agg_name == 'Extent3D': diff --git a/django/contrib/gis/db/backends/postgis/schema.py b/django/contrib/gis/db/backends/postgis/schema.py index 70def62337c3..da45d63af3ff 100644 --- a/django/contrib/gis/db/backends/postgis/schema.py +++ b/django/contrib/gis/db/backends/postgis/schema.py @@ -18,9 +18,9 @@ def _field_should_be_indexed(self, model, field): return True return super()._field_should_be_indexed(model, field) - def _create_index_sql(self, model, fields, **kwargs): - if len(fields) != 1 or not hasattr(fields[0], 'geodetic'): - return super()._create_index_sql(model, fields, **kwargs) + def _create_index_sql(self, model, *, fields=None, **kwargs): + if fields is None or len(fields) != 1 or not hasattr(fields[0], 'geodetic'): + return super()._create_index_sql(model, fields=fields, **kwargs) field = fields[0] field_column = self.quote_name(field.column) @@ -45,6 +45,7 @@ def _create_index_sql(self, model, fields, **kwargs): columns=field_column, extra='', condition='', + include='', ) def _alter_column_type_sql(self, table, old_field, new_field, new_type): diff --git a/django/contrib/gis/db/backends/spatialite/features.py b/django/contrib/gis/db/backends/spatialite/features.py index d29e7876aecb..947d874b3015 100644 --- a/django/contrib/gis/db/backends/spatialite/features.py +++ b/django/contrib/gis/db/backends/spatialite/features.py @@ -6,8 +6,19 @@ class DatabaseFeatures(BaseSpatialFeatures, SQLiteDatabaseFeatures): + can_alter_geometry_field = False # Not implemented supports_3d_storage = True @cached_property def supports_area_geodetic(self): return bool(self.connection.ops.lwgeom_version()) + + @cached_property + def django_test_skips(self): + skips = super().django_test_skips + skips.update({ + "SpatiaLite doesn't support distance lookups with Distance objects.": { + 'gis_tests.geogapp.tests.GeographyTest.test02_distance_lookup', + }, + }) + return skips diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py index 4d4d84aa6d82..1fc1cf20e01b 100644 --- a/django/contrib/gis/db/backends/spatialite/operations.py +++ b/django/contrib/gis/db/backends/spatialite/operations.py @@ -159,8 +159,8 @@ def geos_version(self): "Return the version of GEOS used by SpatiaLite as a string." return self._get_spatialite_func('geos_version()') - def proj4_version(self): - "Return the version of the PROJ.4 library used by SpatiaLite." + def proj_version(self): + """Return the version of the PROJ library used by SpatiaLite.""" return self._get_spatialite_func('proj4_version()') def lwgeom_version(self): @@ -189,11 +189,15 @@ def spatial_aggregate_name(self, agg_name): # Routines for getting the OGC-compliant models. def geometry_columns(self): - from django.contrib.gis.db.backends.spatialite.models import SpatialiteGeometryColumns + from django.contrib.gis.db.backends.spatialite.models import ( + SpatialiteGeometryColumns, + ) return SpatialiteGeometryColumns def spatial_ref_sys(self): - from django.contrib.gis.db.backends.spatialite.models import SpatialiteSpatialRefSys + from django.contrib.gis.db.backends.spatialite.models import ( + SpatialiteSpatialRefSys, + ) return SpatialiteSpatialRefSys def get_geometry_converter(self, expression): diff --git a/django/contrib/gis/db/backends/spatialite/schema.py b/django/contrib/gis/db/backends/spatialite/schema.py index 6a4c84ce72b6..066ce6d73283 100644 --- a/django/contrib/gis/db/backends/spatialite/schema.py +++ b/django/contrib/gis/db/backends/spatialite/schema.py @@ -83,6 +83,7 @@ def create_model(self, model): def delete_model(self, model, **kwargs): from django.contrib.gis.db.models import GeometryField + # Drop spatial metadata (dropping the table does not automatically remove them) for field in model._meta.local_fields: if isinstance(field, GeometryField): @@ -113,6 +114,7 @@ def add_field(self, model, field): def remove_field(self, model, field): from django.contrib.gis.db.models import GeometryField + # NOTE: If the field is a geometry field, the table is just recreated, # the parent's remove_field can't be used cause it will skip the # recreation if the field does not have a database type. Geometry fields @@ -125,6 +127,7 @@ def remove_field(self, model, field): def alter_db_table(self, model, old_db_table, new_db_table, disable_constraints=True): from django.contrib.gis.db.models import GeometryField + # Remove geometry-ness from temp table for field in model._meta.local_fields: if isinstance(field, GeometryField): diff --git a/django/contrib/gis/db/models/fields.py b/django/contrib/gis/db/models/fields.py index af5abb549e9b..16b3bb5d08b4 100644 --- a/django/contrib/gis/db/models/fields.py +++ b/django/contrib/gis/db/models/fields.py @@ -145,7 +145,11 @@ def get_db_prep_value(self, value, connection, *args, **kwargs): return None return connection.ops.Adapter( super().get_db_prep_value(value, connection, *args, **kwargs), - **({'geography': True} if self.geography and connection.ops.geography else {}) + **( + {'geography': True} + if self.geography and connection.features.supports_geography + else {} + ) ) def get_raster_prep_value(self, value, is_candidate): diff --git a/django/contrib/gis/db/models/functions.py b/django/contrib/gis/db/models/functions.py index debd859390a4..1f2d372ebb86 100644 --- a/django/contrib/gis/db/models/functions.py +++ b/django/contrib/gis/db/models/functions.py @@ -101,10 +101,13 @@ class SQLiteDecimalToFloatMixin: is not acceptable by the GIS functions expecting numeric values. """ def as_sqlite(self, compiler, connection, **extra_context): - for expr in self.get_source_expressions(): - if hasattr(expr, 'value') and isinstance(expr.value, Decimal): - expr.value = float(expr.value) - return super().as_sql(compiler, connection, **extra_context) + copy = self.copy() + copy.set_source_expressions([ + Value(float(expr.value)) if hasattr(expr, 'value') and isinstance(expr.value, Decimal) + else expr + for expr in copy.get_source_expressions() + ]) + return copy.as_sql(compiler, connection, **extra_context) class OracleToleranceMixin: @@ -223,7 +226,7 @@ class AsWKT(GeoFunc): arity = 1 -class BoundingCircle(OracleToleranceMixin, GeoFunc): +class BoundingCircle(OracleToleranceMixin, GeomOutputGeoFunc): def __init__(self, expression, num_seg=48, **extra): super().__init__(expression, num_seg, **extra) diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py index 3371c064560f..301d7708366e 100644 --- a/django/contrib/gis/forms/fields.py +++ b/django/contrib/gis/forms/fields.py @@ -71,7 +71,7 @@ def clean(self, value): # Ensuring that the geometry is of the correct type (indicated # using the OGC string label). - if str(geom.geom_type).upper() != self.geom_type and not self.geom_type == 'GEOMETRY': + if str(geom.geom_type).upper() != self.geom_type and self.geom_type != 'GEOMETRY': raise ValidationError(self.error_messages['invalid_geom_type'], code='invalid_geom_type') # Transforming the geometry if the SRID was set. diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py index 611bed9f6de6..e38f173a985e 100644 --- a/django/contrib/gis/forms/widgets.py +++ b/django/contrib/gis/forms/widgets.py @@ -61,11 +61,12 @@ def get_context(self, name, value, attrs): value.srid, self.map_srid, err ) + geom_type = gdal.OGRGeomType(self.attrs['geom_type']).name context.update(self.build_attrs(self.attrs, { 'name': name, 'module': 'geodjango_%s' % name.replace('-', '_'), # JS-safe 'serialized': self.serialize(value), - 'geom_type': gdal.OGRGeomType(self.attrs['geom_type']), + 'geom_type': 'Geometry' if geom_type == 'Unknown' else geom_type, 'STATIC_URL': settings.STATIC_URL, 'LANGUAGE_BIDI': translation.get_language_bidi(), **(attrs or {}), diff --git a/django/contrib/gis/gdal/datasource.py b/django/contrib/gis/gdal/datasource.py index 602b244d3139..7def6118a8ff 100644 --- a/django/contrib/gis/gdal/datasource.py +++ b/django/contrib/gis/gdal/datasource.py @@ -34,6 +34,7 @@ val = field.value """ from ctypes import byref +from pathlib import Path from django.contrib.gis.gdal.base import GDALBase from django.contrib.gis.gdal.driver import Driver @@ -43,8 +44,8 @@ from django.utils.encoding import force_bytes, force_str -# For more information, see the OGR C API source code: -# https://www.gdal.org/ogr__api_8h.html +# For more information, see the OGR C API documentation: +# https://gdal.org/api/vector_c_api.html # # The OGR_DS_* routines are relevant here. class DataSource(GDALBase): @@ -62,7 +63,7 @@ def __init__(self, ds_input, ds_driver=False, write=False, encoding='utf-8'): Driver.ensure_registered() - if isinstance(ds_input, str): + if isinstance(ds_input, (str, Path)): # The data source driver is a void pointer. ds_driver = Driver.ptr_type() try: diff --git a/django/contrib/gis/gdal/driver.py b/django/contrib/gis/gdal/driver.py index 13d92e96d988..f90b886251f7 100644 --- a/django/contrib/gis/gdal/driver.py +++ b/django/contrib/gis/gdal/driver.py @@ -9,14 +9,15 @@ class Driver(GDALBase): """ Wrap a GDAL/OGR Data Source Driver. - For more information, see the C API source code: - https://www.gdal.org/gdal_8h.html - https://www.gdal.org/ogr__api_8h.html + For more information, see the C API documentation: + https://gdal.org/api/vector_c_api.html + https://gdal.org/api/raster_c_api.html """ # Case-insensitive aliases for some GDAL/OGR Drivers. # For a complete list of original driver names see - # https://www.gdal.org/ogr_formats.html (vector) - # https://www.gdal.org/formats_list.html (raster) + # https://gdal.org/drivers/vector/ + # https://gdal.org/drivers/raster/ _alias = { # vector 'esri': 'ESRI Shapefile', diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py index 7921c978c876..98c333f483e6 100644 --- a/django/contrib/gis/gdal/envelope.py +++ b/django/contrib/gis/gdal/envelope.py @@ -17,7 +17,7 @@ # The OGR definition of an Envelope is a C structure containing four doubles. # See the 'ogr_core.h' source file for more information: -# https://www.gdal.org/ogr__core_8h_source.html +# https://gdal.org/doxygen/ogr__core_8h_source.html class OGREnvelope(Structure): "Represent the OGREnvelope C Structure." _fields_ = [("MinX", c_double), diff --git a/django/contrib/gis/gdal/error.py b/django/contrib/gis/gdal/error.py index 71b862e58b46..b5646dd751ff 100644 --- a/django/contrib/gis/gdal/error.py +++ b/django/contrib/gis/gdal/error.py @@ -29,7 +29,7 @@ class SRSException(Exception): } # CPL Error Codes -# https://www.gdal.org/cpl__error_8h.html +# https://gdal.org/api/cpl.html#cpl-error-h CPLERR_DICT = { 1: (GDALException, 'AppDefined'), 2: (GDALException, 'OutOfMemory'), diff --git a/django/contrib/gis/gdal/feature.py b/django/contrib/gis/gdal/feature.py index 9f8063d1f5a5..82a9089c1691 100644 --- a/django/contrib/gis/gdal/feature.py +++ b/django/contrib/gis/gdal/feature.py @@ -7,7 +7,7 @@ # For more information, see the OGR C API source code: -# https://www.gdal.org/ogr__api_8h.html +# https://gdal.org/api/vector_c_api.html # # The OGR_F_* routines are relevant here. class Feature(GDALBase): diff --git a/django/contrib/gis/gdal/field.py b/django/contrib/gis/gdal/field.py index dfd25d7bfbdf..8fc731acc618 100644 --- a/django/contrib/gis/gdal/field.py +++ b/django/contrib/gis/gdal/field.py @@ -8,7 +8,7 @@ # For more information, see the OGR C API source code: -# https://www.gdal.org/ogr__api_8h.html +# https://gdal.org/api/vector_c_api.html # # The OGR_Fld_* routines are relevant here. class Field(GDALBase): diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py index 8ec5683b9c19..d807b3e8b904 100644 --- a/django/contrib/gis/gdal/geometries.py +++ b/django/contrib/gis/gdal/geometries.py @@ -1,7 +1,7 @@ """ The OGRGeometry is a wrapper for using the OGR Geometry class - (see https://www.gdal.org/classOGRGeometry.html). OGRGeometry - may be instantiated when reading geometries from OGR Data Sources + (see https://gdal.org/api/ogrgeometry_cpp.html#_CPPv411OGRGeometry). + OGRGeometry may be instantiated when reading geometries from OGR Data Sources (e.g. SHP files), or when given OGC WKT (a string). While the 'full' API is not present yet, the API is "pythonic" unlike @@ -53,7 +53,7 @@ # For more information, see the OGR C API source code: -# https://www.gdal.org/ogr__api_8h.html +# https://gdal.org/api/vector_c_api.html # # The OGR_G_* routines are relevant here. class OGRGeometry(GDALBase): @@ -383,7 +383,7 @@ def transform(self, coord_trans, clone=False): """ Transform this geometry to a different spatial reference system. May take a CoordTransform object, a SpatialReference object, string - WKT or PROJ.4, and/or an integer SRID. By default, return nothing + WKT or PROJ, and/or an integer SRID. By default, return nothing and transform the geometry in-place. However, if the `clone` keyword is set, return a transformed clone of this geometry. """ diff --git a/django/contrib/gis/gdal/layer.py b/django/contrib/gis/gdal/layer.py index 4f7a2b3f8342..012f70bdb0a5 100644 --- a/django/contrib/gis/gdal/layer.py +++ b/django/contrib/gis/gdal/layer.py @@ -15,7 +15,7 @@ # For more information, see the OGR C API source code: -# https://www.gdal.org/ogr__api_8h.html +# https://gdal.org/api/vector_c_api.html # # The OGR_L_* routines are relevant here. class Layer(GDALBase): diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index ed00da159ffd..258079185654 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -20,10 +20,17 @@ lib_names = None elif os.name == 'nt': # Windows NT shared libraries - lib_names = ['gdal204', 'gdal203', 'gdal202', 'gdal201', 'gdal20'] + lib_names = [ + 'gdal302', 'gdal301', 'gdal300', + 'gdal204', 'gdal203', 'gdal202', 'gdal201', 'gdal20', + ] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal2.4.0', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0'] + lib_names = [ + 'gdal', 'GDAL', + 'gdal3.2.0', 'gdal3.1.0', 'gdal3.0.0', + 'gdal2.4.0', 'gdal2.3.0', 'gdal2.2.0', 'gdal2.1.0', 'gdal2.0.0', + ] else: raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) diff --git a/django/contrib/gis/gdal/prototypes/raster.py b/django/contrib/gis/gdal/prototypes/raster.py index 32b4f70f11d3..963a02c34905 100644 --- a/django/contrib/gis/gdal/prototypes/raster.py +++ b/django/contrib/gis/gdal/prototypes/raster.py @@ -12,9 +12,9 @@ ) # For more detail about c function names and definitions see -# https://gdal.org/gdal_8h.html -# https://gdal.org/gdalwarper_8h.html -# https://www.gdal.org/gdal__utils_8h.html +# https://gdal.org/api/raster_c_api.html +# https://gdal.org/doxygen/gdalwarper_8h.html +# https://gdal.org/api/gdal_utils.html # Prepare partial functions that use cpl error codes void_output = partial(void_output, cpl=True) @@ -102,7 +102,7 @@ ) # Create VSI gdal raster files from in-memory buffers. -# https://gdal.org/cpl__vsi_8h.html +# https://gdal.org/api/cpl.html#cpl-vsi-h create_vsi_file_from_mem_buffer = voidptr_output(std_call('VSIFileFromMemBuffer'), [c_char_p, c_void_p, c_int, c_int]) get_mem_buffer_from_vsi_file = voidptr_output(std_call('VSIGetMemFileBuffer'), [c_char_p, POINTER(c_int), c_bool]) unlink_vsi_file = int_output(std_call('VSIUnlink'), [c_char_p]) diff --git a/django/contrib/gis/gdal/prototypes/srs.py b/django/contrib/gis/gdal/prototypes/srs.py index 5d6a65c4fea4..5d080d8588be 100644 --- a/django/contrib/gis/gdal/prototypes/srs.py +++ b/django/contrib/gis/gdal/prototypes/srs.py @@ -57,7 +57,7 @@ def units_func(f): linear_units = units_func(lgdal.OSRGetLinearUnits) angular_units = units_func(lgdal.OSRGetAngularUnits) -# For exporting to WKT, PROJ.4, "Pretty" WKT, and XML. +# For exporting to WKT, PROJ, "Pretty" WKT, and XML. to_wkt = string_output(std_call('OSRExportToWkt'), [c_void_p, POINTER(c_char_p)], decoding='utf-8') to_proj = string_output(std_call('OSRExportToProj4'), [c_void_p, POINTER(c_char_p)], decoding='ascii') to_pretty_wkt = string_output( diff --git a/django/contrib/gis/gdal/raster/const.py b/django/contrib/gis/gdal/raster/const.py index f9793e6213b5..2ac3872c98b6 100644 --- a/django/contrib/gis/gdal/raster/const.py +++ b/django/contrib/gis/gdal/raster/const.py @@ -5,7 +5,7 @@ c_double, c_float, c_int16, c_int32, c_ubyte, c_uint16, c_uint32, ) -# See https://www.gdal.org/gdal_8h.html#a22e22ce0a55036a96f652765793fb7a4 +# See https://gdal.org/api/raster_c_api.html#_CPPv412GDALDataType GDAL_PIXEL_TYPES = { 0: 'GDT_Unknown', # Unknown or unspecified type 1: 'GDT_Byte', # Eight bit unsigned integer @@ -44,7 +44,7 @@ 'Mode': 6, } -# See https://www.gdal.org/gdal_8h.html#ace76452d94514561fffa8ea1d2a5968c +# See https://gdal.org/api/raster_c_api.html#_CPPv415GDALColorInterp GDAL_COLOR_TYPES = { 0: 'GCI_Undefined', # Undefined, default value, i.e. not known 1: 'GCI_GrayIndex', # Greyscale diff --git a/django/contrib/gis/gdal/raster/source.py b/django/contrib/gis/gdal/raster/source.py index 33d8b3069f08..d3129368e237 100644 --- a/django/contrib/gis/gdal/raster/source.py +++ b/django/contrib/gis/gdal/raster/source.py @@ -425,17 +425,48 @@ def warp(self, ds_input, resampling='NearestNeighbour', max_error=0.0): return target - def transform(self, srid, driver=None, name=None, resampling='NearestNeighbour', + def clone(self, name=None): + """Return a clone of this GDALRaster.""" + if name: + clone_name = name + elif self.driver.name != 'MEM': + clone_name = self.name + '_copy.' + self.driver.name + else: + clone_name = os.path.join(VSI_FILESYSTEM_BASE_PATH, str(uuid.uuid4())) + return GDALRaster( + capi.copy_ds( + self.driver._ptr, + force_bytes(clone_name), + self._ptr, + c_int(), + c_char_p(), + c_void_p(), + c_void_p(), + ), + write=self._write, + ) + + def transform(self, srs, driver=None, name=None, resampling='NearestNeighbour', max_error=0.0): """ - Return a copy of this raster reprojected into the given SRID. + Return a copy of this raster reprojected into the given spatial + reference system. """ # Convert the resampling algorithm name into an algorithm id algorithm = GDAL_RESAMPLE_ALGORITHMS[resampling] - # Instantiate target spatial reference system - target_srs = SpatialReference(srid) + if isinstance(srs, SpatialReference): + target_srs = srs + elif isinstance(srs, (int, str)): + target_srs = SpatialReference(srs) + else: + raise TypeError( + 'Transform only accepts SpatialReference, string, and integer ' + 'objects.' + ) + if target_srs.srid == self.srid and (not driver or driver == self.driver.name): + return self.clone(name) # Create warped virtual dataset in the target reference system target = capi.auto_create_warped_vrt( self._ptr, self.srs.wkt.encode(), target_srs.wkt.encode(), @@ -445,7 +476,7 @@ def transform(self, srid, driver=None, name=None, resampling='NearestNeighbour', # Construct the target warp dictionary from the virtual raster data = { - 'srid': srid, + 'srid': target_srs.srid, 'width': target.width, 'height': target.height, 'origin': [target.origin.x, target.origin.y], diff --git a/django/contrib/gis/gdal/srs.py b/django/contrib/gis/gdal/srs.py index d2e781e38175..fd6509600c8d 100644 --- a/django/contrib/gis/gdal/srs.py +++ b/django/contrib/gis/gdal/srs.py @@ -53,7 +53,7 @@ def __init__(self, srs_input='', srs_type='user', axis_order=None): """ Create a GDAL OSR Spatial Reference object from the given input. The input may be string of OGC Well Known Text (WKT), an integer - EPSG code, a PROJ.4 string, and/or a projection "well known" shorthand + EPSG code, a PROJ string, and/or a projection "well known" shorthand string (one of 'WGS84', 'WGS72', 'NAD27', 'NAD83'). """ if not isinstance(axis_order, (type(None), AxisOrder)): @@ -296,7 +296,7 @@ def import_epsg(self, epsg): capi.from_epsg(self.ptr, epsg) def import_proj(self, proj): - "Import the Spatial Reference from a PROJ.4 string." + """Import the Spatial Reference from a PROJ string.""" capi.from_proj(self.ptr, proj) def import_user_input(self, user_input): @@ -324,7 +324,7 @@ def pretty_wkt(self, simplify=0): @property def proj(self): - "Return the PROJ.4 representation for this Spatial Reference." + """Return the PROJ representation for this Spatial Reference.""" return capi.to_proj(self.ptr, byref(c_char_p())) @property diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py index 8fb0117b3e22..bdb3868ac525 100644 --- a/django/contrib/gis/geos/geometry.py +++ b/django/contrib/gis/geos/geometry.py @@ -37,12 +37,13 @@ def __init__(self, ptr, cls): if cls is None: if GEOSGeometryBase._GEOS_CLASSES is None: # Inner imports avoid import conflicts with GEOSGeometry. - from .linestring import LineString, LinearRing - from .point import Point - from .polygon import Polygon from .collections import ( - GeometryCollection, MultiPoint, MultiLineString, MultiPolygon, + GeometryCollection, MultiLineString, MultiPoint, + MultiPolygon, ) + from .linestring import LinearRing, LineString + from .point import Point + from .polygon import Polygon GEOSGeometryBase._GEOS_CLASSES = { 0: Point, 1: LineString, @@ -447,7 +448,7 @@ def transform(self, ct, clone=False): """ Requires GDAL. Transform the geometry according to the given transformation object, which may be an integer SRID, and WKT or - PROJ.4 string. By default, transform the geometry in-place and return + PROJ string. By default, transform the geometry in-place and return nothing. However if the `clone` keyword is set, don't modify the geometry and return a transformed clone instead. """ diff --git a/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo index b9813610fa45..083951f7d9f7 100644 Binary files a/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ar/LC_MESSAGES/django.po b/django/contrib/gis/locale/ar/LC_MESSAGES/django.po index 51900e2e37a3..092b5dfc9082 100644 --- a/django/contrib/gis/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ar/LC_MESSAGES/django.po @@ -5,13 +5,14 @@ # Bashar Al-Abdulhadi, 2014 # Eyad Toma , 2013 # Jannis Leidel , 2011 +# Muaaz Alsaied, 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-02 11:32+0000\n" +"Last-Translator: Muaaz Alsaied\n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,10 +28,8 @@ msgid "The base GIS field." msgstr "حقل نظم المعلومات الجغرافية الرئيسي" msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "" -"قاعدة الحقل الهندسي ترتكز لمواصفات نوع OpenGIS (نظم المعلومات الجغرافية " -"المفتوحة) الهندسية." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "قاعدة حقل Geometry -- مُرتبط بنوع مواصفات OpenGIS الهندسية." msgid "Point" msgstr "نقطة إحداثية" @@ -86,5 +85,5 @@ msgid "No feeds are registered." msgstr "لا موجز مسجّل" #, python-format -msgid "Slug %r isn't registered." -msgstr "Slug %r غير مسجّل" +msgid "Slug %r isn’t registered." +msgstr "Slug %r غير مسجّل." diff --git a/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..55a61ec55419 Binary files /dev/null and b/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.po b/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.po new file mode 100644 index 000000000000..c1d13f895535 --- /dev/null +++ b/django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.po @@ -0,0 +1,88 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Riterix , 2019 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2019-12-14 22:46+0000\n" +"Last-Translator: Riterix \n" +"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/" +"language/ar_DZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar_DZ\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" + +msgid "GIS" +msgstr "نظم المعلومات الجغرافية GIS" + +msgid "The base GIS field." +msgstr "حقل نظم المعلومات الجغرافية الرئيسي" + +msgid "" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "" +"قاعدة الحقل الهندسي ترتكز لمواصفات نوع OpenGIS (نظم المعلومات الجغرافية " +"المفتوحة) الهندسية." + +msgid "Point" +msgstr "نقطة إحداثية" + +msgid "Line string" +msgstr "سطر تسلسل أحرف" + +msgid "Polygon" +msgstr "مُضلّع إحداثي" + +msgid "Multi-point" +msgstr "نقاط إحداثية" + +msgid "Multi-line string" +msgstr "تسلسل أحرف متعدد الأسطر" + +msgid "Multi polygon" +msgstr "مجموعة مُضلعات إحداثية" + +msgid "Geometry collection" +msgstr "مجموعة إحداثية" + +msgid "Extent Aggregate Field" +msgstr "حقل مجموع التحصيل\"" + +msgid "Raster Field" +msgstr "حقل خطوط المسح التسامتي" + +msgid "No geometry value provided." +msgstr "لم تُدخل أي أحداثيات." + +msgid "Invalid geometry value." +msgstr "الإحداثيات غير صحيحة." + +msgid "Invalid geometry type." +msgstr "نوع الإحداثيات غير صحيح." + +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID." + +msgid "Delete all Features" +msgstr "حذف جميع المميزات" + +msgid "WKT debugging window:" +msgstr "نافذة تدقيق WKT:" + +msgid "Debugging window (serialized value)" +msgstr "نافذة التدقيق (قيمة تسلسلية)" + +msgid "No feeds are registered." +msgstr "لا موجز مسجّل" + +#, python-format +msgid "Slug %r isn’t registered." +msgstr "Slug %r غير مسجّل" diff --git a/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo b/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo index 7c653190c5d2..c8e43acb75f8 100644 Binary files a/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/bg/LC_MESSAGES/django.po b/django/contrib/gis/locale/bg/LC_MESSAGES/django.po index 614a6ec07aae..e9e5aeb3266c 100644 --- a/django/contrib/gis/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/bg/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Georgi Kostadinov , 2012 -# Todor Lubenov , 2016 -# Todor Lubenov , 2011,2015 +# Todor Lubenov , 2016,2020 +# Todor Lubenov , 2011,2015,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-02-28 07:20+0000\n" +"Last-Translator: Todor Lubenov \n" "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -26,9 +26,9 @@ msgid "The base GIS field." msgstr "Базово ГИС поле." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -"Основното ГИС поле - карти за спецификация от OpenGIS геометричен тип." +"Базово Геометричнно поле — карти от OpenGIS Specification Geometry тип." msgid "Point" msgstr "Точка" @@ -86,5 +86,5 @@ msgid "No feeds are registered." msgstr "Няма регистрирани фийда." #, python-format -msgid "Slug %r isn't registered." -msgstr "Слъгът %r не е регистриран." +msgid "Slug %r isn’t registered." +msgstr "Slug %r не е регистриран." diff --git a/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo index 2504a4e6eb68..cb6f6fd49430 100644 Binary files a/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ca/LC_MESSAGES/django.po b/django/contrib/gis/locale/ca/LC_MESSAGES/django.po index 0e4a0f397724..a0598fa256d7 100644 --- a/django/contrib/gis/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ca/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Carles Barrobés , 2012,2014 # duub qnnp, 2015 # Jannis Leidel , 2011 +# Manel Clos , 2020 # Roger Pons , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-04-28 20:24+0000\n" +"Last-Translator: Manel Clos \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -28,10 +29,10 @@ msgid "The base GIS field." msgstr "El camp base de GIS" msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -"El camp base de Geometry -- mapeja amb el tipus Geometry d'OpenGIS " -"Specification" +"El camp base Geometry -- correspon al tipus Geometry de l'especificació " +"OpenGIS." msgid "Point" msgstr "Punt" @@ -89,5 +90,5 @@ msgid "No feeds are registered." msgstr "No s'han registrat canal de contingut" #, python-format -msgid "Slug %r isn't registered." -msgstr "L'slug %r no està registrat" +msgid "Slug %r isn’t registered." +msgstr "El 'slug' %r no està registrat" diff --git a/django/contrib/gis/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/gis/locale/dsb/LC_MESSAGES/django.mo index 908ad37e6753..4908099cebe7 100644 Binary files a/django/contrib/gis/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/dsb/LC_MESSAGES/django.po b/django/contrib/gis/locale/dsb/LC_MESSAGES/django.po index e375d4096851..2af0a36f77f9 100644 --- a/django/contrib/gis/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/dsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016 +# Michael Wolf , 2016,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 00:02+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-25 16:08+0000\n" +"Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "The base GIS field." msgstr "Bazowe pólo GIS." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" "Bazowe geometrijowe pólo -- wužywa geometrijowy typ specifikacije OpenGIS." @@ -85,5 +85,5 @@ msgid "No feeds are registered." msgstr "Žedne kanale njejsu zregistrěrowane." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Adresowe mě %r njejo zregistrěrowane." diff --git a/django/contrib/gis/locale/es/LC_MESSAGES/django.mo b/django/contrib/gis/locale/es/LC_MESSAGES/django.mo index f64fb931c8a0..b6b01b127d88 100644 Binary files a/django/contrib/gis/locale/es/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/es/LC_MESSAGES/django.po b/django/contrib/gis/locale/es/LC_MESSAGES/django.po index e9816f094ccf..9cd5793be725 100644 --- a/django/contrib/gis/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/es/LC_MESSAGES/django.po @@ -8,13 +8,14 @@ # Jannis Leidel , 2011 # Josue Naaman Nistal Guerra , 2014 # Marc Garcia , 2011 +# Uriel Medina , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-08 08:24+0000\n" -"Last-Translator: Ernesto Avilés\n" +"PO-Revision-Date: 2020-09-25 17:36+0000\n" +"Last-Translator: Uriel Medina \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -32,8 +33,7 @@ msgstr "El campo GIS base." msgid "" "The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -"El campo base Geometry -- coincide con el tipo OpenGIS Specification " -"Geometry." +"El campo base Geometry — coincide con el tipo OpenGIS Specification Geometry." msgid "Point" msgstr "Punto" diff --git a/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo b/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo index 30dc38fe9da9..79cae79daa8a 100644 Binary files a/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/eu/LC_MESSAGES/django.po b/django/contrib/gis/locale/eu/LC_MESSAGES/django.po index 794392529c28..73fe949eb20a 100644 --- a/django/contrib/gis/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/eu/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # Translators: # Aitzol Naberan , 2011-2012 # Eneko Illarramendi , 2017 -# Urtzi Odriozola , 2017 +# Urtzi Odriozola , 2017,2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-25 08:06+0000\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-03-18 15:45+0000\n" "Last-Translator: Urtzi Odriozola \n" "Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n" "MIME-Version: 1.0\n" @@ -25,10 +25,9 @@ msgid "The base GIS field." msgstr "Oinarrizko GIS eremua." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -"Oinarrizko Geometria eremua -- OpenGIS zehaztapeneko Geomtry motarentzat " -"mapak" +"Oinarrizko Geometria eremua — OpenGIS zehaztapeneko Geomtry motarentzat mapak" msgid "Point" msgstr "Puntua" @@ -84,5 +83,5 @@ msgid "No feeds are registered." msgstr "Ez dago jariorik erregistratuta." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "%r sluga ez dago erregistratuta." diff --git a/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo index fdca98ad1f2e..49b5eb3bb26d 100644 Binary files a/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/fa/LC_MESSAGES/django.po b/django/contrib/gis/locale/fa/LC_MESSAGES/django.po index dc8a88533c0b..e362a12f8bf3 100644 --- a/django/contrib/gis/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/fa/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Ali Nikneshan , 2012-2013 +# Ali Nikneshan , 2012-2013,2020 # Alireza Savand , 2013 # Ali Vakilzade , 2015 # Jannis Leidel , 2011 @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-11-06 08:17+0000\n" +"Last-Translator: Ali Nikneshan \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "The base GIS field." msgstr "پایه‌ی سیستم اطلاعات جغرافیایی میدانی." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "پایه‌ی فیلد هندسی --نوع خاص هندسه‌ی نقشه‌ها‌ی نوع OpenGIS" msgid "Point" @@ -86,5 +86,5 @@ msgid "No feeds are registered." msgstr "هیچ فیدی ثبت شده است." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Slug %r ثبت نشده" diff --git a/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo index a60917b124fd..19f994db3ee0 100644 Binary files a/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/fi/LC_MESSAGES/django.po b/django/contrib/gis/locale/fi/LC_MESSAGES/django.po index 88f22694e0b1..64b904057d8f 100644 --- a/django/contrib/gis/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/fi/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015 +# Aarni Koskela, 2015,2020 # Antti Kaihola , 2011 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-12-09 06:30+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "The base GIS field." msgstr "GIS-peruskenttä." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "Geometriaperuskenttä – vastaa OpenGIS-määrittelyn geometriatyyppiä." msgid "Point" @@ -83,5 +83,5 @@ msgid "No feeds are registered." msgstr "Syötteitä ei ole rekisteröity." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Lyhytnimeä %r ei ole rekisteröity." diff --git a/django/contrib/gis/locale/he/LC_MESSAGES/django.mo b/django/contrib/gis/locale/he/LC_MESSAGES/django.mo index 2d0352c8643c..1c5c981e2032 100644 Binary files a/django/contrib/gis/locale/he/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/he/LC_MESSAGES/django.po b/django/contrib/gis/locale/he/LC_MESSAGES/django.po index 94b954eb3901..4a366912815f 100644 --- a/django/contrib/gis/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/he/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# Meir Kriheli , 2012,2014-2015 +# Meir Kriheli , 2012,2014-2015,2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-08-02 13:28+0000\n" +"Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/django/django/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,8 +25,8 @@ msgid "The base GIS field." msgstr "שדה GIS הבסיסי." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "השדה הגיאומטרי הבסיסי -- ממופה לטיפוס OpenGIS Specification Geometry." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "שדה Geometry הבסיסי —ממופה לטיפוס OpenGIS Specification Geometry." msgid "Point" msgstr "נקודה" @@ -82,5 +82,5 @@ msgid "No feeds are registered." msgstr "לא נרשמו פידים." #, python-format -msgid "Slug %r isn't registered." -msgstr "Slug %r אינו רשום." +msgid "Slug %r isn’t registered." +msgstr "ה־Slug %r אינו רשום." diff --git a/django/contrib/gis/locale/it/LC_MESSAGES/django.mo b/django/contrib/gis/locale/it/LC_MESSAGES/django.mo index f722f40e4aa4..d454db43ce61 100644 Binary files a/django/contrib/gis/locale/it/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/it/LC_MESSAGES/django.po b/django/contrib/gis/locale/it/LC_MESSAGES/django.po index aea2b9439fe7..c86f18f3f888 100644 --- a/django/contrib/gis/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/it/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # yakky , 2015 # Jannis Leidel , 2011 # Marco Bonetti, 2014 +# Mirco Grillo , 2020 # Nicola Larosa , 2012 # palmux , 2015 # Mattia Procopio , 2015 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-23 08:59+0000\n" +"Last-Translator: Mirco Grillo \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -29,9 +30,9 @@ msgid "The base GIS field." msgstr "Il campo GIS base." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -"Il campo base GIS -- corrisponde al tipo Geometry delle specifiche OpenGIS." +"Il campo Geometry -- corrisponde al tipo Geometry delle specifiche OpenGIS." msgid "Point" msgstr "Punto" @@ -89,5 +90,5 @@ msgid "No feeds are registered." msgstr "Non ci sono feed registrati." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Lo slug %r non è registrato." diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo index 754d6a85bbc3..eb2ac4eb88f6 100644 Binary files a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po index acc0f9e0cd51..c942ed5c3b3e 100644 --- a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Jannis Leidel , 2011 # Shinya Okano , 2012,2014-2015 +# Takuya N , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-02-06 11:58+0000\n" +"Last-Translator: Takuya N \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -25,8 +26,8 @@ msgid "The base GIS field." msgstr "基底GISフィールド" msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "基底GISフィールド -- OpenGIS で決められた地形タイプに対応します。" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "基底GISフィールド — OpenGIS で決められた地形タイプに対応します。" msgid "Point" msgstr "点" @@ -84,5 +85,5 @@ msgid "No feeds are registered." msgstr "フィードが登録されていません。" #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "スラグ %r は登録されていません。" diff --git a/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo index cc18ae22fd2d..0c2cbbeb4d33 100644 Binary files a/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ko/LC_MESSAGES/django.po b/django/contrib/gis/locale/ko/LC_MESSAGES/django.po index 7b4171a968e3..cb9dc289b4f7 100644 --- a/django/contrib/gis/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ko/LC_MESSAGES/django.po @@ -4,17 +4,18 @@ # Jiyoon, Ha , 2016 # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jay Oh , 2020 # Le Tartuffe , 2014 -# Chr0m3 , 2015 +# JunGu Kang , 2015 # 이지현 , 2017 # minsung kang, 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: 이지현 \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-07-04 14:22+0000\n" +"Last-Translator: Jay Oh \n" "Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,8 +30,8 @@ msgid "The base GIS field." msgstr "기본 GIS 필드" msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "기본 지리 정보 필드 -- 오픈GIS에 특화된 지리 정보 형식의 맵" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "기본 지리 정보 필드 — 오픈GIS에 특화된 지리 정보 형식의 맵" msgid "Point" msgstr "위치" @@ -86,5 +87,5 @@ msgid "No feeds are registered." msgstr "등록된 피드가 없습니다." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "%r 이/가 등록되지 않았습니다." diff --git a/django/contrib/gis/locale/ky/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ky/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..24662a0f8511 Binary files /dev/null and b/django/contrib/gis/locale/ky/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ky/LC_MESSAGES/django.po b/django/contrib/gis/locale/ky/LC_MESSAGES/django.po new file mode 100644 index 000000000000..f30040b64d19 --- /dev/null +++ b/django/contrib/gis/locale/ky/LC_MESSAGES/django.po @@ -0,0 +1,86 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Soyuzbek Orozbek uulu , 2020 +# Soyuzbek Orozbek uulu , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-23 06:01+0000\n" +"Last-Translator: Soyuzbek Orozbek uulu \n" +"Language-Team: Kyrgyz (http://www.transifex.com/django/django/language/ky/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ky\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "GIS" +msgstr "GIS" + +msgid "The base GIS field." +msgstr "Негизги GIS талаасы" + +msgid "" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "" +"негизги Геометр талаасы — OpenGIS Геометрдик көрсөтмөлө тибине дал келет." + +msgid "Point" +msgstr "Чекит" + +msgid "Line string" +msgstr "Сап сызыгы" + +msgid "Polygon" +msgstr "Көпбурчтук" + +msgid "Multi-point" +msgstr "Көп чекит" + +msgid "Multi-line string" +msgstr "Көпсап" + +msgid "Multi polygon" +msgstr "Көп көпбурчтук" + +msgid "Geometry collection" +msgstr "Геометр жыйындысы" + +msgid "Extent Aggregate Field" +msgstr "Кошумча Агрегат талаасы" + +msgid "Raster Field" +msgstr "Растр Талаасы" + +msgid "No geometry value provided." +msgstr "геометр маани тейленбейт." + +msgid "Invalid geometry value." +msgstr "Ката геометр маани." + +msgid "Invalid geometry type." +msgstr "Ката геометр тиби." + +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "геометр аймагынын маанисин SRID ге которгондо ката чыкты." + +msgid "Delete all Features" +msgstr "Бүт касиеттерди өчүр" + +msgid "WKT debugging window:" +msgstr "WKT оңдоо терезеси" + +msgid "Debugging window (serialized value)" +msgstr "Оңдоо терезеси (кысымдалган маани)" + +msgid "No feeds are registered." +msgstr "Кадамдар катталган эмес." + +#, python-format +msgid "Slug %r isn’t registered." +msgstr "%r слагы катталган эмес." diff --git a/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo index c72aba64c7eb..5b3ba175663c 100644 Binary files a/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ro/LC_MESSAGES/django.po b/django/contrib/gis/locale/ro/LC_MESSAGES/django.po index 713aba9e7f7c..a16b5c52b3ac 100644 --- a/django/contrib/gis/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ro/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Bogdan Mateescu, 2019 # Daniel Ursache-Dogariu, 2011 # Denis Darii , 2011,2014 +# Eugenol Man , 2020 # Razvan Stefanescu , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-10-12 00:00+0000\n" -"Last-Translator: Bogdan Mateescu\n" +"PO-Revision-Date: 2020-07-15 11:21+0000\n" +"Last-Translator: Eugenol Man \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -88,4 +89,4 @@ msgstr "Nici un feed registrat." #, python-format msgid "Slug %r isn’t registered." -msgstr "" +msgstr "Slug %r nu este înregistrat." diff --git a/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo index 880b91606b9b..b1b7e27a8a27 100644 Binary files a/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ru/LC_MESSAGES/django.po b/django/contrib/gis/locale/ru/LC_MESSAGES/django.po index a908a6cb5796..93ae32355688 100644 --- a/django/contrib/gis/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ru/LC_MESSAGES/django.po @@ -1,17 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Eugene MechanisM , 2012 +# Eugene , 2012 # eXtractor , 2015 +# crazyzubr , 2020 # Jannis Leidel , 2011 # Алексей Борискин , 2012,2014-2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-14 18:54+0000\n" +"Last-Translator: crazyzubr \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgid "The base GIS field." msgstr "Базовое ГИС-поле." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" "Базовое геометрическое поле. Соответствует типу OpenGIS Specification " "Geometry." @@ -89,5 +90,5 @@ msgid "No feeds are registered." msgstr "Нет зарегистрированных фидов." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Слаг %r не зарегистрирован." diff --git a/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo index 7b3b58569b1e..be5be6cf1b24 100644 Binary files a/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/sk/LC_MESSAGES/django.po b/django/contrib/gis/locale/sk/LC_MESSAGES/django.po index 9ad9a85c8d34..91fcc1448d44 100644 --- a/django/contrib/gis/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/sk/LC_MESSAGES/django.po @@ -2,22 +2,24 @@ # # Translators: # Jannis Leidel , 2011 -# Juraj Bubniak , 2012 +# 18f25ad6fa9930fc67cb11aca9d16a27, 2012 # Marian Andre , 2015,2017 # Martin Tóth , 2017 +# Štefan Lučivjanský , 2021 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Marian Andre \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-04-04 00:03+0000\n" +"Last-Translator: Štefan Lučivjanský \n" "Language-Team: Slovak (http://www.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n " +">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n" msgid "GIS" msgstr "GIS" @@ -26,9 +28,8 @@ msgid "The base GIS field." msgstr "Základné GIS pole." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "" -"Základné pole Geometry -- mapuje na typ OpenGIS Specification Geometry." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "Základné pole Geometry — mapuje na typ OpenGIS Specification Geometry." msgid "Point" msgstr "Bod" @@ -84,5 +85,5 @@ msgid "No feeds are registered." msgstr "Žiadne kanály nie sú registrované." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Identifikátor %r nie je registrovaný." diff --git a/django/contrib/gis/locale/tg/LC_MESSAGES/django.mo b/django/contrib/gis/locale/tg/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..257eae1e655e Binary files /dev/null and b/django/contrib/gis/locale/tg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/tg/LC_MESSAGES/django.po b/django/contrib/gis/locale/tg/LC_MESSAGES/django.po new file mode 100644 index 000000000000..e05714bab9d7 --- /dev/null +++ b/django/contrib/gis/locale/tg/LC_MESSAGES/django.po @@ -0,0 +1,84 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Surush Sufiew , 2020 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-05-15 01:08+0000\n" +"Last-Translator: Surush Sufiew \n" +"Language-Team: Tajik (http://www.transifex.com/django/django/language/tg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "GIS" +msgstr "GIS" + +msgid "The base GIS field." +msgstr "Майдони асосии GIS" + +msgid "" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "" + +msgid "Point" +msgstr "" + +msgid "Line string" +msgstr "" + +msgid "Polygon" +msgstr "" + +msgid "Multi-point" +msgstr "" + +msgid "Multi-line string" +msgstr "" + +msgid "Multi polygon" +msgstr "" + +msgid "Geometry collection" +msgstr "" + +msgid "Extent Aggregate Field" +msgstr "" + +msgid "Raster Field" +msgstr "" + +msgid "No geometry value provided." +msgstr "" + +msgid "Invalid geometry value." +msgstr "" + +msgid "Invalid geometry type." +msgstr "Шакли нодурусти геометрӣ" + +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" + +msgid "Delete all Features" +msgstr "" + +msgid "WKT debugging window:" +msgstr "" + +msgid "Debugging window (serialized value)" +msgstr "" + +msgid "No feeds are registered." +msgstr "" + +#, python-format +msgid "Slug %r isn’t registered." +msgstr "" diff --git a/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo index 2437a6326bee..8624acd166d6 100644 Binary files a/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/uk/LC_MESSAGES/django.po b/django/contrib/gis/locale/uk/LC_MESSAGES/django.po index 1d6a3c05fd87..f95de8512b9b 100644 --- a/django/contrib/gis/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/uk/LC_MESSAGES/django.po @@ -1,7 +1,8 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Денис Подлесный , 2016 +# Denis Podlesniy , 2016 +# Illia Volochii , 2021 # Jannis Leidel , 2011 # Kirill Gagarski , 2016 # Max V. Stotsky , 2014 @@ -12,17 +13,19 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2021-01-19 23:54+0000\n" +"Last-Translator: Illia Volochii \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != " +"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % " +"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || " +"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" msgid "GIS" msgstr "ГІС" @@ -31,8 +34,9 @@ msgid "The base GIS field." msgstr "Базове GIS поле." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "Базове Geometry поле -- карти з OpenGIS Специфікацією Geometry типу." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "" +"Базове поле Geometry, яке відповідає типу Geometry із специфікації OpenGIS" msgid "Point" msgstr "Точка" @@ -88,5 +92,5 @@ msgid "No feeds are registered." msgstr "Немає зареєстрованих підписок." #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "Слаг %r не зареєстрований." diff --git a/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.mo index 60358e743394..df7d9fd71840 100644 Binary files a/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.po index ce6b46f94e05..176ff1c366ee 100644 --- a/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,15 +7,16 @@ # Lele Long , 2011,2015 # mozillazg , 2016 # Ronald White , 2014 +# wolf ice , 2020 # Kevin Sze , 2012 # 航 柯 , 2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2018-10-15 08:06+0000\n" -"Last-Translator: 航 柯 \n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2020-03-04 03:38+0000\n" +"Last-Translator: wolf ice \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -31,8 +32,8 @@ msgid "The base GIS field." msgstr "基础 GIS 字段。" msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "基础 Geometry 字段 -- 映射到 OpenGIS 规范几何类型。" +"The base Geometry field — maps to the OpenGIS Specification Geometry type." +msgstr "基本几何字段—映射到OpenGIS规范几何类型。" msgid "Point" msgstr "点" @@ -88,5 +89,5 @@ msgid "No feeds are registered." msgstr "没有已注册的源。" #, python-format -msgid "Slug %r isn't registered." -msgstr "Slug %r 没有注册." +msgid "Slug %r isn’t registered." +msgstr "字段 %r没被注册" diff --git a/django/contrib/gis/management/__init__.py b/django/contrib/gis/management/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/contrib/gis/management/commands/__init__.py b/django/contrib/gis/management/commands/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/django/contrib/gis/management/commands/ogrinspect.py b/django/contrib/gis/management/commands/ogrinspect.py index d4a7b164006f..12c1db392f2f 100644 --- a/django/contrib/gis/management/commands/ogrinspect.py +++ b/django/contrib/gis/management/commands/ogrinspect.py @@ -37,7 +37,7 @@ class Command(BaseCommand): ' ./manage.py ogrinspect zipcode.shp Zipcode' ) - requires_system_checks = False + requires_system_checks = [] def add_arguments(self, parser): parser.add_argument('data_source', help='Path to the data source.') @@ -107,6 +107,7 @@ def handle(self, *args, **options): # Returning the output of ogrinspect with the given arguments # and options. from django.contrib.gis.utils.ogrinspect import _ogrinspect, mapping + # Filter options to params accepted by `_ogrinspect` ogr_options = {k: v for k, v in options.items() if k in get_func_args(_ogrinspect) and v is not None} diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py index 9cb2db83a2d9..7e571f14dd6c 100644 --- a/django/contrib/gis/measure.py +++ b/django/contrib/gis/measure.py @@ -89,6 +89,9 @@ def __eq__(self, other): else: return NotImplemented + def __hash__(self): + return hash(self.standard) + def __lt__(self, other): if isinstance(other, self.__class__): return self.standard < other.standard diff --git a/django/contrib/gis/static/gis/js/OLMapWidget.js b/django/contrib/gis/static/gis/js/OLMapWidget.js index 089ffd38d24f..29725636a320 100644 --- a/django/contrib/gis/static/gis/js/OLMapWidget.js +++ b/django/contrib/gis/static/gis/js/OLMapWidget.js @@ -50,7 +50,7 @@ ol.inherits(GeometryTypeControl, ol.control.Control); default_lat: 0, default_lon: 0, default_zoom: 12, - is_collection: options.geom_name.indexOf('Multi') > -1 || options.geom_name.indexOf('Collection') > -1 + is_collection: options.geom_name.includes('Multi') || options.geom_name.includes('Collection') }; // Altering using user-provided options @@ -133,7 +133,7 @@ ol.inherits(GeometryTypeControl, ol.control.Control); // Initialize the draw interaction let geomType = this.options.geom_name; - if (geomType === "Unknown" || geomType === "GeometryCollection") { + if (geomType === "Geometry" || geomType === "GeometryCollection") { // Default to Point, but create icons to switch type geomType = "Point"; this.currentGeometryType = new GeometryTypeControl({widget: this, type: "Point", active: true}); diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 5d565f0d71e8..6943a5beaead 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -3,7 +3,7 @@ -
    - -
    -

    {% blocktranslate %}View release notes for Django {{ version }}{% endblocktranslate %}

    -
    +
    + +

    {% blocktranslate %}View release notes for Django {{ version }}{% endblocktranslate %}

    -
    - - - - - - - - - - - - - - - - -
    -

    {% translate "The install worked successfully! Congratulations!" %}

    + +

    {% translate "The install worked successfully! Congratulations!" %}

    {% blocktranslate %}You are seeing this page because DEBUG=True is in your settings file and you have not configured any URLs.{% endblocktranslate %}

    - diff --git a/django/views/templates/technical_404.html b/django/views/templates/technical_404.html index bc0858bba2b8..c47dae22af20 100644 --- a/django/views/templates/technical_404.html +++ b/django/views/templates/technical_404.html @@ -20,11 +20,13 @@ #info ol li { font-family: monospace; } #summary { background: #ffc; } #explanation { background:#eee; border-bottom: 0px none; } + pre.exception_value { font-family: sans-serif; color: #575757; font-size: 1.5em; margin: 10px 0 10px 0; }

    Page not found (404)

    + {% if reason and resolved %}
    {{ reason }}
    {% endif %}
    @@ -60,17 +62,18 @@

    Page not found (404)

    {% if request_path %} - The current path, {{ request_path }},{% else %} - The empty path{% endif %} didn't match any of these. + The current path, {{ request_path }}, + {% else %} + The empty path + {% endif %} + {% if resolved %}matched the last one.{% else %}didn’t match any of these.{% endif %}

    - {% else %} -

    {{ reason }}

    {% endif %}

    - You're seeing this error because you have DEBUG = True in + You’re seeing this error because you have DEBUG = True in your Django settings file. Change that to False, and Django will display a standard 404 page.

    diff --git a/django/views/templates/technical_500.html b/django/views/templates/technical_500.html index a384c10b9aba..0ed70d50ca41 100644 --- a/django/views/templates/technical_500.html +++ b/django/views/templates/technical_500.html @@ -225,7 +225,11 @@

    Traceback{% if not is_email %} - {{ frame.filename }}, line {{ frame.lineno }}, in {{ frame.function }} + {% if not frame.tb %} + {% if forloop.first %}None{% else %}Traceback: None{% endif %} + {% else %} + {{ frame.filename }}, line {{ frame.lineno }}, in {{ frame.function }} + {% endif %} {% if frame.context_line %}
    @@ -278,7 +282,7 @@

    Local Vars

    {% endfor %}
    - + {% if not is_email %}
    @@ -319,8 +323,8 @@

    Local Vars

    The above exception ({{ frame.exc_cause|force_escape }}) was the direct cause of the following exception: {% else %} During handling of the above exception ({{ frame.exc_cause|force_escape }}), another exception occurred: -{% endif %}{% endif %}{% endifchanged %} File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }} -{% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %}{% endfor %} +{% endif %}{% endif %}{% endifchanged %} {% if frame.tb %}File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }} +{% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %}{% else %}{% if forloop.first %}None{% else %}Traceback: None{% endif %}{% endif %}{% endfor %} Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %} Exception Value: {{ exception_value|force_escape }} @@ -474,7 +478,7 @@

    Using settings module {{ settings.SETTINGS_MODULE }}

    {% if not is_email %}

    - You're seeing this error because you have DEBUG = True in your + You’re seeing this error because you have DEBUG = True in your Django settings file. Change that to False, and Django will display a standard page generated by the handler for this status code.

    diff --git a/django/views/templates/technical_500.txt b/django/views/templates/technical_500.txt index f06a1a499ec1..551413aab791 100644 --- a/django/views/templates/technical_500.txt +++ b/django/views/templates/technical_500.txt @@ -30,8 +30,8 @@ In template {{ template_info.name }}, error at line {{ template_info.line }} Traceback (most recent call last): {% for frame in frames %}{% ifchanged frame.exc_cause %}{% if frame.exc_cause %} {% if frame.exc_cause_explicit %}The above exception ({{ frame.exc_cause }}) was the direct cause of the following exception:{% else %}During handling of the above exception ({{ frame.exc_cause }}), another exception occurred:{% endif %} -{% endif %}{% endifchanged %} File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }} -{% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %} +{% endif %}{% endifchanged %} {% if frame.tb %}File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }} +{% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %}{% else %}{% if forloop.first %}None{% else %}Traceback: None{% endif %}{% endif %} {% endfor %} {% if exception_type %}Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %} {% if exception_value %}Exception Value: {{ exception_value }}{% endif %}{% endif %}{% endif %} @@ -59,7 +59,7 @@ Using settings module {{ settings.SETTINGS_MODULE }}{% for k, v in settings.item {{ k }} = {{ v|stringformat:"r" }}{% endfor %} {% if not is_email %} -You're seeing this error because you have DEBUG = True in your +You’re seeing this error because you have DEBUG = True in your Django settings file. Change that to False, and Django will display a standard page generated by the handler for this status code. {% endif %} diff --git a/docs/Makefile b/docs/Makefile index 39f84ec0e3ff..2b4483053124 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,6 +9,11 @@ PAPER ?= BUILDDIR ?= _build LANGUAGE ?= +# Set the default language. +ifndef LANGUAGE +override LANGUAGE = en +endif + # Convert something like "en_US" to "en", because Sphinx does not recognize # underscores. Country codes should be passed using a dash, e.g. "pt-BR". LANGUAGEOPT = $(firstword $(subst _, ,$(LANGUAGE))) diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 094741d9528d..6eadc23144dd 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -8,13 +8,13 @@ from docutils import nodes from docutils.parsers.rst import Directive from docutils.statemachine import ViewList -from sphinx import addnodes +from sphinx import addnodes, version_info as sphinx_version from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.directives.code import CodeBlock from sphinx.domains.std import Cmdoption -from sphinx.errors import ExtensionError, SphinxError +from sphinx.errors import ExtensionError from sphinx.util import logging -from sphinx.util.console import bold, red +from sphinx.util.console import bold from sphinx.writers.html import HTMLTranslator logger = logging.getLogger(__name__) @@ -115,19 +115,38 @@ class DjangoHTMLTranslator(HTMLTranslator): def visit_table(self, node): self.context.append(self.compact_p) self.compact_p = True - self._table_row_index = 0 # Needed by Sphinx + # Needed by Sphinx. + if sphinx_version >= (4, 3): + self._table_row_indices.append(0) + else: + self._table_row_index = 0 self.body.append(self.starttag(node, 'table', CLASS='docutils')) def depart_table(self, node): self.compact_p = self.context.pop() + if sphinx_version >= (4, 3): + self._table_row_indices.pop() self.body.append('

    Request Method:
    \n') def visit_desc_parameterlist(self, node): self.body.append('(') # by default sphinx puts around the "(" - self.first_param = 1 self.optional_param_level = 0 self.param_separator = node.child_text_separator - self.required_params_left = sum(isinstance(c, addnodes.desc_parameter) for c in node.children) + # Counts 'parameter groups' being either a required parameter, or a set + # of contiguous optional ones. + required_params = [ + isinstance(c, addnodes.desc_parameter) for c in node.children + ] + # How many required parameters are left. + self.required_params_left = sum(required_params) + if sphinx_version < (7, 1): + self.first_param = 1 + else: + self.is_first_param = True + self.params_left_at_level = 0 + self.param_group_index = 0 + self.list_is_required_param = required_params + self.multi_line_parameter_list = False def depart_desc_parameterlist(self, node): self.body.append(')') @@ -378,8 +397,9 @@ def default_role_error( name, rawtext, text, lineno, inliner, options=None, content=None ): msg = ( - "Default role used (`single backticks`) at line %s: %s. Did you mean " - "to use two backticks for ``code``, or miss an underscore for a " - "`link`_ ?" % (lineno, rawtext) + "Default role used (`single backticks`): %s. Did you mean to use two " + "backticks for ``code``, or miss an underscore for a `link`_ ?" + % rawtext ) - raise SphinxError(red(msg)) + logger.warning(msg, location=(inliner.document.current_source, lineno)) + return [nodes.Text(text)], [] diff --git a/docs/_theme/djangodocs/static/djangodocs.css b/docs/_theme/djangodocs/static/djangodocs.css index 1a397f44c0f6..0b6a8b9ad3bc 100644 --- a/docs/_theme/djangodocs/static/djangodocs.css +++ b/docs/_theme/djangodocs/static/djangodocs.css @@ -43,12 +43,13 @@ div.nav { margin: 0; font-size: 11px; text-align: right; color: #487858;} /*** basic styles ***/ dd { margin-left:15px; } -h1,h2,h3,h4,h5 { margin-top:1em; font-family:"Trebuchet MS",sans-serif; font-weight:normal; } +h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11,h12 { margin-top:1em; font-family:"Trebuchet MS",sans-serif; font-weight:normal; } h1 { font-size:218%; margin-top:0.6em; margin-bottom:.4em; line-height:1.1em; } h2 { font-size:175%; margin-bottom:.6em; line-height:1.2em; color:#092e20; } h3 { font-size:150%; font-weight:bold; margin-bottom:.2em; color:#487858; } h4 { font-size:125%; font-weight:bold; margin-top:1.5em; margin-bottom:3px; } h5 { font-size:110%; font-weight:bold; margin-top:1em; margin-bottom:3px; } +h6,h7,h8,h9,h10,h11,h12 { font-weight:bold; margin-bottom:3px; } div.figure { text-align: center; } div.figure p.caption { font-size:1em; margin-top:0; margin-bottom:1.5em; color: #555;} hr { color:#ccc; background-color:#ccc; height:1px; border:0; } @@ -102,6 +103,7 @@ dt .literal, table .literal { background:none; } #bd a.reference { text-decoration: none; } #bd a.reference tt.literal { border-bottom: 1px #234f32 dotted; } div.code-block-caption { color: white; background-color: #234F32; margin: 0; padding: 2px 5px; width: 100%; font-family: monospace; font-size: small; line-height: 1.3em; } +div.code-block-caption .literal {color: white; } div.literal-block-wrapper pre { margin-top: 0; } /* Restore colors of pygments hyperlinked code */ @@ -124,8 +126,9 @@ div.versionadded span.title, div.versionchanged span.title, span.versionmodified div.versionadded, div.versionchanged, div.deprecated { color:#555; } /*** p-links ***/ -a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; visibility: hidden; } -h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, h4:hover > a.headerlink, h5:hover > a.headerlink, h6:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } +a.headerlink { color: #c60f0f; font-size: 0.8em; margin-left: 4px; opacity: 0; text-decoration: none; } +h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, h4:hover > a.headerlink, h5:hover > a.headerlink, h6:hover > a.headerlink, dt:hover > a.headerlink { opacity: 1; } +a.headerlink:focus { opacity: 1; } /*** index ***/ table.indextable td { text-align: left; vertical-align: top;} diff --git a/docs/conf.py b/docs/conf.py index 316408dbf1b0..42d350052cbf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ # # Python's default allowed recursion depth is 1000 but this isn't enough for # building docs/ref/settings.txt sometimes. -# https://groups.google.com/d/topic/sphinx-dev/MtRf64eGtv4/discussion +# https://groups.google.com/g/sphinx-dev/c/MtRf64eGtv4/discussion sys.setrecursionlimit(2000) # Make sure we get the version of this copy of Django @@ -32,7 +32,7 @@ # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = '1.6.0' +needs_sphinx = "4.5.0" # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. @@ -70,8 +70,12 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'contents' +# The root toctree document. +root_doc = "contents" + +# Disable auto-created table of contents entries for all domain objects (e.g. +# functions, classes, attributes, etc.) in Sphinx 5.2+. +toc_object_entries = False # General substitutions. project = 'Django' @@ -83,7 +87,7 @@ # built documents. # # The short X.Y version. -version = '3.1' +version = '3.2' # The full version, including alpha/beta/rc tags. try: from django import VERSION, get_version @@ -99,14 +103,15 @@ def django_release(): release = django_release() # The "development version" of Django -django_next_version = '3.1' +django_next_version = '4.0' extlinks = { - 'commit': ('https://github.com/django/django/commit/%s', ''), - 'cve': ('https://nvd.nist.gov/view/vuln/detail?vulnId=%s', 'CVE-'), + "bpo": ("https://bugs.python.org/issue?@action=redirect&bpo=%s", "bpo-%s"), + "commit": ("https://github.com/django/django/commit/%s", "%s"), + "cve": ("https://nvd.nist.gov/vuln/detail/CVE-%s", "CVE-%s"), # A file or directory. GitHub redirects from blob to tree if needed. - 'source': ('https://github.com/django/django/blob/master/%s', ''), - 'ticket': ('https://code.djangoproject.com/ticket/%s', '#'), + "source": ("https://github.com/django/django/blob/main/%s", "%s"), + "ticket": ("https://code.djangoproject.com/ticket/%s", "#%s"), } # The language for content autogenerated by Sphinx. Refer to documentation @@ -124,7 +129,7 @@ def django_release(): # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build', '_theme'] +exclude_patterns = ['_build', '_theme', 'requirements.txt'] # The reST default role (used for this markup: `text`) to use for all documents. default_role = "default-role-error" @@ -240,7 +245,6 @@ def django_release(): # Appended to every page rst_epilog = """ .. |django-users| replace:: :ref:`django-users ` -.. |django-core-mentorship| replace:: :ref:`django-core-mentorship ` .. |django-developers| replace:: :ref:`django-developers ` .. |django-announce| replace:: :ref:`django-announce ` .. |django-updates| replace:: :ref:`django-updates ` @@ -304,7 +308,7 @@ def django_release(): # List of tuples (startdocname, targetname, title, author, dir_entry, # description, category, toctree_only) texinfo_documents = [( - master_doc, "django", "", "", "Django", + root_doc, "django", "", "", "Django", "Documentation of the Django framework", "Web development", False )] diff --git a/docs/faq/contributing.txt b/docs/faq/contributing.txt index 8d8eb2ded7f9..a65066307fc9 100644 --- a/docs/faq/contributing.txt +++ b/docs/faq/contributing.txt @@ -2,6 +2,8 @@ FAQ: Contributing code ====================== +.. _new-contributors-faq: + How can I get started contributing code to Django? ================================================== @@ -79,10 +81,10 @@ people that will likely be affected by a given bug. Bugs that have the potential to affect many people will generally get priority over those that are edge cases. -Another reason that bugs might be ignored for while is if the bug is a symptom -of a larger problem. While we can spend time writing, testing and applying -lots of little patches, sometimes the right solution is to rebuild. If a -rebuild or refactor of a particular component has been proposed or is +Another reason that a bug might be ignored for a while is if the bug is a +symptom of a larger problem. While we can spend time writing, testing and +applying lots of little patches, sometimes the right solution is to rebuild. If +a rebuild or refactor of a particular component has been proposed or is underway, you may find that bugs affecting that component will not get as much attention. Again, this is a matter of prioritizing scarce resources. By concentrating on the rebuild, we can close all the little bugs at once, and @@ -97,3 +99,9 @@ entire community, instead of prioritizing the impact on one particular user. This doesn't mean that we think your problem is unimportant -- just that in the limited time we have available, we will always err on the side of making 10 people happy rather than making a single person happy. + +I'm sure my ticket is absolutely 100% perfect, can I mark it as "Ready For Checkin" myself? +=========================================================================================== + +Sorry, no. It's always better to get another set of eyes on a ticket. If +you're having trouble getting that second set of eyes, see questions above. diff --git a/docs/faq/general.txt b/docs/faq/general.txt index 128c0d92882c..f984695d50c8 100644 --- a/docs/faq/general.txt +++ b/docs/faq/general.txt @@ -172,7 +172,7 @@ site is one module of Django the framework. Furthermore, although Django has special conveniences for building "CMS-y" apps, that doesn't mean it's not just as appropriate for building "non-CMS-y" apps (whatever that means!). -.. _Drupal: https://drupal.org/ +.. _Drupal: https://www.drupal.org/ How can I download the Django documentation to read it offline? =============================================================== @@ -197,7 +197,7 @@ software are still a matter of some debate. For example, `APA style`_, would dictate something like:: - Django (Version 1.5) [Computer Software]. (2013). Retrieved from https://djangoproject.com. + Django (Version 1.5) [Computer Software]. (2013). Retrieved from https://www.djangoproject.com/. However, the only true guide is what your publisher will accept, so get a copy of those guidelines and fill in the gaps as best you can. @@ -207,11 +207,11 @@ Foundation". If you need a publishing location, use "Lawrence, Kansas". -If you need a web address, use https://djangoproject.com. +If you need a web address, use https://www.djangoproject.com/. If you need a name, just use "Django", without any tagline. If you need a publication date, use the year of release of the version you're referencing (e.g., 2013 for v1.5) -.. _APA style: https://www.apastyle.org +.. _APA style: https://apastyle.apa.org/ diff --git a/docs/faq/help.txt b/docs/faq/help.txt index b27a1cef962a..9972e9a0ca5c 100644 --- a/docs/faq/help.txt +++ b/docs/faq/help.txt @@ -5,9 +5,9 @@ FAQ: Getting Help How do I do X? Why doesn't Y work? Where can I go to get help? ============================================================== -First, please check if your question is answered on the :doc:`FAQ `. -Also, search for answers using your favorite search engine, and in `the -forum`_. +First, please check if your question is answered on the :doc:`FAQ +`. Also, search for answers using your favorite search engine, and +in `the forum`_. .. _`the forum`: https://forum.djangoproject.com/ @@ -22,13 +22,13 @@ Then, please post it in one of the following channels: * The Django Forum section `"Using Django"`_. This is for web-based discussions. * The |django-users| mailing list. This is for email-based discussions. -* The `#django IRC channel`_ on the Freenode IRC network. This is for - chat-based discussions. If you're new to IRC, see the `Freenode +* The `#django IRC channel`_ on the Libera.Chat IRC network. This is for + chat-based discussions. If you're new to IRC, see the `Libera.Chat documentation`_ for different ways to connect. -.. _`"Using Django"`: https://forum.djangoproject.com/c/users -.. _#django IRC channel: https://webchat.freenode.net/#django -.. _Freenode documentation: https://freenode.net/kb/answer/chat +.. _`"Using Django"`: https://forum.djangoproject.com/c/users/6 +.. _#django IRC channel: https://web.libera.chat/#django +.. _Libera.Chat documentation: https://libera.chat/guides/connect In all these channels please abide by the `Django Code of Conduct`_. In summary, being friendly and patient, considerate, respectful, and careful in diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 2cbbb83b7f28..bcbaed226fc0 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -50,11 +50,10 @@ What Python version can I use with Django? ============== =============== Django version Python versions ============== =============== -1.11 2.7, 3.4, 3.5, 3.6, 3.7 (added in 1.11.17) -2.0 3.4, 3.5, 3.6, 3.7 -2.1 3.5, 3.6, 3.7 -2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8) -3.0, 3.1 3.6, 3.7, 3.8 +2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8), 3.9 (added in 2.2.17) +3.0 3.6, 3.7, 3.8, 3.9 (added in 3.0.11) +3.1 3.6, 3.7, 3.8, 3.9 (added in 3.1.3) +3.2 3.6, 3.7, 3.8, 3.9, 3.10 (added in 3.2.9) ============== =============== For each version of Python, only the latest micro release (A.B.C) is officially @@ -70,9 +69,6 @@ Django 1.8 is the last version to support Python 3.3. What Python version should I use with Django? ============================================= -Python 3 is recommended. Django 1.11 is the last version to support Python 2.7. -Support for Python 2.7 and Django 1.11 ends in 2020. - Since newer versions of Python are often faster, have more features, and are better supported, the latest version of Python 3 is recommended. diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt index 0145a580fd9a..f95ca1117433 100644 --- a/docs/faq/usage.txt +++ b/docs/faq/usage.txt @@ -2,12 +2,12 @@ FAQ: Using Django ================= -Why do I get an error about importing DJANGO_SETTINGS_MODULE? -============================================================= +Why do I get an error about importing :envvar:`DJANGO_SETTINGS_MODULE`? +======================================================================= Make sure that: -* The environment variable DJANGO_SETTINGS_MODULE is set to a +* The environment variable :envvar:`DJANGO_SETTINGS_MODULE` is set to a fully-qualified Python module (i.e. "mysite.settings"). * Said module is on ``sys.path`` (``import mysite.settings`` should work). diff --git a/docs/howto/auth-remote-user.txt b/docs/howto/auth-remote-user.txt index 742c0d223b1d..9c227ae423df 100644 --- a/docs/howto/auth-remote-user.txt +++ b/docs/howto/auth-remote-user.txt @@ -12,7 +12,7 @@ Windows Authentication or Apache and `mod_authnz_ldap`_, `CAS`_, `Cosign`_, .. _mod_authnz_ldap: https://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html .. _CAS: https://www.apereo.org/projects/cas .. _Cosign: http://weblogin.org -.. _WebAuth: https://www.stanford.edu/services/webauth/ +.. _WebAuth: https://uit.stanford.edu/service/authentication .. _mod_auth_sspi: https://sourceforge.net/projects/mod-auth-sspi When the Web server takes care of authentication it typically sets the diff --git a/docs/howto/custom-file-storage.txt b/docs/howto/custom-file-storage.txt index 33b8223b60c9..7fd71ffef070 100644 --- a/docs/howto/custom-file-storage.txt +++ b/docs/howto/custom-file-storage.txt @@ -99,8 +99,6 @@ and underscores from the original filename, removing everything else. .. method:: get_alternative_name(file_root, file_ext) -.. versionadded:: 3.0 - Returns an alternative filename based on the ``file_root`` and ``file_ext`` parameters. By default, an underscore plus a random 7 character alphanumeric string is appended to the filename before the extension. diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt index 77c4c61e8c84..5510894ffc17 100644 --- a/docs/howto/custom-management-commands.txt +++ b/docs/howto/custom-management-commands.txt @@ -18,7 +18,9 @@ whose name doesn't begin with an underscore. For example:: __init__.py models.py management/ + __init__.py commands/ + __init__.py _private.py closepoll.py tests.py @@ -215,8 +217,16 @@ All attributes can be set in your derived class and can be used in .. attribute:: BaseCommand.requires_system_checks - A boolean; if ``True``, the entire Django project will be checked for - potential problems prior to executing the command. Default value is ``True``. + A list or tuple of tags, e.g. ``[Tags.staticfiles, Tags.models]``. System + checks :ref:`registered in the chosen tags ` + will be checked for errors prior to executing the command. The value + ``'__all__'`` can be used to specify that all system checks should be + performed. Default value is ``'__all__'``. + + .. versionchanged:: 3.2 + + In older versions, the ``requires_system_checks`` attribute expects a + boolean value instead of a list or tuple of tags. .. attribute:: BaseCommand.style diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt index c31a5dbc4f81..d3692f032566 100644 --- a/docs/howto/custom-model-fields.txt +++ b/docs/howto/custom-model-fields.txt @@ -394,13 +394,14 @@ If you aim to build a database-agnostic application, you should account for differences in database column types. For example, the date/time column type in PostgreSQL is called ``timestamp``, while the same column in MySQL is called ``datetime``. You can handle this in a :meth:`~Field.db_type` method by -checking the ``connection.settings_dict['ENGINE']`` attribute. +checking the ``connection.vendor`` attribute. Current built-in vendor names +are: ``sqlite``, ``postgresql``, ``mysql``, and ``oracle``. For example:: class MyDateField(models.Field): def db_type(self, connection): - if connection.settings_dict['ENGINE'] == 'django.db.backends.mysql': + if connection.vendor == 'mysql': return 'datetime' else: return 'timestamp' @@ -541,8 +542,8 @@ Converting Python objects to query values ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Since using a database requires conversion in both ways, if you override -:meth:`~Field.to_python` you also have to override :meth:`~Field.get_prep_value` -to convert Python objects back to query values. +:meth:`~Field.from_db_value` you also have to override +:meth:`~Field.get_prep_value` to convert Python objects back to query values. For example:: diff --git a/docs/howto/custom-template-backend.txt b/docs/howto/custom-template-backend.txt index 3e9c87a07ab5..85d1e7948dbd 100644 --- a/docs/howto/custom-template-backend.txt +++ b/docs/howto/custom-template-backend.txt @@ -169,5 +169,5 @@ creating an object that specifies the following attributes: * ``'loader_name'``: An optional string identifying the function or class used to load the template, e.g. ``django.template.loaders.filesystem.Loader``. -.. _DEP 182: https://github.com/django/deps/blob/master/final/0182-multiple-template-engines.rst -.. _Django Debug Toolbar: https://github.com/jazzband/django-debug-toolbar +.. _DEP 182: https://github.com/django/deps/blob/main/final/0182-multiple-template-engines.rst +.. _Django Debug Toolbar: https://github.com/jazzband/django-debug-toolbar/ diff --git a/docs/howto/deployment/asgi/hypercorn.txt b/docs/howto/deployment/asgi/hypercorn.txt new file mode 100644 index 000000000000..28b5d06b6e7a --- /dev/null +++ b/docs/howto/deployment/asgi/hypercorn.txt @@ -0,0 +1,36 @@ +================================ +How to use Django with Hypercorn +================================ + +.. highlight:: bash + +Hypercorn_ is an ASGI server that supports HTTP/1, HTTP/2, and HTTP/3 +with an emphasis on protocol support. + +Installing Hypercorn +==================== + +You can install Hypercorn with ``pip``:: + + python -m pip install hypercorn + +Running Django in Hypercorn +=========================== + +When Hypercorn is installed, a ``hypercorn`` command is available +which runs ASGI applications. Hypercorn needs to be called with the +location of a module containing an ASGI application object, followed +by what the application is called (separated by a colon). + +For a typical Django project, invoking Hypercorn would look like:: + + hypercorn myproject.asgi:application + +This will start one process listening on ``127.0.0.1:8000``. It +requires that your project be on the Python path; to ensure that run +this command from the same directory as your ``manage.py`` file. + +For more advanced usage, please read the `Hypercorn documentation +`_. + +.. _Hypercorn: https://pgjones.gitlab.io/hypercorn/ diff --git a/docs/howto/deployment/asgi/index.txt b/docs/howto/deployment/asgi/index.txt index f09d79a67e4e..1bd04b1fdf4a 100644 --- a/docs/howto/deployment/asgi/index.txt +++ b/docs/howto/deployment/asgi/index.txt @@ -17,6 +17,7 @@ Django includes getting-started documentation for the following ASGI servers: :maxdepth: 1 daphne + hypercorn uvicorn The ``application`` object diff --git a/docs/howto/deployment/asgi/uvicorn.txt b/docs/howto/deployment/asgi/uvicorn.txt index c42341c778d7..148edc29ea7a 100644 --- a/docs/howto/deployment/asgi/uvicorn.txt +++ b/docs/howto/deployment/asgi/uvicorn.txt @@ -12,7 +12,7 @@ Installing Uvicorn You can install Uvicorn with ``pip``:: - python -m pip install uvicorn + python -m pip install uvicorn gunicorn Running Django in Uvicorn ========================= @@ -24,7 +24,7 @@ called (separated by a colon). For a typical Django project, invoking Uvicorn would look like:: - uvicorn myproject.asgi:application + gunicorn myproject.asgi:application -k uvicorn.workers.UvicornWorker This will start one process listening on ``127.0.0.1:8000``. It requires that your project be on the Python path; to ensure that run this command from the diff --git a/docs/howto/deployment/wsgi/index.txt b/docs/howto/deployment/wsgi/index.txt index c7416b84fdce..fae2d69980f2 100644 --- a/docs/howto/deployment/wsgi/index.txt +++ b/docs/howto/deployment/wsgi/index.txt @@ -70,8 +70,10 @@ If this variable isn't set, the default :file:`wsgi.py` sets it to Applying WSGI middleware ======================== -To apply `WSGI middleware`_ you can wrap the application object. For instance -you could add these lines at the bottom of :file:`wsgi.py`:: +To apply :pep:`WSGI middleware +<3333#middleware-components-that-play-both-sides>` you can wrap the application +object. For instance you could add these lines at the bottom of +:file:`wsgi.py`:: from helloworld.wsgi import HelloWorldApplication application = HelloWorldApplication(application) @@ -79,5 +81,3 @@ you could add these lines at the bottom of :file:`wsgi.py`:: You could also replace the Django WSGI application with a custom WSGI application that later delegates to the Django WSGI application, if you want to combine a Django application with a WSGI application of another framework. - -.. _`WSGI middleware`: https://www.python.org/dev/peps/pep-3333/#middleware-components-that-play-both-sides diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt index b2ab1555dfd8..fa56f4ee03a9 100644 --- a/docs/howto/deployment/wsgi/modwsgi.txt +++ b/docs/howto/deployment/wsgi/modwsgi.txt @@ -25,11 +25,9 @@ Basic configuration =================== Once you've got mod_wsgi installed and activated, edit your Apache server's -`httpd.conf`_ file and add the following. If you are using a version of Apache -older than 2.4, replace ``Require all granted`` with ``Allow from all`` and -also add the line ``Order deny,allow`` above it. +`httpd.conf`_ file and add the following. -.. _httpd.conf: https://wiki.apache.org/httpd/DistrosDefaultLayout +.. _httpd.conf: https://cwiki.apache.org/confluence/display/httpd/DistrosDefaultLayout .. code-block:: apache @@ -50,9 +48,9 @@ your project package (``mysite`` in this example). This tells Apache to serve any request below the given URL using the WSGI application defined in that file. -If you install your project's Python dependencies inside a `virtualenv`_, add -the path to the virtualenv using ``WSGIPythonHome``. See the `mod_wsgi -virtualenv guide`_ for more details. +If you install your project's Python dependencies inside a :mod:`virtual +environment `, add the path using ``WSGIPythonHome``. See the `mod_wsgi +virtual environment guide`_ for more details. The ``WSGIPythonPath`` line ensures that your project package is available for import on the Python path; in other words, that ``import mysite`` works. @@ -66,8 +64,7 @@ for you; otherwise, you'll need to create it. See the :doc:`WSGI overview documentation` for the default contents you should put in this file, and what else you can add to it. -.. _virtualenv: https://virtualenv.pypa.io/ -.. _mod_wsgi virtualenv guide: https://modwsgi.readthedocs.io/en/develop/user-guides/virtual-environments.html +.. _mod_wsgi virtual environment guide: https://modwsgi.readthedocs.io/en/develop/user-guides/virtual-environments.html .. warning:: @@ -175,10 +172,6 @@ a static file. All other URLs will be served using mod_wsgi: -If you are using a version of Apache older than 2.4, replace -``Require all granted`` with ``Allow from all`` and also add the line -``Order deny,allow`` above it. - .. _Nginx: https://nginx.org/en/ .. _Apache: https://httpd.apache.org/ diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt index 561602ff3412..6e66189b4ef7 100644 --- a/docs/howto/deployment/wsgi/uwsgi.txt +++ b/docs/howto/deployment/wsgi/uwsgi.txt @@ -60,7 +60,7 @@ Here's an example command to start a uWSGI server:: --harakiri=20 \ # respawn processes taking more than 20 seconds --max-requests=5000 \ # respawn processes after serving 5000 requests --vacuum \ # clear environment on exit - --home=/path/to/virtual/env \ # optional path to a virtualenv + --home=/path/to/virtual/env \ # optional path to a virtual environment --daemonize=/var/log/uwsgi/yourproject.log # background the process This assumes you have a top-level project package named ``mysite``, and @@ -77,8 +77,8 @@ The Django-specific options here are: path -- i.e., the directory containing the ``mysite`` package. * ``module``: The WSGI module to use -- probably the ``mysite.wsgi`` module that :djadmin:`startproject` creates. -* ``env``: Should probably contain at least ``DJANGO_SETTINGS_MODULE``. -* ``home``: Optional path to your project virtualenv. +* ``env``: Should probably contain at least :envvar:`DJANGO_SETTINGS_MODULE`. +* ``home``: Optional path to your project virtual environment. Example ini configuration file:: diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt index c77f1e955e6d..78bf81062d73 100644 --- a/docs/howto/error-reporting.txt +++ b/docs/howto/error-reporting.txt @@ -325,6 +325,23 @@ Your custom reporter class needs to inherit from .. class:: ExceptionReporter + .. attribute:: html_template_path + + .. versionadded:: 3.2 + + Property that returns a :class:`pathlib.Path` representing the absolute + filesystem path to a template for rendering the HTML representation of + the exception. Defaults to the Django provided template. + + .. attribute:: text_template_path + + .. versionadded:: 3.2 + + Property that returns a :class:`pathlib.Path` representing the absolute + filesystem path to a template for rendering the plain-text + representation of the exception. Defaults to the Django provided + template. + .. method:: get_traceback_data() Return a dictionary containing traceback information. diff --git a/docs/howto/outputting-csv.txt b/docs/howto/outputting-csv.txt index 2886a1b2948a..0026d0293a1e 100644 --- a/docs/howto/outputting-csv.txt +++ b/docs/howto/outputting-csv.txt @@ -20,8 +20,10 @@ Here's an example:: def some_view(request): # Create the HttpResponse object with the appropriate CSV header. - response = HttpResponse(content_type='text/csv') - response['Content-Disposition'] = 'attachment; filename="somefilename.csv"' + response = HttpResponse( + content_type='text/csv', + headers={'Content-Disposition': 'attachment; filename="somefilename.csv"'}, + ) writer = csv.writer(response) writer.writerow(['First row', 'Foo', 'Bar', 'Baz']) @@ -86,10 +88,11 @@ the assembly and transmission of a large CSV file:: rows = (["Row {}".format(idx), str(idx)] for idx in range(65536)) pseudo_buffer = Echo() writer = csv.writer(pseudo_buffer) - response = StreamingHttpResponse((writer.writerow(row) for row in rows), - content_type="text/csv") - response['Content-Disposition'] = 'attachment; filename="somefilename.csv"' - return response + return StreamingHttpResponse( + (writer.writerow(row) for row in rows), + content_type="text/csv", + headers={'Content-Disposition': 'attachment; filename="somefilename.csv"'}, + ) Using the template system ========================= @@ -108,8 +111,10 @@ Here's an example, which generates the same CSV file as above:: def some_view(request): # Create the HttpResponse object with the appropriate CSV header. - response = HttpResponse(content_type='text/csv') - response['Content-Disposition'] = 'attachment; filename="somefilename.csv"' + response = HttpResponse( + content_type='text/csv' + headers={'Content-Disposition': 'attachment; filename="somefilename.csv"'}, + ) # The data is hard-coded here, but you could load it from a database or # some other source. diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt index 37b71b67618e..8d61418af001 100644 --- a/docs/howto/outputting-pdf.txt +++ b/docs/howto/outputting-pdf.txt @@ -15,7 +15,7 @@ printer-friendly NCAA tournament brackets, as PDF files, for people participating in a March Madness contest. .. _ReportLab: https://www.reportlab.com/opensource/ -.. _kusports.com: http://www.kusports.com/ +.. _kusports.com: http://www2.kusports.com/ Install ReportLab ================= diff --git a/docs/howto/overriding-templates.txt b/docs/howto/overriding-templates.txt index 7faf972a3b00..55d7c66f426b 100644 --- a/docs/howto/overriding-templates.txt +++ b/docs/howto/overriding-templates.txt @@ -29,7 +29,7 @@ called ``blog``, which provides the templates ``blog/post.html`` and from pathlib import Path - BASE_DIR = Path(__file__).resolve(strict=True).parent.parent + BASE_DIR = Path(__file__).resolve().parent.parent INSTALLED_APPS = [ ..., @@ -97,3 +97,43 @@ then your directory structure will look like: With :setting:`APP_DIRS` set to ``True``, the template loader will look in the app's templates directory and find the templates. + +.. _extending_an_overridden_template: + +Extending an overridden template +================================ + +With your template loaders configured, you can extend a template using the +:ttag:`{% extends %}` template tag whilst at the same time overriding +it. This can allow you to make small customizations without needing to +reimplement the entire template. + +For example, you can use this technique to add a custom logo to the +``admin/base_site.html`` template: + + .. code-block:: html+django + :caption: ``templates/admin/base_site.html`` + + {% extends "admin/base_site.html" %} + + {% block branding %} + logo + {{ block.super }} + {% endblock %} + +Key points to note: + +* The example creates a file at ``templates/admin/base_site.html`` that uses + the configured project-level ``templates`` directory to override + ``admin/base_site.html``. +* The new template extends ``admin/base_site.html``, which is the same template + as is being overridden. +* The template replaces just the ``branding`` block, adding a custom logo, and + using ``block.super`` to retain the prior content. +* The rest of the template is inherited unchanged from + ``admin/base_site.html``. + +This technique works because the template loader does not consider the already +loaded override template (at ``templates/admin/base_site.html``) when +resolving the ``extends`` tag. Combined with ``block.super`` it is a powerful +technique to make small customizations. diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt index 9bdfc2fd8272..0a0e7bedd013 100644 --- a/docs/howto/static-files/index.txt +++ b/docs/howto/static-files/index.txt @@ -26,7 +26,7 @@ Configuring static files .. code-block:: html+django {% load static %} - My image + My image #. Store your static files in a folder called ``static`` in your app. For example ``my_app/static/my_app/example.jpg``. @@ -120,7 +120,7 @@ This is not suitable for production use! For some common deployment strategies, see :doc:`/howto/static-files/deployment`. For example, if your :setting:`MEDIA_URL` is defined as ``/media/``, you can do -this by adding the following snippet to your urls.py:: +this by adding the following snippet to your :setting:`ROOT_URLCONF`:: from django.conf import settings from django.conf.urls.static import static diff --git a/docs/howto/upgrade-version.txt b/docs/howto/upgrade-version.txt index 007df6459c03..bde9b18c1be4 100644 --- a/docs/howto/upgrade-version.txt +++ b/docs/howto/upgrade-version.txt @@ -87,8 +87,9 @@ Installation ============ Once you're ready, it is time to :doc:`install the new Django version -`. If you are using virtualenv_ and it is a major upgrade, you -might want to set up a new environment with all the dependencies first. +`. If you are using a :mod:`virtual environment ` and it +is a major upgrade, you might want to set up a new environment with all the +dependencies first. If you installed Django with pip_, you can use the ``--upgrade`` or ``-U`` flag: @@ -97,7 +98,6 @@ If you installed Django with pip_, you can use the ``--upgrade`` or ``-U`` flag: $ python -m pip install -U Django .. _pip: https://pip.pypa.io/ -.. _virtualenv: https://virtualenv.pypa.io/ Testing ======= diff --git a/docs/howto/windows.txt b/docs/howto/windows.txt index c0750ab71323..c506799c3824 100644 --- a/docs/howto/windows.txt +++ b/docs/howto/windows.txt @@ -4,28 +4,28 @@ How to install Django on Windows .. highlight:: doscon -This document will guide you through installing Python 3.7 and Django on -Windows. It also provides instructions for installing `virtualenv`_ and -`virtualenvwrapper`_, which make it easier to work on Python projects. This is -meant as a beginner's guide for users working on Django projects and does not -reflect how Django should be installed when developing patches for Django -itself. - -The steps in this guide have been tested with Windows 7, 8, and 10. In other +This document will guide you through installing Python 3.8 and Django on +Windows. It also provides instructions for setting up a virtual environment, +which makes it easier to work on Python projects. This is meant as a beginner's +guide for users working on Django projects and does not reflect how Django +should be installed when developing patches for Django itself. + +The steps in this guide have been tested with Windows 10. In other versions, the steps would be similar. You will need to be familiar with using the Windows command prompt. +.. _install_python_windows: + Install Python ============== Django is a Python web framework, thus requiring Python to be installed on your -machine. At the time of writing, Python 3.7 is the latest version. +machine. At the time of writing, Python 3.8 is the latest version. -To install Python on your machine go to https://python.org/downloads/. The +To install Python on your machine go to https://www.python.org/downloads/. The website should offer you a download button for the latest Python version. -Download the executable installer and run it. Check the boxes next to ``Install -launcher for all users (recommended)`` and ``Add Python 3.7 to PATH`` then -click ``Install Now``. +Download the executable installer and run it. Check the boxes next to "Install +launcher for all users (recommended)" then click "Install Now". After installation, open the command prompt and check that the Python version matches the version you installed by executing:: @@ -39,40 +39,39 @@ matches the version you installed by executing:: About ``pip`` ============= -`pip`_ is a package manage for Python. It makes installing and uninstalling -Python packages (such as Django!) very easy. For the rest of the installation, -we'll use ``pip`` to install Python packages from the command line. - -To install pip on your machine, go to -https://pip.pypa.io/en/latest/installing/, and follow the ``Installing with -get-pip.py`` instructions. +`pip`_ is a package manager for Python and is included by default with the +Python installer. It helps to install and uninstall Python packages +(such as Django!). For the rest of the installation, we'll use ``pip`` to +install Python packages from the command line. .. _pip: https://pypi.org/project/pip/ -.. _virtualenvwrapper-win: - -Install ``virtualenv`` and ``virtualenvwrapper`` -================================================ +.. _virtualenvironment: -`virtualenv`_ and `virtualenvwrapper`_ provide a dedicated environment for -each Django project you create. While not mandatory, this is considered a best -practice and will save you time in the future when you're ready to deploy your -project. To do this, run:: +Setting up a virtual environment +================================ - ...\> py -m pip install virtualenvwrapper-win +It is best practice to provide a dedicated environment for each Django project +you create. There are many options to manage environments and packages within +the Python ecosystem, some of which are recommended in the `Python +documentation `_. +Python itself comes with :doc:`venv ` for managing +environments which we will use for this guide. -Then create a virtual environment for your project:: +To create a virtual environment for your project, open a new command prompt, +navigate to the folder where you want to create your project and then enter the +following:: - ...\> mkvirtualenv myproject + ...\> py -m venv project-name -The virtual environment will be activated automatically and you'll see -"(myproject)" next to the command prompt to designate that. If you start a new -command prompt, you'll need to activate the environment again using:: +This will create a folder called 'project-name' if it does not already exist +and setup the virtual environment. To activate the environment, run:: - ...\> workon myproject + ...\> project-name\Scripts\activate.bat -.. _virtualenv: https://pypi.org/project/virtualenv/ -.. _virtualenvwrapper: https://pypi.org/project/virtualenvwrapper-win/ +The virtual environment will be activated and you'll see "(project-name)" next +to the command prompt to designate that. Each time you start a new command +prompt, you'll need to activate the environment again. Install Django ============== @@ -92,6 +91,25 @@ by executing ``django-admin --version`` in the command prompt. See :ref:`database-installation` for information on database installation with Django. +Colored terminal output +======================= + +.. versionadded:: 3.2 + +A quality-of-life feature adds colored (rather than monochrome) output to the +terminal. In modern terminals this should work for both CMD and PowerShell. If +for some reason this needs to be disabled, set the environmental variable +:envvar:`DJANGO_COLORS` to ``nocolor``. + +On older Windows versions, or legacy terminals, colorama_ must be installed to +enable syntax coloring:: + + ...\> py -m pip install colorama + +See :ref:`syntax-coloring` for more information on color settings. + +.. _colorama: https://pypi.org/project/colorama/ + Common pitfalls =============== @@ -107,3 +125,11 @@ Common pitfalls ...\> set http_proxy=http://username:password@proxyserver:proxyport ...\> set https_proxy=https://username:password@proxyserver:proxyport + +* In general, Django assumes that ``UTF-8`` encoding is used for I/O. This may + cause problems if your system is set to use a different encoding. Recent + versions of Python allow setting the :envvar:`PYTHONUTF8` environment + variable in order to force a ``UTF-8`` encoding. Windows 10 also provides a + system-wide setting by checking ``Use Unicode UTF-8 for worldwide language + support`` in :menuselection:`Language --> Administrative Language Settings + --> Change system locale` in system settings. diff --git a/docs/howto/writing-migrations.txt b/docs/howto/writing-migrations.txt index ab1a897aa035..3c571fdc94d8 100644 --- a/docs/howto/writing-migrations.txt +++ b/docs/howto/writing-migrations.txt @@ -40,7 +40,7 @@ You can also provide hints that will be passed to the :meth:`allow_migrate()` method of database routers as ``**hints``: .. code-block:: python - :caption: myapp/dbrouters.py + :caption: ``myapp/dbrouters.py`` class MyRouter: @@ -98,7 +98,7 @@ the respective field according to your needs. ``AlterField``, and add imports of ``uuid`` and ``models``. For example: .. code-block:: python - :caption: 0006_remove_uuid_null.py + :caption: ``0006_remove_uuid_null.py`` # Generated by Django A.B on YYYY-MM-DD HH:MM from django.db import migrations, models @@ -122,7 +122,7 @@ the respective field according to your needs. similar to this: .. code-block:: python - :caption: 0004_add_uuid_field.py + :caption: ``0004_add_uuid_field.py`` class Migration(migrations.Migration): @@ -149,7 +149,7 @@ the respective field according to your needs. of ``uuid``. For example: .. code-block:: python - :caption: 0005_populate_uuid_values.py + :caption: ``0005_populate_uuid_values.py`` # Generated by Django A.B on YYYY-MM-DD HH:MM from django.db import migrations @@ -283,7 +283,7 @@ project anywhere without first installing and then uninstalling the old app. Here's a sample migration: .. code-block:: python - :caption: myapp/migrations/0124_move_old_app_to_new_app.py + :caption: ``myapp/migrations/0124_move_old_app_to_new_app.py`` from django.apps import apps as global_apps from django.db import migrations @@ -327,7 +327,7 @@ If you change a :class:`~django.db.models.ManyToManyField` to use a ``through`` model, the default migration will delete the existing table and create a new one, losing the existing relations. To avoid this, you can use :class:`.SeparateDatabaseAndState` to rename the existing table to the new -table name whilst telling the migration autodetector that the new model has +table name while telling the migration autodetector that the new model has been created. You can check the existing table name through :djadmin:`sqlmigrate` or :djadmin:`dbshell`. You can check the new table name with the through model's ``_meta.db_table`` property. Your new ``through`` diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index d782f8000da4..531c7fde042b 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -164,4 +164,4 @@ Votes on technical matters should be announced and held in public on the .. _searching: https://code.djangoproject.com/search .. _custom queries: https://code.djangoproject.com/query -.. _#django: https://webchat.freenode.net/#django +.. _#django: https://web.libera.chat/#django diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 13c139c5c5dc..731223088442 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -41,27 +41,27 @@ Once you're ready: .. console:: - $ # Pull in the latest changes from master. - $ git checkout master - $ git pull upstream master - $ # Rebase the pull request on master. + $ # Pull in the latest changes from main. + $ git checkout main + $ git pull upstream main + $ # Rebase the pull request on main. $ git checkout pr/#### - $ git rebase master - $ git checkout master - $ # Merge the work as "fast-forward" to master to avoid a merge commit. + $ git rebase main + $ git checkout main + $ # Merge the work as "fast-forward" to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just rebased) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you expect will be pushed to upstream. - $ git push --dry-run upstream master + $ git push --dry-run upstream main $ # Push! - $ git push upstream master + $ git push upstream main $ # Delete the pull request branch. $ git branch -d pr/xxxx -Force push to the branch after rebasing on master but before merging and -pushing to upstream. This allows the commit hashes on master and the branch to -match which automatically closes the pull request. +Force push to the branch after rebasing on main but before merging and pushing +to upstream. This allows the commit hashes on main and the branch to match +which automatically closes the pull request. If a pull request doesn't need to be merged as multiple commits, you can use GitHub's "Squash and merge" button on the website. Edit the commit message as @@ -138,7 +138,7 @@ Django's Git repository: Credit the contributors in the commit message: "Thanks A for the report and B for review." Use git's `Co-Authored-By`_ as appropriate. - .. _Co-Authored-By: https://help.github.com/articles/creating-a-commit-with-multiple-authors/ + .. _Co-Authored-By: https://docs.github.com/en/github/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors * For commits to a branch, prefix the commit message with the branch name. For example: "[1.4.x] Fixed #xxxxx -- Added support for mind reading." @@ -166,7 +166,7 @@ Django's Git repository: Note that the Trac integration doesn't know anything about pull requests. So if you try to close a pull request with the phrase "closes #400" in your commit message, GitHub will close the pull request, but the Trac plugin - will also close the same numbered ticket in Trac. + will not close the same numbered ticket in Trac. .. _Trac plugin: https://github.com/trac-hacks/trac-github @@ -189,7 +189,7 @@ Django's Git repository: [1.3.x] Fixed #17028 -- Changed diveintopython.org -> diveintopython.net. - Backport of 80c0cbf1c97047daed2c5b41b296bbc56fe1d7e3 from master. + Backport of 80c0cbf1c97047daed2c5b41b296bbc56fe1d7e3 from main. There's a `script on the wiki `_ diff --git a/docs/internals/contributing/index.txt b/docs/internals/contributing/index.txt index 0dcfa7a84423..c933fff44e2f 100644 --- a/docs/internals/contributing/index.txt +++ b/docs/internals/contributing/index.txt @@ -3,8 +3,57 @@ Contributing to Django ====================== Django is a community that lives on its volunteers. As it keeps growing, we -always need more people to help others. As soon as you learn Django, you can -contribute in many ways: +always need more people to help others. You can contribute in many ways, either +on the framework itself or in the wider ecosystem. + +Work on the Django framework +============================ + +The work on Django itself falls into three major areas: + +**Writing code** 💻 + Fix a bug, or add a new feature. You can make a pull request and see **your + code** in the next version of Django! + + Start from the :doc:`writing-code/index` docs. + +**Writing documentation** ✍️ + Django's documentation is one of its key strengths. It's informative + and thorough. You can help to improve the documentation and keep it + relevant as the framework evolves. + + See :doc:`writing-documentation` for more. + +**Localizing Django** 🗺️ + Django is translated into over 100 languages - There's even some + translation for Klingon?! The i18n team are always looking for translators + to help maintain and increase language reach. + + See :doc:`localizing` to help translate Django. + +If you think working *with* Django is fun, wait until you start working *on* +it. Really, **ANYONE** can do something to help make Django better and greater! + +This contributing guide contains everything you need to know to help build the +Django Web framework. Browse the following sections to find out how: + +.. toctree:: + :maxdepth: 2 + + new-contributors + bugs-and-features + triaging-tickets + writing-code/index + writing-documentation + localizing + committing-code + +Join the Django community ❤️ +============================ + +We're passionate about helping Django users make the jump to contributing +members of the community. There are several other ways you can help the +Django community and others to maintain a great ecosystem to work in: * Join the `Django forum`_. This forum is a place for discussing the Django framework and applications and projects that use it. This is also a good @@ -16,7 +65,7 @@ contribute in many ways: friendly and helpful atmosphere. If you're new to the Django community, you should read the `posting guidelines`_. -* Join the `#django IRC channel`_ on Freenode and answer questions. By +* Join the `#django IRC channel`_ on Libera.Chat and answer questions. By explaining Django to other users, you're going to learn a lot about the framework yourself. @@ -29,49 +78,10 @@ contribute in many ways: ecosystem of pluggable applications is a big strength of Django, help us build it! -If you think working *with* Django is fun, wait until you start working *on* -it. We're passionate about helping Django users make the jump to contributing -members of the community, so there are several ways you can help Django's -development: - -* :doc:`Report bugs ` in our `ticket tracker`_. - -* Join the |django-developers| mailing list and share your ideas for how - to improve Django. We're always open to suggestions. You can also interact - on the `#django-dev IRC channel`_. - -* :doc:`Submit patches ` for new and/or - fixed behavior. If you're looking for a way to get started contributing - to Django read the :doc:`/intro/contributing` tutorial and have a look at the - `easy pickings`_ tickets. The :ref:`patch-review-checklist` will also be - helpful. - -* :doc:`Improve the documentation ` or - :doc:`write unit tests `. - -* :doc:`Triage tickets and review patches ` created by - other users. - -Really, **ANYONE** can do something to help make Django better and greater! - -Browse the following sections to find out how: - -.. toctree:: - :maxdepth: 2 - - new-contributors - bugs-and-features - triaging-tickets - writing-code/index - writing-documentation - localizing - committing-code +We're looking forward to working with you. Welcome aboard! ⛵️ .. _posting guidelines: https://code.djangoproject.com/wiki/UsingTheMailingList -.. _#django IRC channel: https://webchat.freenode.net/#django -.. _#django-dev IRC channel: https://webchat.freenode.net/#django-dev +.. _#django IRC channel: https://web.libera.chat/#django .. _community page: https://www.djangoproject.com/community/ .. _Django forum: https://forum.djangoproject.com/ .. _register it here: https://www.djangoproject.com/community/add/blogs/ -.. _ticket tracker: https://code.djangoproject.com/ -.. _easy pickings: https://code.djangoproject.com/query?status=!closed&easy=1 diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt index 8fb6fa5b0840..fef9e62db061 100644 --- a/docs/internals/contributing/localizing.txt +++ b/docs/internals/contributing/localizing.txt @@ -18,8 +18,7 @@ If you find an incorrect translation or want to discuss specific translations, go to the `Django project page`_. If you would like to help out with translating or add a language that isn't yet translated, here's what to do: -* Join the :ref:`Django i18n mailing list ` and - introduce yourself. +* Introduce yourself on the `Django internationalization forum`_. * Make sure you read the notes about :ref:`specialties-of-django-i18n`. @@ -63,13 +62,14 @@ The format files aren't managed by the use of Transifex. To change them, you must :doc:`create a patch` against the Django source tree, as for any code change: -* Create a diff against the current Git master branch. +* Create a diff against the current Git main branch. * Open a ticket in Django's ticket system, set its ``Component`` field to ``Translations``, and attach the patch to it. .. _Transifex: https://www.transifex.com/ .. _Django project page: https://www.transifex.com/django/django/ +.. _Django internationalization forum: https://forum.djangoproject.com/c/internals/i18n/14 .. _Transifex User Guide: https://docs.transifex.com/ .. _translating-documentation: diff --git a/docs/internals/contributing/new-contributors.txt b/docs/internals/contributing/new-contributors.txt index dbadb4cb0a4a..8457f4194144 100644 --- a/docs/internals/contributing/new-contributors.txt +++ b/docs/internals/contributing/new-contributors.txt @@ -5,11 +5,17 @@ Advice for new contributors New contributor and not sure what to do? Want to help but just don't know how to get started? This is the section for you. -.. admonition:: Basic tools and workflow +.. admonition:: Get up and running! If you are new to contributing to Django, the :doc:`/intro/contributing` tutorial will give you an introduction to the tools and the workflow. +This page contains more general advice on ways you can contribute to Django, +and how to approach that. + +If you are looking for a reference on the details of making code contributions, +see the :doc:`/internals/contributing/writing-code/index` documentation. + First steps =========== @@ -132,25 +138,20 @@ some advice to make your work on Django more useful and rewarding. writing the very first tests for that feature, not that you get a pass from writing tests altogether. -.. _easy pickings: https://code.djangoproject.com/query?status=!closed&easy=1 +* **Be patient** -.. _new-contributors-faq: + It's not always easy for your ticket or your patch to be reviewed quickly. + This isn't personal. There are a lot of tickets and pull requests to get + through. -FAQ -=== + Keeping your patch up to date is important. Review the ticket on Trac to + ensure that the *Needs tests*, *Needs documentation*, and *Patch needs + improvement* flags are unchecked once you've addressed all review comments. -1. **This ticket I care about has been ignored for days/weeks/months! What can - I do to get it committed?** + Remember that Django has an 8 month release cycle, so there's plenty of time + for your patch to be reviewed. - First off, it's not personal. Django is entirely developed by volunteers - (except the Django fellow), and sometimes folks just don't have time. The - best thing to do is to send a gentle reminder to the |django-developers| - mailing list asking for review on the ticket, or to bring it up in the - ``#django-dev`` IRC channel. + Finally, a well-timed reminder can help. See :ref:`contributing code FAQ + ` for ideas here. -2. **I'm sure my ticket is absolutely 100% perfect, can I mark it as RFC - myself?** - - Short answer: No. It's always better to get another set of eyes on a - ticket. If you're having trouble getting that second set of eyes, see - question 1, above. +.. _easy pickings: https://code.djangoproject.com/query?status=!closed&easy=1 diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt index 950c03e4f48e..3bd02044d3bb 100644 --- a/docs/internals/contributing/triaging-tickets.txt +++ b/docs/internals/contributing/triaging-tickets.txt @@ -143,9 +143,11 @@ Ready For Checkin The ticket was reviewed by any member of the community other than the person who supplied the patch and found to meet all the requirements for a commit-ready patch. A committer now needs to give the patch a final -review prior to being committed. See the -:ref:`New contributors' FAQ` for "My ticket has been in -RFC forever! What should I do?" +review prior to being committed. + +There are a lot of pull requests. It can take a while for your patch to get +reviewed. See the :ref:`contributing code FAQ` for some +ideas here. Someday/Maybe ------------- @@ -420,9 +422,9 @@ inadvertent side-effect. Here's how you can determine this. Begin by writing a regression test for Django's test suite for the issue. For example, we'll pretend we're debugging a regression in migrations. After you've -written the test and confirmed that it fails on the latest master, put it in a -separate file that you can run standalone. For our example, we'll pretend we -created ``tests/migrations/test_regression.py``, which can be run with:: +written the test and confirmed that it fails on the latest main branch, put it +in a separate file that you can run standalone. For our example, we'll pretend +we created ``tests/migrations/test_regression.py``, which can be run with:: $ ./runtests.py migrations.test_regression diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index 43db31501e10..61a350821e58 100644 --- a/docs/internals/contributing/writing-code/coding-style.txt +++ b/docs/internals/contributing/writing-code/coding-style.txt @@ -4,6 +4,32 @@ Coding style Please follow these coding standards when writing code for inclusion in Django. +.. _coding-style-pre-commit: + +Pre-commit checks +================= + +`pre-commit `_ is a framework for managing pre-commit +hooks. These hooks help to identify simple issues before committing code for +review. By checking for these issues before code review it allows the reviewer +to focus on the change itself, and it can also help to reduce the number of CI +runs. + +To use the tool, first install ``pre-commit`` and then the git hooks: + +.. console:: + + $ python -m pip install pre-commit + $ pre-commit install + +On the first commit ``pre-commit`` will install the hooks, these are +installed in their own environments and will take a short while to +install on the first run. Subsequent checks will be significantly faster. +If an error is found an appropriate error message will be displayed. +If the error was with ``isort`` then the tool will go ahead and fix them for +you. Review the changes and re-stage for commit if you are happy with +them. + .. _coding-style-python: Python style @@ -52,6 +78,37 @@ Python style single quote. Don't waste time doing unrelated refactoring of existing code to conform to this style. +* String variable interpolation may use + :py:ref:`%-formatting `, :py:ref:`f-strings + `, or :py:meth:`str.format` as appropriate, with the goal of + maximizing code readability. + + Final judgments of readability are left to the Merger's discretion. As a + guide, f-strings should use only plain variable and property access, with + prior local variable assignment for more complex cases:: + + # Allowed + f'hello {user}' + f'hello {user.name}' + f'hello {self.user.name}' + + # Disallowed + f'hello {get_user()}' + f'you are {user.age * 365.25} days old' + + # Allowed with local variable assignment + user = get_user() + f'hello {user}' + user_days_old = user.age * 365.25 + f'you are {user_days_old} days old' + + f-strings should not be used for any string that may require translation, + including error and logging messages. In general ``format()`` is more + verbose, so the other formatting methods are preferred. + + Don't waste time doing unrelated refactoring of existing code to adjust the + formatting method. + * Avoid use of "we" in comments, e.g. "Loop over" rather than "We loop over". * Use underscores, not camelCase, for variable, function and method names @@ -94,15 +151,15 @@ Python style Imports ======= -* Use `isort `_ to automate - import sorting using the guidelines below. +* Use `isort `_ to automate import + sorting using the guidelines below. Quick start: .. console:: - $ python -m pip install isort - $ isort -rc . + $ python -m pip install "isort >= 5.1.0" + $ isort . This runs ``isort`` recursively from your current directory, modifying any files that don't conform to the guidelines. If you need to have imports out @@ -129,7 +186,7 @@ Imports For example (comments are for explanatory purposes only): .. code-block:: python - :caption: django/contrib/admin/example.py + :caption: ``django/contrib/admin/example.py`` # future from __future__ import unicode_literals @@ -283,8 +340,8 @@ at the top level (i.e. evaluated when the module is imported). The explanation for this is as follows: Manual configuration of settings (i.e. not relying on the -``DJANGO_SETTINGS_MODULE`` environment variable) is allowed and possible as -follows:: +:envvar:`DJANGO_SETTINGS_MODULE` environment variable) is allowed and possible +as follows:: from django.conf import settings diff --git a/docs/internals/contributing/writing-code/index.txt b/docs/internals/contributing/writing-code/index.txt index 98e2b8dfa2f2..9402c26808f1 100644 --- a/docs/internals/contributing/writing-code/index.txt +++ b/docs/internals/contributing/writing-code/index.txt @@ -2,9 +2,31 @@ Writing code ============ -So you'd like to write some code to improve Django. Awesome! Browse the -following sections to find out how to give your code patches the best -chances to be included in Django core: +So you'd like to write some code to improve Django? Awesome! There are several +ways you can help Django's development: + +* :doc:`Report bugs <../bugs-and-features>` in our `ticket tracker`_. + +* Join the |django-developers| mailing list and share your ideas for how to + improve Django. We're always open to suggestions. You can also interact on + the `Django forum`_ and the `#django-dev IRC channel`_. + +* :doc:`Submit patches ` for new and/or fixed behavior. If + you're looking for a way to get started contributing to Django read the + :doc:`/intro/contributing` tutorial and have a look at the `easy pickings`_ + tickets. The :ref:`patch-review-checklist` will also be helpful. + +* :doc:`Improve the documentation <../writing-documentation>` or :doc:`write + unit tests `. + +* :doc:`Triage tickets and review patches <../triaging-tickets>` created by + other users. + +* Read the :doc:`../new-contributors` to help you get orientated in the + development process. + +Browse the following sections to find out how to give your code patches the +best chances to be included in Django core: .. toctree:: :maxdepth: 1 @@ -14,3 +36,8 @@ chances to be included in Django core: submitting-patches working-with-git javascript + +.. _ticket tracker: https://code.djangoproject.com/ +.. _easy pickings: https://code.djangoproject.com/query?status=!closed&easy=1 +.. _#django-dev IRC channel: https://web.libera.chat/#django-dev +.. _Django forum: https://forum.djangoproject.com/ diff --git a/docs/internals/contributing/writing-code/javascript.txt b/docs/internals/contributing/writing-code/javascript.txt index 3b90622f7e2a..b75f01059dff 100644 --- a/docs/internals/contributing/writing-code/javascript.txt +++ b/docs/internals/contributing/writing-code/javascript.txt @@ -38,32 +38,6 @@ JavaScript patches Django's admin system leverages the jQuery framework to increase the capabilities of the admin interface. In conjunction, there is an emphasis on admin JavaScript performance and minimizing overall admin media file size. -Serving compressed or "minified" versions of JavaScript files is considered -best practice in this regard. - -To that end, patches for JavaScript files should include both the original -code for future development (e.g. ``foo.js``), and a compressed version for -production use (e.g. ``foo.min.js``). Any links to the file in the codebase -should point to the compressed version. - -Compressing JavaScript ----------------------- - -To simplify the process of providing optimized JavaScript code, Django -includes a handy Python script which should be used to create a "minified" -version. To run it: - -.. console:: - - $ python django/contrib/admin/bin/compress.py - -Behind the scenes, ``compress.py`` is a front-end for Google's -`Closure Compiler`_ which is written in Java. The Closure Compiler library is -not bundled with Django, but will be installed automatically by ``npm``. The -Closure Compiler library requires `Java`_ 7 or higher. - -Please don't forget to run ``compress.py`` and include the ``diff`` of the -minified scripts when submitting patches for Django's JavaScript. .. _javascript-tests: @@ -82,13 +56,13 @@ Django's JavaScript tests use `QUnit`_. Here is an example test module: QUnit.module('magicTricks', { beforeEach: function() { - var $ = django.jQuery; + const $ = django.jQuery; $('#qunit-fixture').append(''); } }); QUnit.test('removeOnClick removes button on click', function(assert) { - var $ = django.jQuery; + const $ = django.jQuery; removeOnClick('.button'); assert.equal($('.button').length, 1); $('.button').click(); @@ -96,7 +70,7 @@ Django's JavaScript tests use `QUnit`_. Here is an example test module: }); QUnit.test('copyOnClick adds button on click', function(assert) { - var $ = django.jQuery; + const $ = django.jQuery; copyOnClick('.button'); assert.equal($('.button').length, 1); $('.button').click(); @@ -143,7 +117,6 @@ Then run the tests with: $ npm test -.. _Closure Compiler: https://developers.google.com/closure/compiler/ .. _EditorConfig: https://editorconfig.org/ .. _Java: https://www.java.com .. _eslint: https://eslint.org/ diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt index 45b2b9bdc41f..bf9b1f962b37 100644 --- a/docs/internals/contributing/writing-code/submitting-patches.txt +++ b/docs/internals/contributing/writing-code/submitting-patches.txt @@ -268,8 +268,8 @@ Bugs is applied)? * If it's a bug that :ref:`qualifies for a backport ` to the stable version of Django, is there a release note in - ``docs/releases/A.B.C.txt``? Bug fixes that will be applied only to the - master branch don't need a release note. + ``docs/releases/A.B.C.txt``? Bug fixes that will be applied only to the main + branch don't need a release note. New Features ------------ @@ -290,7 +290,9 @@ All code changes * Does the :doc:`coding style ` conform to our - guidelines? Are there any ``flake8`` errors? + guidelines? Are there any ``flake8`` errors? You can install the + :ref:`pre-commit ` hooks to automatically catch + these errors. * If the change is backwards incompatible in any way, is there a note in the release notes (``docs/releases/A.B.txt``)? * Is Django's test suite passing? diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt index 21bdf00664e1..bd426099d6d6 100644 --- a/docs/internals/contributing/writing-code/unit-tests.txt +++ b/docs/internals/contributing/writing-code/unit-tests.txt @@ -80,7 +80,7 @@ version of Python. A list of default environments can be seen as follows: py3 flake8 docs - isort + isort>=5.1.0 Testing other Python versions and database backends ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -105,8 +105,8 @@ The remainder of this documentation shows commands for running tests without ``tox``, however, any option passed to ``runtests.py`` can also be passed to ``tox`` by prefixing the argument list with ``--``, as above. -Tox also respects the ``DJANGO_SETTINGS_MODULE`` environment variable, if set. -For example, the following is equivalent to the command above: +Tox also respects the :envvar:`DJANGO_SETTINGS_MODULE` environment variable, if +set. For example, the following is equivalent to the command above: .. code-block:: console @@ -142,7 +142,7 @@ Running tests using ``django-docker-box`` supported databases and python versions. See the `django-docker-box`_ project page for installation and usage instructions. -.. _django-docker-box: https://github.com/django/django-docker-box +.. _django-docker-box: https://github.com/django/django-docker-box/ .. _running-unit-tests-settings: @@ -153,10 +153,13 @@ The included settings module (``tests/test_sqlite.py``) allows you to run the test suite using SQLite. If you want to run the tests using a different database, you'll need to define your own settings file. Some tests, such as those for ``contrib.postgres``, are specific to a particular database backend -and will be skipped if run with a different backend. +and will be skipped if run with a different backend. Some tests are skipped or +expected failures on a particular database backend (see +``DatabaseFeatures.django_test_skips`` and +``DatabaseFeatures.django_test_expected_failures`` on each backend). To run the tests with different settings, ensure that the module is on your -``PYTHONPATH`` and pass the module with ``--settings``. +:envvar:`PYTHONPATH` and pass the module with ``--settings``. The :setting:`DATABASES` setting in any test settings module needs to define two databases: @@ -260,7 +263,7 @@ the tests that require selenium. Some browsers (e.g. Chrome or Firefox) support headless testing, which can be faster and more stable. Add the ``--headless`` option to enable this mode. -.. _selenium.webdriver: https://github.com/SeleniumHQ/selenium/tree/master/py/selenium/webdriver +.. _selenium.webdriver: https://github.com/SeleniumHQ/selenium/tree/trunk/py/selenium/webdriver .. _running-unit-tests-dependencies: @@ -270,9 +273,11 @@ Running all the tests If you want to run the full suite of tests, you'll need to install a number of dependencies: -* argon2-cffi_ 16.1.0+ -* asgiref_ 3.2+ (required) +* aiosmtpd_ +* argon2-cffi_ 19.1.0+ +* asgiref_ 3.3.2+ (required) * bcrypt_ +* colorama_ * docutils_ * geoip2_ * jinja2_ 2.7+ @@ -316,12 +321,14 @@ associated tests will be skipped. To run some of the autoreload tests, you'll need to install the Watchman_ service. -.. _argon2-cffi: https://pypi.org/project/argon2_cffi/ +.. _aiosmtpd: https://pypi.org/project/aiosmtpd/ +.. _argon2-cffi: https://pypi.org/project/argon2-cffi/ .. _asgiref: https://pypi.org/project/asgiref/ .. _bcrypt: https://pypi.org/project/bcrypt/ +.. _colorama: https://pypi.org/project/colorama/ .. _docutils: https://pypi.org/project/docutils/ .. _geoip2: https://pypi.org/project/geoip2/ -.. _jinja2: https://pypi.org/project/jinja2/ +.. _jinja2: https://pypi.org/project/Jinja2/ .. _numpy: https://pypi.org/project/numpy/ .. _Pillow: https://pypi.org/project/Pillow/ .. _PyYAML: https://pyyaml.org/wiki/PyYAML @@ -375,8 +382,8 @@ in ``tests/auth_tests``. Troubleshooting =============== -Test suite hangs or shows failures on ``master`` branch -------------------------------------------------------- +Test suite hangs or shows failures on ``main`` branch +----------------------------------------------------- Ensure you have the latest point release of a :ref:`supported Python version `, since there are often bugs in earlier versions @@ -495,8 +502,8 @@ test failures. You can adjust this behavior with the ``--parallel`` option: $ ./runtests.py basic --parallel=1 -You can also use the ``DJANGO_TEST_PROCESSES`` environment variable for this -purpose. +You can also use the :envvar:`DJANGO_TEST_PROCESSES` environment variable for +this purpose. Tips for writing tests ====================== @@ -550,7 +557,7 @@ Since this pattern involves a lot of boilerplate, Django provides the installed, you should pass the set of targeted ``app_label`` as arguments: .. code-block:: python - :caption: tests/app_label/tests.py + :caption: ``tests/app_label/tests.py`` from django.db import models from django.test import SimpleTestCase diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index 639f7719b86d..9b8713b47691 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -69,9 +69,9 @@ Working on a ticket =================== When working on a ticket, create a new branch for the work, and base that work -on upstream/master:: +on ``upstream/main``:: - git checkout -b ticket_xxxxx upstream/master + git checkout -b ticket_xxxxx upstream/main The -b flag creates a new branch for you locally. Don't hesitate to create new branches even for the smallest things - that's what they are there for. @@ -115,7 +115,7 @@ their clone would become corrupt when you edit commits. There are also "public branches". These are branches other people are supposed to fork, so the history of these branches should never change. Good examples -of public branches are the ``master`` and ``stable/A.B.x`` branches in the +of public branches are the ``main`` and ``stable/A.B.x`` branches in the ``django/django`` repository. When you think your work is ready to be pulled into Django, you should create @@ -142,7 +142,7 @@ Pull requests at GitHub have only two states: open and closed. The committer who will deal with your pull request has only two options: merge it or close it. For this reason, it isn't useful to make a pull request until the code is ready for merging -- or sufficiently close that a committer will finish it -himself. +themselves. Rebasing branches ----------------- @@ -200,7 +200,7 @@ do this, use:: git rebase The work is automatically rebased using the branch you forked on, in the -example case using ``upstream/master``. +example case using ``upstream/main``. The rebase command removes all your local commits temporarily, applies the upstream commits, and then applies your local commits again on the work. @@ -255,7 +255,7 @@ One of the ways that developers can contribute to Django is by reviewing patches. Those patches will typically exist as pull requests on GitHub and can be easily integrated into your local repository:: - git checkout -b pull_xxxxx upstream/master + git checkout -b pull_xxxxx upstream/main curl https://github.com/django/django/pull/xxxxx.patch | git am This will create a new branch and then apply the changes from the pull request diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 5036f30fe023..0cea608191f1 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -61,7 +61,7 @@ To get started contributing, you'll want to read the :ref:`reStructuredText reference `. Your locally-built documentation will be themed differently than the -documentation at `docs.djangoproject.com `_. +documentation at `docs.djangoproject.com `_. This is OK! If your changes look good on your local machine, they'll look good on the website. @@ -239,6 +239,17 @@ documentation: section if possible. For example, use ``:rfc:`2324#section-2.3.2``` or ``:rfc:`Custom link text <2324#section-2.3.2>```. +* Use :rst:role:`:pep:` to reference a Python Enhancement Proposal (PEP) + and try to link to the relevant section if possible. For example, use + ``:pep:`20#easter-egg``` or ``:pep:`Easter Egg <20#easter-egg>```. + +* Use :rst:role:`:mimetype:` to refer to a MIME Type unless the value + is quoted for a code example. + +* Use :rst:role:`:envvar:` to refer to an environment variable. You may + also need to define a reference to the documentation for that environment + variable using :rst:dir:`.. envvar:: `. + Django-specific markup ====================== @@ -403,7 +414,7 @@ AdvanceCOMP's ``advpng``: $ advpng -z4 `find . -type f -not -path "./_build/*" -name "*.png"` This is based on OptiPNG version 0.7.5. Older versions may complain about the -``--strip all`` option being lossy. +``-strip all`` option being lossy. An example ========== @@ -485,16 +496,10 @@ Spelling check ============== Before you commit your docs, it's a good idea to run the spelling checker. -You'll need to install a couple packages first: - -* `pyenchant `_ (which requires - `enchant `_) - -* `sphinxcontrib-spelling - `_ - -Then from the ``docs`` directory, run ``make spelling``. Wrong words (if any) -along with the file and line number where they occur will be saved to +You'll need to install `sphinxcontrib-spelling +`_ first. Then from the +``docs`` directory, run ``make spelling``. Wrong words (if any) along with the +file and line number where they occur will be saved to ``_build/spelling/output.txt``. If you encounter false-positives (error output that actually is correct), do diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 074345ef4032..bc9acea6bc26 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -7,6 +7,33 @@ in a backward incompatible way, following their deprecation, as per the :ref:`deprecation policy `. More details about each item can often be found in the release notes of two versions prior. +.. _deprecation-removed-in-4.1: + +4.1 +--- + +See the :ref:`Django 3.2 release notes ` for more +details on these changes. + +* Support for assigning objects which don't support creating deep copies with + ``copy.deepcopy()`` to class attributes in ``TestCase.setUpTestData()`` will + be removed. + +* ``BaseCommand.requires_system_checks`` won't support boolean values. + +* The ``whitelist`` argument and ``domain_whitelist`` attribute of + ``django.core.validators.EmailValidator`` will be removed. + +* The ``default_app_config`` module variable will be removed. + +* ``TransactionTestCase.assertQuerysetEqual()`` will no longer automatically + call ``repr()`` on a queryset when compared to string values. + +* ``django.core.cache.backends.memcached.MemcachedCache`` will be removed. + +* Support for the pre-Django 3.2 format of messages used by + ``django.contrib.messages.storage.cookie.CookieStorage`` will be removed. + .. _deprecation-removed-in-4.0: 4.0 @@ -34,6 +61,9 @@ details on these changes. * ``django.utils.http.is_safe_url()`` will be removed. +See the :ref:`Django 3.1 release notes ` for more +details on these changes. + * The ``PASSWORD_RESET_TIMEOUT_DAYS`` setting will be removed. * The undocumented usage of the :lookup:`isnull` lookup with non-boolean values @@ -57,10 +87,14 @@ details on these changes. * Support for the pre-Django 3.1 ``django.core.signing.Signer`` signatures (encoded with the SHA-1 algorithm) will be removed. +* Support for the pre-Django 3.1 ``django.core.signing.dumps()`` signatures + (encoded with the SHA-1 algorithm) in ``django.core.signing.loads()`` will be + removed. + * Support for the pre-Django 3.1 user sessions (that use the SHA-1 algorithm) will be removed. -* The ``get_request`` argument for +* The ``get_response`` argument for ``django.utils.deprecation.MiddlewareMixin.__init__()`` will be required and won't accept ``None``. @@ -72,9 +106,6 @@ details on these changes. * The ``list`` message for ``ModelMultipleChoiceField`` will be removed. -* ``django.views.generic.TemplateView`` will no longer pass URL kwargs directly - to the ``context``. - * Support for passing raw column aliases to ``QuerySet.order_by()`` will be removed. @@ -92,8 +123,7 @@ details on these changes. * The ``{% ifequal %}`` and ``{% ifnotequal %}`` template tags will be removed. -See the :ref:`Django 3.1 release notes ` for more -details on these changes. +* The ``DEFAULT_HASHING_ALGORITHM`` transitional setting will be removed. .. _deprecation-removed-in-3.1: diff --git a/docs/internals/git.txt b/docs/internals/git.txt index 85f0c667a2ab..7329fe0bbcbc 100644 --- a/docs/internals/git.txt +++ b/docs/internals/git.txt @@ -31,7 +31,7 @@ Django releases, which you can browse online. The Git repository includes several `branches`_: -* ``master`` contains the main in-development code which will become +* ``main`` contains the main in-development code which will become the next packaged release of Django. This is where most development activity is focused. @@ -50,16 +50,20 @@ website can be found at `github.com/django/djangoproject.com `_. .. _Git: https://git-scm.com/ -.. _documentation: https://git-scm.com/documentation +.. _documentation: https://git-scm.com/doc .. _branches: https://github.com/django/django/branches .. _tags: https://github.com/django/django/tags -The master branch -================= +The main branch +=============== If you'd like to try out the in-development code for the next release of Django, or if you'd like to contribute to Django by fixing bugs or developing -new features, you'll want to get the code from the master branch. +new features, you'll want to get the code from the main branch. + +.. note:: + + Prior to March 2021, the main branch was called ``master``. Note that this will get *all* of Django: in addition to the top-level ``django`` module containing Python code, you'll also get a copy of Django's @@ -142,7 +146,7 @@ Archived feature-development work designed. Feature-development branches tend by their nature to be temporary. Some -produce successful features which are merged back into Django's master to +produce successful features which are merged back into Django's main branch to become part of an official release, but others do not; in either case, there comes a time when the branch is no longer being actively worked on by any developer. At this point the branch is considered closed. diff --git a/docs/internals/howto-release-django.txt b/docs/internals/howto-release-django.txt index 22fb393810d3..723804a95e3a 100644 --- a/docs/internals/howto-release-django.txt +++ b/docs/internals/howto-release-django.txt @@ -63,7 +63,7 @@ You'll need a few things before getting started: * Access to Django's record on PyPI. Create a file with your credentials: .. code-block:: ini - :caption: ~/.pypirc + :caption: ``~/.pypirc`` [pypi] username:YourUsername @@ -135,11 +135,16 @@ any time leading up to the actual release: and then commit the changed man page. #. If this is the alpha release of a new series, create a new stable branch - from master. For example, when releasing Django 3.1:: + from main. For example, when releasing Django 3.1:: - $ git checkout -b stable/3.1.x origin/master + $ git checkout -b stable/3.1.x origin/main $ git push origin -u stable/3.1.x:stable/3.1.x + At the same time, update the ``django_next_version`` variable in + ``docs/conf.py`` on the stable release branch to point to the new + development version. For example, when creating ``stable/4.2.x``, set + ``django_next_version`` to ``'5.0'`` on the new branch. + #. If this is the "dot zero" release of a new series, create a new branch from the current stable branch in the `django-docs-translations `_ repository. For @@ -232,7 +237,8 @@ OK, this is the fun part, where we actually push out a release! #. Create a "checksums" file, ``Django-<>.checksum.txt`` containing the hashes and release information. Start with this template and insert the correct version, date, GPG key ID (from - ``gpg --list-keys --keyid-format LONG``), release URL, and checksums: + ``gpg --list-keys --keyid-format LONG``), release manager's GitHub username, + release URL, and checksums: .. code-block:: text @@ -241,14 +247,18 @@ OK, this is the fun part, where we actually push out a release! To use this file, you will need a working install of PGP or other compatible public-key encryption software. You will also need to have - the Django release manager's public key in your keyring; this key has + the Django release manager's public key in your keyring. This key has the ID ``XXXXXXXXXXXXXXXX`` and can be imported from the MIT - keyserver. For example, if using the open-source GNU Privacy Guard + keyserver, for example, if using the open-source GNU Privacy Guard implementation of PGP: gpg --keyserver pgp.mit.edu --recv-key XXXXXXXXXXXXXXXX - Once the key is imported, verify this file:: + or via the GitHub API: + + curl https://github.com/<>.gpg | gpg --import - + + Once the key is imported, verify this file: gpg --verify <> @@ -305,28 +315,29 @@ Now you're ready to actually put the release out there. To do this: $ scp Django-A.B.C.checksum.txt.asc djangoproject.com:/home/www/www/media/pgp/Django-A.B.C.checksum.txt #. Test that the release packages install correctly using ``easy_install`` - and ``pip``. Here's one method (which requires `virtualenvwrapper`__):: + and ``pip``. Here's one method:: $ RELEASE_VERSION='1.7.2' $ MAJOR_VERSION=`echo $RELEASE_VERSION| cut -c 1-3` - $ mktmpenv + $ python -m venv django-easy-install + $ . django-easy-install/bin/activate $ easy_install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION.tar.gz $ deactivate - $ mktmpenv + $ python -m venv django-pip + $ . django-pip/bin/activate $ python -m pip install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION.tar.gz $ deactivate - $ mktmpenv + $ python -m venv django-pip-wheel + $ . django-pip-wheel/bin/activate $ python -m pip install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION-py3-none-any.whl $ deactivate This just tests that the tarballs are available (i.e. redirects are up) and that they install correctly, but it'll catch silly mistakes. - __ https://pypi.org/project/virtualenvwrapper/ - #. Ask a few people on IRC to verify the checksums by visiting the checksums - file (e.g. https://www.djangoproject.com/m/pgp/Django-1.5b1.checksum.txt) + file (e.g. https://media.djangoproject.com/pgp/Django-1.5b1.checksum.txt) and following the instructions in it. For bonus points, they can also unpack the downloaded release tarball and verify that its contents appear to be correct (proper version numbers, no stray ``.pyc`` or other undesirable @@ -367,7 +378,7 @@ Now you're ready to actually put the release out there. To do this: $ git pull $ python manage_translations.py robots_txt - __ https://github.com/django/djangoproject.com/blob/master/djangoproject/static/robots.docs.txt + __ https://github.com/django/djangoproject.com/blob/main/djangoproject/static/robots.docs.txt #. Post the release announcement to the |django-announce|, |django-developers|, and |django-users| mailing lists. This should include a link to the @@ -398,7 +409,7 @@ You're almost done! All that's left to do now is: version should be added after the alpha release and the default version should be updated after "dot zero" release. - __ https://github.com/django/code.djangoproject.com/blob/master/trac-env/conf/trac.ini + __ https://github.com/django/code.djangoproject.com/blob/main/trac-env/conf/trac.ini #. If this was a security release, update :doc:`/releases/security` with details of the issues addressed. @@ -440,8 +451,12 @@ need to be done by the releaser. `_. Since the automatically generated version names ("stable-A.B.x") differ from the version names used in Read the Docs ("A.B.x"), `create a ticket - `_ requesting the new - version. + `_ requesting + the new version. + +#. `Request the new classifier on PyPI + `_. For example + ``Framework :: Django :: 3.1``. Notes on setting the VERSION tuple ================================== diff --git a/docs/internals/mailing-lists.txt b/docs/internals/mailing-lists.txt index d5b9ab5f9ced..d21f9906db41 100644 --- a/docs/internals/mailing-lists.txt +++ b/docs/internals/mailing-lists.txt @@ -31,27 +31,10 @@ installation, usage, or debugging of Django. * `django-users subscription email address`_ * `django-users posting email`_ -.. _django-users mailing archive: https://groups.google.com/d/forum/django-users +.. _django-users mailing archive: https://groups.google.com/g/django-users .. _django-users subscription email address: mailto:django-users+subscribe@googlegroups.com .. _django-users posting email: mailto:django-users@googlegroups.com -.. _django-core-mentorship-mailing-list: - -``django-core-mentorship`` -========================== - -The Django Core Mentorship list is intended to provide a welcoming -introductory environment for community members interested in contributing to -the Django Project. - -* `django-core-mentorship mailing archive`_ -* `django-core-mentorship subscription email address`_ -* `django-core-mentorship posting email`_ - -.. _django-core-mentorship mailing archive: https://groups.google.com/d/forum/django-core-mentorship -.. _django-core-mentorship subscription email address: mailto:django-core-mentorship+subscribe@googlegroups.com -.. _django-core-mentorship posting email: mailto:django-core-mentorship@googlegroups.com - .. _django-developers-mailing-list: ``django-developers`` @@ -73,26 +56,10 @@ answered there. * `django-developers subscription email address`_ * `django-developers posting email`_ -.. _django-developers mailing archive: https://groups.google.com/d/forum/django-developers +.. _django-developers mailing archive: https://groups.google.com/g/django-developers .. _django-developers subscription email address: mailto:django-developers+subscribe@googlegroups.com .. _django-developers posting email: mailto:django-developers@googlegroups.com -.. _django-i18n-mailing-list: - -``django-i18n`` -=============== - -This is the place to discuss the internationalization and localization of -Django's components. - -* `django-i18n mailing archive`_ -* `django-i18n subscription email address`_ -* `django-i18n posting email`_ - -.. _django-i18n mailing archive: https://groups.google.com/d/forum/django-i18n -.. _django-i18n subscription email address: mailto:django-i18n+subscribe@googlegroups.com -.. _django-i18n posting email: mailto:django-i18n@googlegroups.com - .. _django-announce-mailing-list: ``django-announce`` @@ -105,7 +72,7 @@ A (very) low-traffic list for announcing :ref:`upcoming security releases * `django-announce subscription email address`_ * `django-announce posting email`_ -.. _django-announce mailing archive: https://groups.google.com/d/forum/django-announce +.. _django-announce mailing archive: https://groups.google.com/g/django-announce .. _django-announce subscription email address: mailto:django-announce+subscribe@googlegroups.com .. _django-announce posting email: mailto:django-announce@googlegroups.com @@ -121,6 +88,6 @@ by developers and interested community members. * `django-updates subscription email address`_ * `django-updates posting email`_ -.. _django-updates mailing archive: https://groups.google.com/d/forum/django-updates +.. _django-updates mailing archive: https://groups.google.com/g/django-updates .. _django-updates subscription email address: mailto:django-updates+subscribe@googlegroups.com .. _django-updates posting email: mailto:django-updates@googlegroups.com diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt index b2d399255f66..b124b4b5fe93 100644 --- a/docs/internals/organization.txt +++ b/docs/internals/organization.txt @@ -21,170 +21,280 @@ and its community. .. _Django Code of Conduct: https://www.djangoproject.com/conduct/ .. _Django Software Foundation: https://www.djangoproject.com/foundation/ -The Django core team makes the decisions, nominates its new members, and -elects its technical board. While it holds decision power in theory, it aims -at using it as rarely as possible in practice. Rough consensus should be the -norm and formal voting an exception. +.. _mergers-team: -.. _core-team: - -Core team -========= +Mergers +======= Role ---- -The core team is the group of trusted volunteers who manage the Django -Project. They assume many roles required to achieve the project's goals, -especially those that require a high level of trust. They make the decisions -that shape the future of the project. - -Core team members are expected to act as role models for the community and -custodians of the project, on behalf of the community and all those who rely -on Django. - -They will intervene, where necessary, in online discussions or at official -Django events on the rare occasions that a situation arises that requires -intervention. - -They have authority over the Django Project infrastructure, including the -Django Project website itself, the Django GitHub organization and -repositories, the Trac bug tracker, the mailing lists, IRC channels, etc. +Mergers_ are a small set of people who merge pull requests to the `Django Git +repository`_. Prerogatives ------------ -Core team members may participate in formal votes, typically to nominate new -team members and to elect the technical board. +Mergers hold the following prerogatives: -Some contributions don't require commit access. Depending on the reasons why a -contributor joins the team, they may or may not have commit permissions to the -Django code repository. +- Merging any pull request which constitutes a `minor change`_ (small enough + not to require the use of the `DEP process`_). A Merger must not merge a + change primarily authored by that Merger, unless the pull request has been + approved by: -However, should the need arise, any team member may ask for commit access by -writing to the core team's mailing list. Access will be granted unless the -person withdraws their request or the technical board vetoes the proposal. + - another Merger, + - a technical board member, + - a member of the `triage & review team`_, or + - a member of the `security team`_. -Core team members who have commit access are referred to as "committers" or -"core developers". +- Initiating discussion of a minor change in the appropriate venue, and request + that other Mergers refrain from merging it while discussion proceeds. +- Requesting a vote of the technical board regarding any minor change if, in + the Merger's opinion, discussion has failed to reach a consensus. +- Requesting a vote of the technical board when a `major change`_ (significant + enough to require the use of the `DEP process`_) reaches one of its + implementation milestones and is intended to merge. -Other permissions, such as access to the servers, are granted to those who -need them through the same process. +.. _`minor change`: https://github.com/django/deps/blob/main/accepted/0010-new-governance.rst#terminology +.. _`major change`: https://github.com/django/deps/blob/main/accepted/0010-new-governance.rst#terminology Membership ---------- -`Django team members `_ -demonstrate: - -- a good grasp of the philosophy of the Django Project -- a solid track record of being constructive and helpful -- significant contributions to the project's goals, in any form -- willingness to dedicate some time to improving Django - -As the project matures, contributions go way beyond code. Here's an incomplete -list of areas where contributions may be considered for joining the core team, -in no particular order: - -- Working on community management and outreach -- Providing support on the mailing-lists and on IRC -- Triaging tickets -- Writing patches (code, docs, or tests) -- Reviewing patches (code, docs, or tests) -- Participating in design decisions -- Providing expertise in a particular domain (security, i18n, etc.) -- Managing the continuous integration infrastructure -- Managing the servers (website, tracker, documentation, etc.) -- Maintaining related projects (djangoproject.com site, ex-contrib apps, etc.) -- Creating visual designs - -Very few areas are reserved to core team members: - -- Reviewing security reports -- Merging patches (code, docs, or tests) -- Packaging releases - -Core team membership acknowledges sustained and valuable efforts that align -well with the philosophy and the goals of the Django Project. - -It is granted by a four fifths majority of votes cast in a core team vote and -no veto by the technical board. - -Core team members are always looking for promising contributors, teaching them -how the project is managed, and submitting their names to the core team's vote -when they're ready. If you would like to join the core team, you can contact a -core team member privately or ask for guidance on the :ref:`Django Core -Mentorship mailing-list `. - -There's no time limit on core team membership. However, in order to provide -the general public with a reasonable idea of how many people maintain Django, -core team members who have stopped contributing are encouraged to declare -themselves as "past team members". Those who haven't made any non-trivial -contribution in two years may be asked to move themselves to this category, -and moved there if they don't respond. Past team members lose their privileges -such as voting rights and commit access. +`The technical board`_ selects Mergers_ as necessary to maintain their number +at a minimum of three, in order to spread the workload and avoid over-burdening +or burning out any individual Merger. There is no upper limit to the number of +Mergers. -.. _technical-board: +It's not a requirement that a Merger is also a Django Fellow, but the Django +Software Foundation has the power to use funding of Fellow positions as a way +to make the role of Merger sustainable. -Technical board -=============== +The following restrictions apply to the role of Merger: + +- A person must not simultaneously serve as a member of the technical board. If + a Merger is elected to the technical board, they shall cease to be a Merger + immediately upon taking up membership in the technical board. +- A person may serve in the roles of Releaser and Merger simultaneously. + +The selection process, when a vacancy occurs or when the technical board deems +it necessary to select additional persons for such a role, occur as follows: + +- Any member in good standing of an appropriate discussion venue, or the Django + Software Foundation board acting with the input of the DSF's Fellowship + committee, may suggest a person for consideration. +- The technical board considers the suggestions put forth, and then any member + of the technical board formally nominates a candidate for the role. +- The technical board votes on nominees. + +Mergers may resign their role at any time, but should endeavor to provide some +advance notice in order to allow the selection of a replacement. Termination of +the contract of a Django Fellow by the Django Software Foundation temporarily +suspends that person's Merger role until such time as the technical board can +vote on their nomination. + +Otherwise, a Merger may be removed by: + +- Becoming disqualified due to election to the technical board. +- Becoming disqualified due to actions taken by the Code of Conduct committee + of the Django Software Foundation. +- A vote of the technical board. + +.. _releasers-team: + +Releasers +========= Role ---- -The technical board is a group of experienced and active committers who steer -technical choices. Their main concern is to maintain the quality and stability -of the Django Web Framework. +Releasers_ are a small set of people who have the authority to upload packaged +releases of Django to the `Python Package Index`_, and to the +`djangoproject.com`_ website. Prerogatives ------------ -The technical board holds two prerogatives: +Releasers_ :doc:`build Django releases ` and +upload them to the `Python Package Index`_, and to the `djangoproject.com`_ +website. + +Membership +---------- + +`The technical board`_ selects Releasers_ as necessary to maintain their number +at a minimum of three, in order to spread the workload and avoid over-burdening +or burning out any individual Releaser. There is no upper limit to the number +of Releasers. -- Making major technical decisions when no consensus is found otherwise. This - happens on the |django-developers| mailing-list. -- Veto a grant of commit access or remove commit access. This happens on the - ``django-core`` mailing-list. +It's not a requirement that a Releaser is also a Django Fellow, but the Django +Software Foundation has the power to use funding of Fellow positions as a way +to make the role of Releaser sustainable. -In both cases, the technical board is a last resort. In these matters, it -fulfills a similar function to the former Benevolent Dictators For Life. +A person may serve in the roles of Releaser and Merger simultaneously. -When the board wants to exercise one of these prerogatives, it must hold a -private, simple majority vote on the resolution. The quorum is the full -committee — each member must cast a vote or abstain explicitly. Then the board -communicates the result, and if possible the reasons, on the appropriate -mailing-list. There's no appeal for such decisions. +The selection process, when a vacancy occurs or when the technical board deems +it necessary to select additional persons for such a role, occur as follows: -In addition, at its discretion, the technical board may act in an advisory -capacity on non-technical decisions. +- Any member in good standing of an appropriate discussion venue, or the Django + Software Foundation board acting with the input of the DSF's Fellowship + committee, may suggest a person for consideration. +- The technical board considers the suggestions put forth, and then any member + of the technical board formally nominates a candidate for the role. +- The technical board votes on nominees. -Membership ----------- +Releasers may resign their role at any time, but should endeavor to provide +some advance notice in order to allow the selection of a replacement. +Termination of the contract of a Django Fellow by the Django Software +Foundation temporarily suspends that person's Releaser role until such time as +the technical board can vote on their nomination. + +Otherwise, a Releaser may be removed by: -`The technical board`_ is an elected group of five committers. They're expected -to be experienced but there's no formal seniority requirement. +- Becoming disqualified due to actions taken by the Code of Conduct committee + of the Django Software Foundation. +- A vote of the technical board. -A new board is elected after each feature release of Django. The election -process is managed by a returns officer nominated by the outgoing technical -board. The election process works as follows: +.. _`Python Package Index`: https://pypi.org/project/Django/ +.. _djangoproject.com: https://www.djangoproject.com/download/ -#. Candidates advertise their application for the technical board to the team. +.. _technical-board: - They must be committers already. There's no term limit for technical board - members. +Technical board +=============== -#. Each team member can vote for zero to five people among the candidates. - Candidates are ranked by the total number of votes they received. +Role +---- - In case of a tie, the person who joined the core team earlier wins. +The technical board is a group of experienced contributors who: -Both the application and the voting period last between one and two weeks, at -the outgoing board's discretion. +- provide oversight of Django's development and release process, +- assist in setting the direction of feature development and releases, +- take part in filling certain roles, and +- have a tie-breaking vote when other decision-making processes fail. -.. _the technical board: https://www.djangoproject.com/foundation/teams/#technical-board-team +Their main concern is to maintain the quality and stability of the Django Web +Framework. + +Prerogatives +------------ + +The technical board holds the following prerogatives: + +- Making a binding decision regarding any question of a technical change to + Django. +- Vetoing the merging of any particular piece of code into Django or ordering + the reversion of any particular merge or commit. +- Announcing calls for proposals and ideas for the future technical direction + of Django. +- Setting and adjusting the schedule of releases of Django. +- Selecting and removing mergers and releasers. +- Participating in the removal of members of the technical board, when deemed + appropriate. +- Calling elections of the technical board outside of those which are + automatically triggered, at times when the technical board deems an election + is appropriate. +- Participating in modifying Django's governance (see + :ref:`organization-change`). +- Declining to vote on a matter the technical board feels is unripe for a + binding decision, or which the technical board feels is outside the scope of + its powers. +- Taking charge of the governance of other technical teams within the Django + open-source project, and governing those teams accordingly. + +Membership +---------- + +`The technical board`_ is an elected group of five experienced contributors +who demonstrate: + +- A history of technical contributions to Django or the Django ecosystem. This + history must begin at least 18 months prior to the individual's candidacy for + the technical board. +- A history of participation in Django's development outside of contributions + merged to the `Django Git repository`_. This may include, but is not + restricted to: + + - Participation in discussions on the |django-developers| mailing list or + the `Django forum`_. + - Reviewing and offering feedback on pull requests in the Django source-code + repository. + - Assisting in triage and management of the Django bug tracker. + +- A history of recent engagement with the direction and development of Django. + Such engagement must have occurred within a period of no more than two years + prior to the individual's candidacy for the technical board. + +A new board is elected after each release cycle of Django. The election process +works as follows: + +#. The technical board direct one of its members to notify the Secretary of the + Django Software Foundation, in writing, of the triggering of the election, + and the condition which triggered it. The Secretary post to the appropriate + venue -- the |django-developers| mailing list and the `Django forum`_ to + announce the election and its timeline. +#. As soon as the election is announced, the `DSF Board`_ begin a period of + voter registration. All `individual members of the DSF`_ are automatically + registered and need not explicitly register. All other persons who believe + themselves eligible to vote, but who have not yet registered to vote, may + make an application to the DSF Board for voting privileges. The voter + registration form and roll of voters is maintained by the DSF Board. The DSF + Board may challenge and reject the registration of voters it believes are + registering in bad faith or who it believes have falsified their + qualifications or are otherwise unqualified. +#. Registration of voters close one week after the announcement of the + election. At that point, registration of candidates begin. Any qualified + person may register as a candidate. The candidate registration form and + roster of candidates are maintained by the DSF Board, and candidates must + provide evidence of their qualifications as part of registration. The DSF + Board may challenge and reject the registration of candidates it believes do + not meet the qualifications of members of the Technical Board, or who it + believes are registering in bad faith. +#. Registration of candidates close one week after it has opened. One week + after registration of candidates closes, the Secretary of the DSF publish + the roster of candidates to the |django-developers| mailing list and the + `Django forum`_, and the election begin. The DSF Board provide a voting form + accessible to registered voters, and is the custodian of the votes. +#. Voting is by secret ballot containing the roster of candidates, and any + relevant materials regarding the candidates, in a randomized order. Each + voter may vote for up to five candidates on the ballot. +#. The election conclude one week after it begins. The DSF Board then tally the + votes and produce a summary, including the total number of votes cast and + the number received by each candidate. This summary is ratified by a + majority vote of the DSF Board, then posted by the Secretary of the DSF to + the |django-developers| mailing list and the Django Forum. The five + candidates with the highest vote totals are immediately become the new + technical board. + +A member of the technical board may be removed by: + +- Becoming disqualified due to actions taken by the Code of Conduct committee + of the Django Software Foundation. +- Determining that they did not possess the qualifications of a member of the + technical board. This determination must be made jointly by the other members + of the technical board, and the `DSF Board`_. A valid determination of + ineligibility requires that all other members of the technical board and all + members of the DSF Board vote who can vote on the issue (the affected person, + if a DSF Board member, must not vote) vote "yes" on a motion that the person + in question is ineligible. + +.. _`Django forum`: https://forum.djangoproject.com/ +.. _`Django Git repository`: https://github.com/django/django/ +.. _`DSF Board`: https://www.djangoproject.com/foundation/#board +.. _`individual members of the DSF`: https://www.djangoproject.com/foundation/individual-members/ +.. _mergers: https://www.djangoproject.com/foundation/teams/#mergers-team +.. _releasers: https://www.djangoproject.com/foundation/teams/#releasers-team +.. _`security team`: https://www.djangoproject.com/foundation/teams/#security-team +.. _`the technical board`: https://www.djangoproject.com/foundation/teams/#technical-board-team +.. _`triage & review team`: https://www.djangoproject.com/foundation/teams/#triage-review-team + +.. _organization-change: Changing the organization ========================= -Changes to this document require a four fifths majority of votes cast in a -core team vote and no veto by the technical board. +Changes to this document require the use of the `DEP process`_, with +modifications described in `DEP 0010`_. + +.. _`DEP process`: https://github.com/django/deps/blob/main/final/0001-dep-process.rst +.. _`DEP 0010`: https://github.com/django/deps/blob/main/accepted/0010-new-governance.rst#changing-this-governance-process diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index 6091989893e5..7e899026dc3d 100644 --- a/docs/internals/release-process.txt +++ b/docs/internals/release-process.txt @@ -128,10 +128,10 @@ varying levels. See `the supported versions section `_ of the download page for the current state of support for each version. -* The current development master will get new features and bug fixes +* The current development branch ``main`` will get new features and bug fixes requiring non-trivial refactoring. -* Patches applied to the master branch must also be applied to the last feature +* Patches applied to the main branch must also be applied to the last feature release branch, to be released in the next patch release of that feature series, when they fix critical problems: @@ -150,8 +150,8 @@ page for the current state of support for each version. release for bugs that would have prevented a release in the first place (release blockers). -* Security fixes and data loss bugs will be applied to the current master, the - last two feature release branches, and any other supported long-term +* Security fixes and data loss bugs will be applied to the current main branch, + the last two feature release branches, and any other supported long-term support release branches. * Documentation fixes generally will be more freely backported to the last @@ -162,17 +162,18 @@ page for the current state of support for each version. As a concrete example, consider a moment in time halfway between the release of Django 5.1 and 5.2. At this point in time: -* Features will be added to development master, to be released as Django 5.2. +* Features will be added to the development main branch, to be released as + Django 5.2. * Critical bug fixes will be applied to the ``stable/5.1.x`` branch, and released as 5.1.1, 5.1.2, etc. * Security fixes and bug fixes for data loss issues will be applied to - ``master`` and to the ``stable/5.1.x``, ``stable/5.0.x``, and + ``main`` and to the ``stable/5.1.x``, ``stable/5.0.x``, and ``stable/4.2.x`` (LTS) branches. They will trigger the release of ``5.1.1``, ``5.0.5``, ``4.2.8``, etc. -* Documentation fixes will be applied to master, and, if easily backported, to +* Documentation fixes will be applied to main, and, if easily backported, to the latest stable branch, ``5.1.x``. .. _release-process: @@ -212,7 +213,7 @@ At the end of phase two, any unfinished features will be postponed until the next release. Phase two will culminate with an alpha release. At this point, the -``stable/A.B.x`` branch will be forked from ``master``. +``stable/A.B.x`` branch will be forked from ``main``. Phase three: bugfixes ~~~~~~~~~~~~~~~~~~~~~ @@ -229,7 +230,7 @@ During this phase, committers will be more and more conservative with backports, to avoid introducing regressions. After the release candidate, only release blockers and documentation fixes should be backported. -In parallel to this phase, ``master`` can receive new features, to be released +In parallel to this phase, ``main`` can receive new features, to be released in the ``A.B+1`` cycle. Bug-fix releases @@ -239,7 +240,7 @@ After a feature release (e.g. A.B), the previous release will go into bugfix mode. The branch for the previous feature release (e.g. ``stable/A.B-1.x``) will -include bugfixes. Critical bugs fixed on master must *also* be fixed on the +include bugfixes. Critical bugs fixed on main must *also* be fixed on the bugfix branch; this means that commits need to cleanly separate bug fixes from -feature additions. The developer who commits a fix to master will be +feature additions. The developer who commits a fix to main will be responsible for also applying the fix to the current bugfix branch. diff --git a/docs/internals/security.txt b/docs/internals/security.txt index 438325b3303f..e394a9a11a8e 100644 --- a/docs/internals/security.txt +++ b/docs/internals/security.txt @@ -46,9 +46,9 @@ Supported versions At any given time, the Django team provides official security support for several versions of Django: -* The `master development branch`_, hosted on GitHub, which will become the +* The `main development branch`_, hosted on GitHub, which will become the next major release of Django, receives security support. Security issues that - only affect the master development branch and not any stable released versions + only affect the main development branch and not any stable released versions are fixed in public without going through the :ref:`disclosure process `. @@ -67,7 +67,7 @@ comprised solely of *supported* versions of Django: older versions may also be affected, but we do not investigate to determine that, and will not issue patches or new releases for those versions. -.. _master development branch: https://github.com/django/django/ +.. _main development branch: https://github.com/django/django/ .. _security-disclosure: @@ -191,6 +191,11 @@ groups: demonstrated ability to responsibly receive, keep confidential and act on these notifications. +.. admonition:: Security audit and scanning entities + + As a policy, we do not add these types of entities to the notification + list. + Requesting notifications ======================== @@ -235,3 +240,9 @@ Please also bear in mind that for any individual or organization, receiving security notifications is a privilege granted at the sole discretion of the Django development team, and that this privilege can be revoked at any time, with or without explanation. + +.. admonition:: Provide all required information + + A failure to provide the required information in your initial contact + will count against you when making the decision on whether or not to + approve your request. diff --git a/docs/intro/_images/admin10t.png b/docs/intro/_images/admin10t.png index 928cad5d6ed2..3d6a904cf14f 100644 Binary files a/docs/intro/_images/admin10t.png and b/docs/intro/_images/admin10t.png differ diff --git a/docs/intro/_images/admin11t.png b/docs/intro/_images/admin11t.png index a5e9bb12cff2..e7b9714d102b 100644 Binary files a/docs/intro/_images/admin11t.png and b/docs/intro/_images/admin11t.png differ diff --git a/docs/intro/_images/admin14t.png b/docs/intro/_images/admin14t.png index 47f2323c7cbd..880d160ecaa4 100644 Binary files a/docs/intro/_images/admin14t.png and b/docs/intro/_images/admin14t.png differ diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index 06cc061670dd..dd3a63157839 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -19,8 +19,8 @@ Who's this tutorial for? .. seealso:: - If you are looking for a reference on how to submit patches, see the - :doc:`/internals/contributing/writing-code/submitting-patches` + If you are looking for a reference on the details of making code + contributions, see the :doc:`/internals/contributing/writing-code/index` documentation. For this tutorial, we expect that you have at least a basic understanding of @@ -41,11 +41,11 @@ so that it can be of use to the widest audience. .. admonition:: Where to get help: If you're having trouble going through this tutorial, please post a message - to |django-developers| or drop by `#django-dev on irc.freenode.net`__ to + to |django-developers| or drop by `#django-dev on irc.libera.chat`__ to chat with other Django users who might be able to help. __ https://diveinto.org/python3/table-of-contents.html -__ https://webchat.freenode.net/#django-dev +__ https://web.libera.chat/#django-dev What does this tutorial cover? ------------------------------ @@ -77,8 +77,7 @@ probably got the answers. .. admonition:: For Windows users - When installing Python on Windows, make sure you check the option "Add - python.exe to Path", so that it is always available on the command line. + See :ref:`install_python_windows` on Windows docs for additional guidance. Code of Conduct =============== @@ -152,8 +151,7 @@ If the ``source`` command is not available, you can try using a dot instead: $ . ~/.virtualenvs/djangodev/bin/activate You have to activate the virtual environment whenever you open a new -terminal window. virtualenvwrapper__ is a useful tool for making this -more convenient. +terminal window. .. admonition:: For Windows users @@ -163,15 +161,6 @@ more convenient. ...\> %HOMEPATH%\.virtualenvs\djangodev\Scripts\activate.bat - or you can install :ref:`a Windows version of virtualenvwrapper - ` and then use: - - .. code-block:: doscon - - ...\> workon djangodev - -__ https://virtualenvwrapper.readthedocs.io/en/latest/ - The name of the currently activated virtual environment is displayed on the command line to help you keep track of which one you are using. Anything you install through ``pip`` while this name is displayed will be installed in that @@ -254,12 +243,12 @@ to Django's code, the entire test suite **should** pass. If you get failures or errors make sure you've followed all of the previous steps properly. See :ref:`running-unit-tests` for more information. -Note that the latest Django master may not always be stable. When developing -against master, you can check `Django's continuous integration builds`__ to -determine if the failures are specific to your machine or if they are also -present in Django's official builds. If you click to view a particular build, -you can view the "Configuration Matrix" which shows failures broken down by -Python version and database backend. +Note that the latest Django "main" branch may not always be stable. When +developing against "main", you can check `Django's continuous integration +builds`__ to determine if the failures are specific to your machine or if they +are also present in Django's official builds. If you click to view a particular +build, you can view the "Configuration Matrix" which shows failures broken down +by Python version and database backend. __ https://djangoci.com @@ -325,7 +314,7 @@ Writing a test for ticket #99999 -------------------------------- In order to resolve this ticket, we'll add a ``make_toast()`` function to the -top-level ``django`` module. First we are going to write a test that tries to +``django.shortcuts`` module. First we are going to write a test that tries to use the function and check that its output looks correct. Navigate to Django's ``tests/shortcuts/`` folder and create a new file @@ -354,7 +343,7 @@ This test checks that the ``make_toast()`` returns ``'toast'``. * After reading those, if you want something a little meatier to sink your teeth into, there's always the Python :mod:`unittest` documentation. -__ https://www.diveinto.org/python3/unit-testing.html +__ https://diveinto.org/python3/unit-testing.html Running your new test --------------------- @@ -423,6 +412,8 @@ file:: ``make_toast()`` ================ + .. function:: make_toast() + .. versionadded:: 2.2 Returns ``'toast'``. diff --git a/docs/intro/index.txt b/docs/intro/index.txt index 1be0facb2234..f52c04e8cfe8 100644 --- a/docs/intro/index.txt +++ b/docs/intro/index.txt @@ -34,7 +34,7 @@ place: read this material to quickly get up and running. Python quickly, we recommend `Dive Into Python`_. If that's not quite your style, there are many other `books about Python`_. - .. _python: https://python.org/ + .. _python: https://www.python.org/ .. _list of Python resources for non-programmers: https://wiki.python.org/moin/BeginnersGuide/NonProgrammers .. _Dive Into Python: https://diveinto.org/python3/table-of-contents.html .. _books about Python: https://wiki.python.org/moin/PythonBooks diff --git a/docs/intro/install.txt b/docs/intro/install.txt index dc8399d933e6..2e67b9a9aa3c 100644 --- a/docs/intro/install.txt +++ b/docs/intro/install.txt @@ -14,7 +14,7 @@ Being a Python Web framework, Django requires Python. See :ref:`faq-python-version-support` for details. Python includes a lightweight database called SQLite_ so you won't need to set up a database just yet. -.. _sqlite: https://sqlite.org/ +.. _sqlite: https://www.sqlite.org/ Get the latest version of Python at https://www.python.org/downloads/ or with your operating system's package manager. diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt index fa61e4ec571a..86b172f526f4 100644 --- a/docs/intro/overview.txt +++ b/docs/intro/overview.txt @@ -26,7 +26,7 @@ representing your models -- so far, it's been solving many years' worth of database-schema problems. Here's a quick example: .. code-block:: python - :caption: mysite/news/models.py + :caption: ``mysite/news/models.py`` from django.db import models @@ -146,7 +146,7 @@ a website that lets authenticated users add, change and delete objects. The only step required is to register your model in the admin site: .. code-block:: python - :caption: mysite/news/models.py + :caption: ``mysite/news/models.py`` from django.db import models @@ -157,7 +157,7 @@ only step required is to register your model in the admin site: reporter = models.ForeignKey(Reporter, on_delete=models.CASCADE) .. code-block:: python - :caption: mysite/news/admin.py + :caption: ``mysite/news/admin.py`` from django.contrib import admin @@ -189,7 +189,7 @@ Here's what a URLconf might look like for the ``Reporter``/``Article`` example above: .. code-block:: python - :caption: mysite/news/urls.py + :caption: ``mysite/news/urls.py`` from django.urls import path @@ -229,7 +229,7 @@ and renders the template with the retrieved data. Here's an example view for ``year_archive`` from above: .. code-block:: python - :caption: mysite/news/views.py + :caption: ``mysite/news/views.py`` from django.shortcuts import render @@ -258,7 +258,7 @@ Let's say the ``news/year_archive.html`` template was found. Here's what that might look like: .. code-block:: html+django - :caption: mysite/news/templates/news/year_archive.html + :caption: ``mysite/news/templates/news/year_archive.html`` {% extends "base.html" %} @@ -299,7 +299,7 @@ Here's what the "base.html" template, including the use of :doc:`static files `, might look like: .. code-block:: html+django - :caption: mysite/templates/base.html + :caption: ``mysite/templates/base.html`` {% load static %} @@ -307,7 +307,7 @@ Here's what the "base.html" template, including the use of :doc:`static files {% block title %}{% endblock %} - Logo + Logo {% block content %}{% endblock %} diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index 3bc018833216..82bdaf278459 100644 --- a/docs/intro/reusable-apps.txt +++ b/docs/intro/reusable-apps.txt @@ -144,7 +144,7 @@ this. For a small app like polls, this process isn't too difficult. #. Create a file ``django-polls/README.rst`` with the following contents: .. code-block:: rst - :caption: django-polls/README.rst + :caption: ``django-polls/README.rst`` ===== Polls @@ -191,7 +191,7 @@ this. For a small app like polls, this process isn't too difficult. with the following contents: .. code-block:: ini - :caption: django-polls/setup.cfg + :caption: ``django-polls/setup.cfg`` [metadata] name = django-polls @@ -221,9 +221,12 @@ this. For a small app like polls, this process isn't too difficult. [options] include_package_data = true packages = find: + python_requires = >=3.6 + install_requires = + Django >= X.Y # Replace "X.Y" as appropriate .. code-block:: python - :caption: django-polls/setup.py + :caption: ``django-polls/setup.py`` from setuptools import setup @@ -232,12 +235,12 @@ this. For a small app like polls, this process isn't too difficult. #. Only Python modules and packages are included in the package by default. To include additional files, we'll need to create a ``MANIFEST.in`` file. The setuptools docs referred to in the previous step discuss this file in more - details. To include the templates, the ``README.rst`` and our ``LICENSE`` + detail. To include the templates, the ``README.rst`` and our ``LICENSE`` file, create a file ``django-polls/MANIFEST.in`` with the following contents: .. code-block:: text - :caption: django-polls/MANIFEST.in + :caption: ``django-polls/MANIFEST.in`` include LICENSE include README.rst @@ -277,8 +280,8 @@ working. We'll now fix this by installing our new ``django-polls`` package. users of the machine. Note that per-user installations can still affect the behavior of system - tools that run as that user, so ``virtualenv`` is a more robust solution - (see below). + tools that run as that user, so using a virtual environment is a more robust + solution (see below). #. To install the package, use pip (you already :ref:`installed it `, right?):: @@ -307,8 +310,8 @@ the world! If this wasn't just an example, you could now: tutorial `_ for doing this. -Installing Python packages with virtualenv -========================================== +Installing Python packages with a virtual environment +===================================================== Earlier, we installed the polls app as a user library. This has some disadvantages: @@ -319,7 +322,7 @@ disadvantages: the same name). Typically, these situations only arise once you're maintaining several Django -projects. When they do, the best solution is to use `virtualenv -`_. This tool allows you to maintain multiple -isolated Python environments, each with its own copy of the libraries and -package namespace. +projects. When they do, the best solution is to use :doc:`venv +`. This tool allows you to maintain multiple isolated +Python environments, each with its own copy of the libraries and package +namespace. diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index 05f99b6f7615..f3b080e9bb14 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -245,7 +245,7 @@ Let's write the first view. Open the file ``polls/views.py`` and put the following Python code in it: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` from django.http import HttpResponse @@ -273,7 +273,7 @@ Your app directory should now look like:: In the ``polls/urls.py`` file include the following code: .. code-block:: python - :caption: polls/urls.py + :caption: ``polls/urls.py`` from django.urls import path @@ -288,7 +288,7 @@ The next step is to point the root URLconf at the ``polls.urls`` module. In :func:`~django.urls.include` in the ``urlpatterns`` list, so you have: .. code-block:: python - :caption: mysite/urls.py + :caption: ``mysite/urls.py`` from django.contrib import admin from django.urls import include, path diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index 42e3ccd11013..2fa780178ae4 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -122,10 +122,10 @@ additional metadata. .. admonition:: Philosophy - A model is the single, definitive source of truth about your data. It contains - the essential fields and behaviors of the data you're storing. Django follows - the :ref:`DRY Principle `. The goal is to define your data model in one - place and automatically derive things from it. + A model is the single, definitive source of information about your data. It + contains the essential fields and behaviors of the data you're storing. + Django follows the :ref:`DRY Principle `. The goal is to define your + data model in one place and automatically derive things from it. This includes the migrations - unlike in Ruby On Rails, for example, migrations are entirely derived from your models file, and are essentially a @@ -141,7 +141,7 @@ These concepts are represented by Python classes. Edit the :file:`polls/models.py` file so it looks like this: .. code-block:: python - :caption: polls/models.py + :caption: ``polls/models.py`` from django.db import models @@ -217,7 +217,7 @@ add that dotted path to the :setting:`INSTALLED_APPS` setting. It'll look like this: .. code-block:: python - :caption: mysite/settings.py + :caption: ``mysite/settings.py`` INSTALLED_APPS = [ 'polls.apps.PollsConfig', @@ -378,8 +378,8 @@ API Django gives you. To invoke the Python shell, use this command: $ python manage.py shell We're using this instead of simply typing "python", because :file:`manage.py` -sets the ``DJANGO_SETTINGS_MODULE`` environment variable, which gives Django -the Python import path to your :file:`mysite/settings.py` file. +sets the :envvar:`DJANGO_SETTINGS_MODULE` environment variable, which gives +Django the Python import path to your :file:`mysite/settings.py` file. Once you're in the shell, explore the :doc:`database API `:: @@ -424,7 +424,7 @@ representation of this object. Let's fix that by editing the ``Question`` model ``Choice``: .. code-block:: python - :caption: polls/models.py + :caption: ``polls/models.py`` from django.db import models @@ -448,7 +448,7 @@ automatically-generated admin. Let's also add a custom method to this model: .. code-block:: python - :caption: polls/models.py + :caption: ``polls/models.py`` import datetime @@ -646,7 +646,7 @@ have an admin interface. To do this, open the :file:`polls/admin.py` file, and edit it to look like this: .. code-block:: python - :caption: polls/admin.py + :caption: ``polls/admin.py`` from django.contrib import admin diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt index b232e5a24b16..720a83a3e508 100644 --- a/docs/intro/tutorial03.txt +++ b/docs/intro/tutorial03.txt @@ -50,7 +50,7 @@ Django will choose a view by examining the URL that's requested (to be precise, the part of the URL after the domain name). Now in your time on the web you may have come across such beauties as -"ME2/Sites/dirmod.asp?sid=&type=gen&mod=Core+Pages&gid=A6CD4967199A42D9B65B1B". +``ME2/Sites/dirmod.htm?sid=&type=gen&mod=Core+Pages&gid=A6CD4967199A42D9B65B1B``. You will be pleased to know that Django allows us much more elegant *URL patterns* than that. @@ -70,7 +70,7 @@ Now let's add a few more views to ``polls/views.py``. These views are slightly different, because they take an argument: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` def detail(request, question_id): return HttpResponse("You're looking at question %s." % question_id) @@ -86,7 +86,7 @@ Wire these new views into the ``polls.urls`` module by adding the following :func:`~django.urls.path` calls: .. code-block:: python - :caption: polls/urls.py + :caption: ``polls/urls.py`` from django.urls import path @@ -121,9 +121,10 @@ like so:: The ``question_id=34`` part comes from ````. Using angle brackets "captures" part of the URL and sends it as a keyword argument to the -view function. The ``:question_id>`` part of the string defines the name that -will be used to identify the matched pattern, and the `` @@ -212,12 +213,12 @@ Put the following code in that template: To make the tutorial shorter, all template examples use incomplete HTML. In your own projects you should use `complete HTML documents`__. -__ https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML/Getting_started#Anatomy_of_an_HTML_document +__ https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML/Getting_started#anatomy_of_an_html_document Now let's update our ``index`` view in ``polls/views.py`` to use the template: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` from django.http import HttpResponse from django.template import loader @@ -250,7 +251,7 @@ template. Django provides a shortcut. Here's the full ``index()`` view, rewritten: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` from django.shortcuts import render @@ -279,7 +280,7 @@ Now, let's tackle the question detail view -- the page that displays the questio for a given poll. Here's the view: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` from django.http import Http404 from django.shortcuts import render @@ -301,7 +302,7 @@ later, but if you'd like to quickly get the above example working, a file containing just: .. code-block:: html+django - :caption: polls/templates/polls/detail.html + :caption: ``polls/templates/polls/detail.html`` {{ question }} @@ -315,7 +316,7 @@ and raise :exc:`~django.http.Http404` if the object doesn't exist. Django provides a shortcut. Here's the ``detail()`` view, rewritten: .. code-block:: python - :caption: polls/views.py + :caption: ``polls/views.py`` from django.shortcuts import get_object_or_404, render @@ -357,7 +358,7 @@ variable ``question``, here's what the ``polls/detail.html`` template might look like: .. code-block:: html+django - :caption: polls/templates/polls/detail.html + :caption: ``polls/templates/polls/detail.html``

    {{ question.question_text }}