diff --git a/AUTHORS b/AUTHORS index dbc414f5a378..4109686bfb02 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ answer newbie questions, and generally made Django that much better: Aaron Cannon Aaron Swartz Aaron T. Myers + Adam Donaghy Adam Johnson Adam Malinowski Adam Vandenberg @@ -110,6 +111,7 @@ answer newbie questions, and generally made Django that much better: berto Bill Fenner Bjørn Stabell + Bo Marchman Bojan Mihelac Bouke Haarsma Božidar Benko @@ -364,6 +366,7 @@ answer newbie questions, and generally made Django that much better: Jensen Cochran Jeong-Min Lee Jérémie Blaser + Jeremy Bowman Jeremy Carbaugh Jeremy Dunck Jeremy Lainé @@ -456,8 +459,10 @@ answer newbie questions, and generally made Django that much better: Leo Shklovskii Leo Soto lerouxb@gmail.com + Lex Berezhny Liang Feng limodou + Lincoln Smith Loek van Gent Loïc Bistuer Lowe Thiderman @@ -538,6 +543,7 @@ answer newbie questions, and generally made Django that much better: michael.mcewan@gmail.com Michael Placentra II Michael Radziej + Michael Sanders Michael Schwarz Michael Thornhill Michal Chruszcz @@ -603,6 +609,7 @@ answer newbie questions, and generally made Django that much better: Paul Bissex Paul Collier Paul Collins + Paul Donohue Paul Lanier Paul McLanahan Paul McMillan @@ -632,6 +639,7 @@ answer newbie questions, and generally made Django that much better: pradeep.gowda@gmail.com Preston Holmes Preston Timmons + Rachel Tobin Rachel Willmer Radek Švarz Rajesh Dhawan @@ -717,6 +725,7 @@ answer newbie questions, and generally made Django that much better: Stanislaus Madueke starrynight Stefane Fermgier + Stefano Rivera Stéphane Raimbault Stephan Jaekel Stephen Burrows @@ -730,6 +739,7 @@ answer newbie questions, and generally made Django that much better: Sutrisno Efendi Swaroop C H Szilveszter Farkas + Taavi Teska Tai Lee Takashi Matsuo Tareque Hossain @@ -759,6 +769,7 @@ answer newbie questions, and generally made Django that much better: Tome Cvitan Tomek Paczkowski Tom Insam + Tomer Chachamu Tommy Beadle Tom Tobin Tore Lundqvist @@ -810,6 +821,7 @@ answer newbie questions, and generally made Django that much better: Yoong Kang Lim Yusuke Miyazaki Zachary Voase + Zach Liu Zach Thompson Zain Memon Zak Johnson @@ -828,7 +840,6 @@ A big THANK YOU goes to: Ian Bicking for convincing Adrian to ditch code generation. - Mark Pilgrim for "Dive Into Python" (http://www.diveintopython.net, - http://www.diveintopython3.net). + Mark Pilgrim for "Dive Into Python" (http://www.diveintopython3.net). Guido van Rossum for creating Python. diff --git a/README.rst b/README.rst index 3afba227fbe8..20913f4e132e 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ 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. Read the archives at http://django-irc-logs.com/. + there. Read the archives at https://botbot.me/freenode/django/. * Join the django-users mailing list, or read the archives, at https://groups.google.com/group/django-users. diff --git a/django/__init__.py b/django/__init__.py index 1584f27d4b39..ff94c54f7e4b 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -2,7 +2,7 @@ from django.utils.version import get_version -VERSION = (1, 11, 0, 'alpha', 0) +VERSION = (1, 11, 30, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index f732682b1cfe..148c7a0203e6 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -244,7 +244,7 @@ def gettext_noop(s): # re.compile(r'^NaverBot.*'), # re.compile(r'^EmailSiphon.*'), # re.compile(r'^SiteSucker.*'), -# re.compile(r'^sohu-search') +# re.compile(r'^sohu-search'), # ] DISALLOWED_USER_AGENTS = [] @@ -255,9 +255,9 @@ def gettext_noop(s): # import re # IGNORABLE_404_URLS = [ # re.compile(r'^/apple-touch-icon.*\.png$'), -# re.compile(r'^/favicon.ico$), -# re.compile(r'^/robots.txt$), -# re.compile(r'^/phpmyadmin/), +# re.compile(r'^/favicon.ico$'), +# re.compile(r'^/robots.txt$'), +# re.compile(r'^/phpmyadmin/'), # re.compile(r'\.(cgi|php|pl)$'), # ] IGNORABLE_404_URLS = [] diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo index 78219160bd06..b4a521f49751 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 1a1429b8374b..2b94bbc0678e 100644 --- a/django/conf/locale/ar/LC_MESSAGES/django.po +++ b/django/conf/locale/ar/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-18 08:41+0000\n" -"Last-Translator: Bashar Al-Abdulhadi\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \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" @@ -297,6 +297,15 @@ msgstr "الملفات الثابتة" msgid "Syndication" msgstr "توظيف النشر" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "أدخل قيمة صحيحة." @@ -426,6 +435,12 @@ 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 "" + msgid "and" msgstr "و" @@ -790,15 +805,15 @@ msgstr "" "%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد " "تكون غامضة أو أنها غير موجودة." +msgid "Clear" +msgstr "تفريغ" + msgid "Currently" msgstr "حالياً" msgid "Change" msgstr "عدّل" -msgid "Clear" -msgstr "تفريغ" - msgid "Unknown" msgstr "مجهول" @@ -1201,12 +1216,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "تهانينا على صفحتك الأولى بدعم من جانغو." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"وبطبيعة الحال، لم يتم عمل أي عمل فعلي حتى الآن. الخطوة التالية هي تشغيل أول " -"تطبيق لك عبر الأمر التالي\n" -" python manage.py startapp [app_label] ." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/az/LC_MESSAGES/django.mo b/django/conf/locale/az/LC_MESSAGES/django.mo index 5ed900c94e95..2234d6fb5e91 100644 Binary files a/django/conf/locale/az/LC_MESSAGES/django.mo and b/django/conf/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/az/LC_MESSAGES/django.po b/django/conf/locale/az/LC_MESSAGES/django.po index 4e60389c69fd..012ab90b8c41 100644 --- a/django/conf/locale/az/LC_MESSAGES/django.po +++ b/django/conf/locale/az/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-08-05 11:00+0000\n" -"Last-Translator: Emin Mastizada \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" @@ -294,6 +294,15 @@ msgstr "Statik Fayllar" msgid "Syndication" msgstr "Sindikasiya" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Düzgün qiymət daxil edin." @@ -393,6 +402,12 @@ msgid_plural "" msgstr[0] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun." msgstr[1] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "və" @@ -729,15 +744,15 @@ msgstr "" "%(datetime)s %(current_timezone)s zaman qurşağında ifadə oluna bilmir; ya " "duallıq, ya da yanlışlıq var." +msgid "Clear" +msgstr "Təmizlə" + msgid "Currently" msgstr "Hal-hazırda" msgid "Change" msgstr "Dəyiş" -msgid "Clear" -msgstr "Təmizlə" - msgid "Unknown" msgstr "Məlum deyil" @@ -1101,8 +1116,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "İlk Django ilə işləyən səhifəniz münasibəti ilə təbrik edirik." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/be/LC_MESSAGES/django.mo b/django/conf/locale/be/LC_MESSAGES/django.mo index 4375d4b44081..44359137755d 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 7d984e5e0b83..e4b0d3851f04 100644 --- a/django/conf/locale/be/LC_MESSAGES/django.po +++ b/django/conf/locale/be/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # Viktar Palstsiuk , 2014-2015 -# znotdead , 2016 +# znotdead , 2016-2017 # Дмитрий Шатера , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-15 07:39+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-15 07:12+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -297,6 +297,15 @@ msgstr "Cтатычныя файлы" 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 "Пазначце правільнае значэньне." @@ -412,6 +421,14 @@ msgstr[1] "Упэўніцеся, што набралі ня болей за %(ma msgstr[2] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў да коскі." msgstr[3] "Упэўніцеся, што набралі ня болей за %(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 "and" msgstr "і" @@ -771,15 +788,15 @@ msgstr "" "У часавым абсягу «%(current_timezone)s» нельга зразумець дату %(datetime)s: " "яна можа быць неадназначнаю або яе можа не існаваць." +msgid "Clear" +msgstr "Ачысьціць" + msgid "Currently" msgstr "Зараз" msgid "Change" msgstr "Зьмяніць" -msgid "Clear" -msgstr "Ачысьціць" - msgid "Unknown" msgstr "Невядома" @@ -1169,11 +1186,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Віншуем Вас з першай старонкай на базе Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Канешне вы не зрабілі яшчэ ніякай работы. Далей, пачніце вашу першую " -"праграму выканаўшы python manage.py startapp [app_label]." +"Затым пачніце сваю першую праграму, выканаўшы python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo index 0e2606d586fe..108968c0f90a 100644 Binary files a/django/conf/locale/bg/LC_MESSAGES/django.mo and b/django/conf/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bg/LC_MESSAGES/django.po b/django/conf/locale/bg/LC_MESSAGES/django.po index a0fcca0614f9..d747e1ca09d0 100644 --- a/django/conf/locale/bg/LC_MESSAGES/django.po +++ b/django/conf/locale/bg/LC_MESSAGES/django.po @@ -5,15 +5,15 @@ # Jannis Leidel , 2011 # Lyuboslav Petrov , 2014 # Todor Lubenov , 2013-2015 -# Venelin Stoykov , 2015-2016 +# Venelin Stoykov , 2015-2017 # vestimir , 2014 # Alexander Atanasov , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 17:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-25 23:04+0000\n" "Last-Translator: Venelin Stoykov \n" "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/" "bg/)\n" @@ -299,6 +299,15 @@ msgstr "Статични файлове" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Въведете валидна стойност. " @@ -355,10 +364,10 @@ msgid_plural "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" -"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има " +"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има " "%(show_value)d )." msgstr[1] "" -"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има " +"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има " "%(show_value)d)." #, python-format @@ -372,7 +381,7 @@ msgstr[0] "" "Уверете се, тази стойност има най-много %(limit_value)d знака (тя има " "%(show_value)d)." msgstr[1] "" -"Уверете се, тази стойност има най-много %(limit_value)d знака (тя има " +"Уверете се, че тази стойност има най-много %(limit_value)d знака (тя има " "%(show_value)d)." #, python-format @@ -399,6 +408,14 @@ msgstr[0] "" msgstr[1] "" "Уверете се, че има не повече от %(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 "and" msgstr "и" @@ -654,7 +671,8 @@ 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)." +"Уверете се, че това файлово име има най-много %(max)d знаци (има " +"%(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" @@ -748,15 +766,15 @@ msgstr "" "%(datetime)s не може да бъде разчетено в %(current_timezone)s; може да е " "двусмислен или да не съществува" +msgid "Clear" +msgstr "Изчисти" + msgid "Currently" msgstr "Сега" msgid "Change" msgstr "Промени" -msgid "Clear" -msgstr "Изчисти" - msgid "Unknown" msgstr "Неизвестно" @@ -1133,8 +1151,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "Поздравления за първата си Django страница." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 7ca743d03163..af672012f13f 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 5f8213b7eaa3..4d8bb9669b0b 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Bengali (http://www.transifex.com/django/django/language/" "bn/)\n" @@ -296,6 +296,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "একটি বৈধ মান দিন।" @@ -383,6 +392,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "এবং" @@ -708,15 +723,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "পরিষ্কার করুন" + msgid "Currently" msgstr "এই মুহুর্তে" msgid "Change" msgstr "পরিবর্তন" -msgid "Clear" -msgstr "পরিষ্কার করুন" - msgid "Unknown" msgstr "অজানা" @@ -1080,8 +1095,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/bn/formats.py b/django/conf/locale/bn/formats.py index 2348c3afa356..31a661a6a74c 100644 --- a/django/conf/locale/bn/formats.py +++ b/django/conf/locale/bn/formats.py @@ -12,13 +12,24 @@ MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M, Y' # SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +FIRST_DAY_OF_WEEK = 6 # Saturday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +DATE_INPUT_FORMATS = [ + '%d/%m/%Y', # 25/10/2016 + '%d/%m/%y', # 25/10/16 + '%d-%m-%Y', # 25-10-2016 + '%d-%m-%y', # 25-10-16 +] +TIME_INPUT_FORMATS = [ + '%H:%M:%S', # 14:30:59 + '%H:%M', # 14:30 +] +DATETIME_INPUT_FORMATS = [ + '%d/%m/%Y %H:%M:%S', # 25/10/2006 14:30:59 + '%d/%m/%Y %H:%M', # 25/10/2006 14:30 +] DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' # NUMBER_GROUPING = diff --git a/django/conf/locale/bs/LC_MESSAGES/django.mo b/django/conf/locale/bs/LC_MESSAGES/django.mo index 6851d6fcb8d5..4a369041ea91 100644 Binary files a/django/conf/locale/bs/LC_MESSAGES/django.mo and b/django/conf/locale/bs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bs/LC_MESSAGES/django.po b/django/conf/locale/bs/LC_MESSAGES/django.po index ce663c72d838..4722d53197c5 100644 --- a/django/conf/locale/bs/LC_MESSAGES/django.po +++ b/django/conf/locale/bs/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Bosnian (http://www.transifex.com/django/django/language/" "bs/)\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Unesite ispravnu vrijednost." @@ -389,6 +398,12 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "i" @@ -721,15 +736,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "Očisti" + msgid "Currently" msgstr "Trenutno" msgid "Change" msgstr "Izmjeni" -msgid "Clear" -msgstr "Očisti" - msgid "Unknown" msgstr "Nepoznato" @@ -1100,8 +1115,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo index 8eb40deed3e7..141b2d3159dd 100644 Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po index 197fa291547e..2c3d22b646c3 100644 --- a/django/conf/locale/ca/LC_MESSAGES/django.po +++ b/django/conf/locale/ca/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Antoni Aloy , 2012,2015-2016 +# Antoni Aloy , 2012,2015-2017 # Carles Barrobés , 2011-2012,2014 # duub qnnp, 2015 # Jannis Leidel , 2011 @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:18+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgid "German" msgstr "alemany" msgid "Lower Sorbian" -msgstr "" +msgstr "Lower Sorbian" msgid "Greek" msgstr "grec" @@ -137,7 +137,7 @@ msgid "Croatian" msgstr "croat" msgid "Upper Sorbian" -msgstr "" +msgstr "Upper Sorbian" msgid "Hungarian" msgstr "hongarès" @@ -200,7 +200,7 @@ msgid "Burmese" msgstr "Burmès" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Norwegian Bokmål" msgid "Nepali" msgstr "Nepalí" @@ -298,6 +298,15 @@ msgstr "Arxius estàtics" msgid "Syndication" msgstr "Sindicació" +msgid "That page number is not an integer" +msgstr "Aquesta plana no és un sencer" + +msgid "That page number is less than 1" +msgstr "El nombre de plana és inferior a 1" + +msgid "That page contains no results" +msgstr "La plana no conté cap resultat" + msgid "Enter a valid value." msgstr "Introduïu un valor vàlid." @@ -399,6 +408,14 @@ msgstr[0] "" msgstr[1] "" "Assegureu-vos que no hi ha 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 es permesa. Les extensions permeses " +"són: '%(allowed_extensions)s'." + msgid "and" msgstr "i" @@ -601,11 +618,11 @@ msgstr "Inter-relació un-a-un" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "relació %(from)s-%(to)s " #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "relacions %(from)s-%(to)s " msgid "Many-to-many relationship" msgstr "Inter-relació molts-a-molts" @@ -754,15 +771,15 @@ msgstr "" "No s'ha pogut interpretar %(datetime)s a la zona horària " "%(current_timezone)s; potser és ambigua o no existeix." +msgid "Clear" +msgstr "Netejar" + msgid "Currently" msgstr "Actualment" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Netejar" - msgid "Unknown" msgstr "Desconegut" @@ -1140,12 +1157,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Enhorabona per la teva primera plana amb Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Per suposat, encara no has fet cap feina real encara. Seguidament crea la " -"teva primera aplicació executant python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Seguidament, inicii la seva primera aplicación executant python manage." +"py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 46873b38e84f..79e9f910bc2e 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 52acaf7d15a7..8dc592891a43 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -6,13 +6,13 @@ # Jirka Vejrazka , 2011 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2012-2014 -# Vláďa Macek , 2015-2016 +# Vláďa Macek , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-16 22:28+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-21 09:47+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" @@ -297,6 +297,15 @@ msgstr "Statické soubory" msgid "Syndication" msgstr "Syndikace" +msgid "That page number is not an integer" +msgstr "Číslo stránky není celé číslo." + +msgid "That page number is less than 1" +msgstr "Číslo stránky je menší než 1" + +msgid "That page contains no results" +msgstr "Stránka je bez výsledků" + msgid "Enter a valid value." msgstr "Zadejte platnou hodnotu." @@ -403,6 +412,14 @@ msgstr[2] "" "Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou " "čárkou (tečkou)." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Přípona souboru '%(extension)s' není povolena. Povolené jsou tyto: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "a" @@ -755,15 +772,15 @@ msgstr "" "Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; " "může to být nejednoznačné nebo nemusí existovat." +msgid "Clear" +msgstr "Zrušit" + msgid "Currently" msgstr "Aktuálně" msgid "Change" msgstr "Změnit" -msgid "Clear" -msgstr "Zrušit" - msgid "Unknown" msgstr "Neznámé" @@ -1146,12 +1163,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Gratulujeme, toto je vaše první stránka generována v prostředí Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Samozřejmě máte před sebou ještě spoustu práce. Začněte vytvořením Vaší " -"první aplikace pomocí příkazu python manage.py startapp [app_label]. " +"Nyní můžete začít práce na své první aplikaci spuštěním příkazu python " +"manage.py startapp [identifikátor_aplikace]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index e4e6be2c4a45..9fdf92d36884 100644 Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index 26949a4ba422..b9625d2a0e65 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Welsh (http://www.transifex.com/django/django/language/cy/)\n" "MIME-Version: 1.0\n" @@ -294,6 +294,15 @@ msgstr "Ffeiliau Statig" msgid "Syndication" msgstr "Syndicetiad" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Rhowch werth dilys." @@ -408,6 +417,12 @@ msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid cyn y pwynt degol." msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol." msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "a" @@ -765,15 +780,15 @@ msgstr "" "Ni ellir dehongli %(datetime)s yn y gylchfa amser %(current_timezone)s; " "mae'n amwys neu ddim yn bodoli." +msgid "Clear" +msgstr "Clirio" + msgid "Currently" msgstr "Ar hyn o bryd" msgid "Change" msgstr "Newid" -msgid "Clear" -msgstr "Clirio" - msgid "Unknown" msgstr "Anhysbys" @@ -1162,8 +1177,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index c43539b2f583..f887cfe7cfab 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 6c5af92e33bb..500a3ee56fba 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Christian Joergensen , 2012 # Danni Randeris , 2014 -# Erik Wognsen , 2013-2016 +# Erik Wognsen , 2013-2017 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 # jonaskoelker , 2012 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 19:27+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 22:58+0000\n" "Last-Translator: Erik Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" @@ -299,6 +299,15 @@ msgstr "Static Files" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "Det sidetal er ikke et heltal" + +msgid "That page number is less than 1" +msgstr "Det sidetal er mindre end 1" + +msgid "That page contains no results" +msgstr "Den side indeholder ingen resultater" + msgid "Enter a valid value." msgstr "Indtast en gyldig værdi." @@ -392,6 +401,14 @@ msgid_plural "" msgstr[0] "Der må maksimalt være %(max)s ciffer før kommaet." msgstr[1] "Der må maksimalt være %(max)s cifre før kommaet." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Filendelse '%(extension)s' er ikke tilladt. Tilladte filendelser er: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "og" @@ -742,15 +759,15 @@ msgstr "" "%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan " "være tvetydig eller den eksisterer måske ikke." +msgid "Clear" +msgstr "Afmarkér" + msgid "Currently" msgstr "Aktuelt" msgid "Change" msgstr "Ret" -msgid "Clear" -msgstr "Afmarkér" - msgid "Unknown" msgstr "Ukendt" @@ -1126,11 +1143,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Tillykke med din første Django-drevne side." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Du har dog ikke gjort noget endnu. Start din første app ved at køre " -"python manage.py startapp [app_label]." +"Start derefter din første app ved at køre python manage.py startapp " +"[app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index dcd2e800679d..18d75632184a 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 63eddf105773..74f7f42a531f 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -4,17 +4,17 @@ # André Hagenbruch, 2011-2012 # Florian Apolloner , 2011 # Dunedan , 2016 -# Jannis Vajen, 2011,2013 -# Jannis Leidel , 2013-2016 -# Jannis Vajen, 2016 +# Jannis, 2011,2013 +# Jannis Leidel , 2013-2017 +# Jannis, 2016 # Markus Holtermann , 2013,2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-26 11:37+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 10:43+0000\n" +"Last-Translator: Markus Holtermann \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" @@ -206,7 +206,7 @@ msgid "Nepali" msgstr "Nepali" msgid "Dutch" -msgstr "Holländisch" +msgstr "Niederländisch" msgid "Norwegian Nynorsk" msgstr "Norwegisch (Nynorsk)" @@ -298,6 +298,15 @@ msgstr "Statische Dateien" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "Diese Seitennummer ist keine Ganzzahl" + +msgid "That page number is less than 1" +msgstr "Diese Seitennummer ist kleiner als 1" + +msgid "That page contains no results" +msgstr "Diese Seite enthält keine Ergebnisse" + msgid "Enter a valid value." msgstr "Bitte einen gültigen Wert eingeben." @@ -405,6 +414,14 @@ msgstr[1] "" "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern vor dem Komma " "enthält." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Dateiendung „%(extension)s“ ist nicht erlaubt. Erlaubte Dateiendungen: sind: " +"„%(allowed_extensions)s“." + msgid "and" msgstr "und" @@ -443,14 +460,14 @@ msgstr "Ganzzahl" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "‚%(value)s‛ Wert muss eine Ganzzahl sein." +msgstr "„%(value)s“ Wert muss eine Ganzzahl sein." msgid "Big (8 byte) integer" msgstr "Große Ganzzahl (8 Byte)" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "‚%(value)s‛ Wert muss entweder True oder False sein." +msgstr "„%(value)s“ Wert muss entweder True oder False sein." msgid "Boolean (Either True or False)" msgstr "Boolescher Wert (True oder False)" @@ -467,7 +484,7 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -"‚%(value)s‛ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD " +"„%(value)s“ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD " "entsprechen." #, python-format @@ -475,7 +492,7 @@ msgid "" "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" -"‚%(value)s‛ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum." +"„%(value)s“ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum." msgid "Date (without time)" msgstr "Datum (ohne Uhrzeit)" @@ -485,7 +502,7 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[." +"„%(value)s“ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] entsprechen." #, python-format @@ -493,7 +510,7 @@ 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‛ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"„%(value)s“ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) aber eine ungültige Zeit-/Datumsangabe." msgid "Date (with time)" @@ -501,7 +518,7 @@ msgstr "Datum (mit Uhrzeit)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "‚%(value)s‛ Wert muss eine Dezimalzahl sein." +msgstr "„%(value)s“ Wert muss eine Dezimalzahl sein." msgid "Decimal number" msgstr "Dezimalzahl" @@ -511,7 +528,7 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" -"'%(value)s' Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:" +"„%(value)s“ Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:" "[MM:]]ss[.uuuuuu] entsprechen." msgid "Duration" @@ -525,7 +542,7 @@ msgstr "Dateipfad" #, python-format msgid "'%(value)s' value must be a float." -msgstr "‚%(value)s‛ Wert muss eine Fließkommazahl sein." +msgstr "„%(value)s“ Wert muss eine Fließkommazahl sein." msgid "Floating point number" msgstr "Gleitkommazahl" @@ -538,7 +555,7 @@ msgstr "IP-Adresse" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "‚%(value)s‛ Wert muss entweder None, True oder False sein." +msgstr "„%(value)s“ Wert muss entweder None, True oder False sein." msgid "Boolean (Either True, False or None)" msgstr "Boolescher Wert (True, False oder None)" @@ -564,7 +581,7 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] " +"„%(value)s“ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] " "entsprechen." #, python-format @@ -572,7 +589,7 @@ msgid "" "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" -"‚%(value)s‛ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine " +"„%(value)s“ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine " "ungültige Zeitangabe." msgid "Time" @@ -586,7 +603,7 @@ msgstr "Binärdaten" #, python-format msgid "'%(value)s' is not a valid UUID." -msgstr "Wert '%(value)s' ist keine gültige UUID." +msgstr "Wert „%(value)s“ ist keine gültige UUID." msgid "File" msgstr "Datei" @@ -748,7 +765,7 @@ msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl." #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "\"%(pk)s\" ist kein gültiger Wert für einen Primärschlüssel." +msgstr "„%(pk)s“ ist kein gültiger Wert für einen Primärschlüssel." #, python-format msgid "" @@ -758,15 +775,15 @@ msgstr "" "%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig " "interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist." +msgid "Clear" +msgstr "Zurücksetzen" + msgid "Currently" msgstr "Derzeit" msgid "Change" msgstr "Ändern" -msgid "Clear" -msgstr "Zurücksetzen" - msgid "Unknown" msgstr "Unbekannt" @@ -1144,12 +1161,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Herzlichen Glückwunsch zur ersten Django-basierten Seite." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Natürlich ist hier noch nichts weiter zu sehen. Bitte als Nächstes eine neue " -"Anwendung durch Ausführen von python manage.py startapp [app_label] anlegen." +"Bitte als Nächstes eine neue Anwendung durch Ausführen von python " +"manage.py startapp [app_label] anlegen." msgid "" "You're seeing this message because you have DEBUG = True in " @@ -1184,7 +1200,7 @@ msgstr "" #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'" +msgstr "Ungültiges Datum „%(datestr)s“ für das Format „%(format)s“" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1192,7 +1208,7 @@ msgstr "Konnte keine %(verbose_name)s mit diesen Parametern finden." msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -"Weder ist dies die letzte Seite ('last') noch konnte sie in einen " +"Weder ist dies die letzte Seite („last“) noch konnte sie in einen " "ganzzahligen Wert umgewandelt werden." #, python-format @@ -1201,14 +1217,14 @@ msgstr "Ungültige Seite (%(page_number)s): %(message)s" #, python-format msgid "Empty list and '%(class_name)s.allow_empty' is False." -msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False." +msgstr "Leere Liste und „%(class_name)s.allow_empty“ ist False." msgid "Directory indexes are not allowed here." msgstr "Dateilisten sind untersagt." #, python-format msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" ist nicht vorhanden" +msgstr "„%(path)s“ ist nicht vorhanden" #, python-format msgid "Index of %(directory)s" diff --git a/django/conf/locale/dsb/LC_MESSAGES/django.mo b/django/conf/locale/dsb/LC_MESSAGES/django.mo index e9654b5d1ebb..c03966912705 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 8ee6011dc9dc..49e1a6ef85e6 100644 --- a/django/conf/locale/dsb/LC_MESSAGES/django.po +++ b/django/conf/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-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-01 21:52+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:42+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -294,6 +294,15 @@ msgstr "Statiske dataje" msgid "Syndication" msgstr "Syndikacija" +msgid "That page number is not an integer" +msgstr "Toś ten numer boka njejo ceła licba" + +msgid "That page number is less than 1" +msgstr "Numer boka jo mjeńšy ako 1" + +msgid "That page contains no results" +msgstr "Toś ten bok njewopśimujo wuslědki" + msgid "Enter a valid value." msgstr "Zapódajśo płaśiwu gódnotu." @@ -411,6 +420,14 @@ msgstr[1] "Zawěsććo, až njejo wěcej ako %(max)s cyfrowu pśed decimalneju k msgstr[2] "Zawěsććo, až njejo wěcej ako %(max)s cyfrow pśed decimalneju komu." msgstr[3] "Zawěsććo, až njejo wěcej ako %(max)s cyfrow pśed decimalneju komu." +#, python-format +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 "and" msgstr "a" @@ -777,15 +794,15 @@ 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ś" + msgid "Currently" msgstr "Tuchylu" msgid "Change" msgstr "Změniś" -msgid "Clear" -msgstr "Lašowaś" - msgid "Unknown" msgstr "Njeznaty" @@ -1176,12 +1193,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Glukužycenje za waš prědny bok, kótaryž spěchujo se wót Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Zawěsće, pópšawem hyšći njejsćo žedno źěło gótował. Wuwjeźćo ako pśiduce " -"python manage.py startapp [app_label], aby swójo prědne " -"nałoženje startował." +"Wuwjeźćo ako pśiduce python manage.py startapp [app_label], aby " +"swójo prědne nałoženje startował." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo index bf587e00383e..f107494d3dd8 100644 Binary files a/django/conf/locale/el/LC_MESSAGES/django.mo and b/django/conf/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po index f3cda44e4f42..6d14f216c61d 100644 --- a/django/conf/locale/el/LC_MESSAGES/django.po +++ b/django/conf/locale/el/LC_MESSAGES/django.po @@ -5,6 +5,7 @@ # Dimitris Glezos , 2011,2013 # Giannis Meletakis , 2015 # Jannis Leidel , 2011 +# Nick Mavrakis , 2017 # Nikolas Demiridis , 2014 # Nick Mavrakis , 2016 # Pãnoș , 2014 @@ -16,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-14 16:48+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 10:58+0000\n" "Last-Translator: Nick Mavrakis \n" "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n" "MIME-Version: 1.0\n" @@ -302,6 +303,15 @@ msgstr "Στατικά Αρχεία" msgid "Syndication" msgstr "Syndication" +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 "Εισάγετε μια έγκυρη τιμή." @@ -364,8 +374,8 @@ msgstr[0] "" "Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες " "(έχει %(show_value)d)." msgstr[1] "" -"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες " -"(έχει %(show_value)d)." +"Βεβαιωθείτε πως η τιμή έχει τουλάχιστον %(limit_value)d χαρακτήρες (έχει " +"%(show_value)d)." #, python-format msgid "" @@ -378,8 +388,8 @@ msgstr[0] "" "Βεβαιωθείται πως η τιμή αυτή έχει τοπολύ %(limit_value)d χαρακτήρες (έχει " "%(show_value)d)." msgstr[1] "" -"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες " -"(έχει %(show_value)d)." +"Βεβαιωθείτε πως η τιμή έχει το πολύ %(limit_value)d χαρακτήρες (έχει " +"%(show_value)d)." #, python-format msgid "Ensure that there are no more than %(max)s digit in total." @@ -405,6 +415,14 @@ msgstr[0] "" msgstr[1] "" "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %(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 "and" msgstr "και" @@ -766,15 +784,15 @@ msgstr "" "Η ημερομηνία %(datetime)s δεν μπόρεσε να μετατραπεί στην ζώνη ώρας " "%(current_timezone)s; ίσως να είναι ασαφής ή να μην υπάρχει." +msgid "Clear" +msgstr "Εκκαθάριση" + msgid "Currently" msgstr "Τώρα" msgid "Change" msgstr "Επεξεργασία" -msgid "Clear" -msgstr "Εκκαθάριση" - msgid "Unknown" msgstr "Άγνωστο" @@ -1151,11 +1169,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Συγχαρητήρια στην πρώτη Django-τροφοδοτούμενη σελίδα σας." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Φυσίκα, δεν έχετε κάνει καμία δουλειά ακόμα. Ξεκινήστε την πρώτη σας " -"εφαρμογή εκτελώντας python manage.py startapp [app_label]." +"Επόμενο βήμα, είναι να ξεκινήσετε την πρώτη σας εφαρμογή εκτελώντας την " +"εντολή python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 01fa3b1534b5..a1709b8de4c7 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/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: 2016-06-29 20:57+0200\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -381,7 +381,19 @@ msgstr "" msgid "Syndication" msgstr "" -#: core/validators.py:33 +#: core/paginator.py:43 +msgid "That page number is not an integer" +msgstr "" + +#: core/paginator.py:45 +msgid "That page number is less than 1" +msgstr "" + +#: core/paginator.py:50 +msgid "That page contains no results" +msgstr "" + +#: core/validators.py:34 msgid "Enter a valid value." msgstr "" @@ -484,7 +496,14 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: db/models/base.py:1095 forms/models.py:727 +#: core/validators.py:464 +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + +#: db/models/base.py:1205 forms/models.py:732 msgid "and" msgstr "" @@ -890,16 +909,16 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" -#: forms/widgets.py:353 -msgid "Currently" +#: forms/widgets.py:378 +msgid "Clear" msgstr "" -#: forms/widgets.py:354 -msgid "Change" +#: forms/widgets.py:379 +msgid "Currently" msgstr "" -#: forms/widgets.py:355 -msgid "Clear" +#: forms/widgets.py:380 +msgid "Change" msgstr "" #: forms/widgets.py:570 @@ -1365,8 +1384,8 @@ msgstr "" #: views/debug.py:511 msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" #: views/debug.py:513 diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.mo b/django/conf/locale/en_GB/LC_MESSAGES/django.mo index 951a882f3d84..0cab8d79ca4d 100644 Binary files a/django/conf/locale/en_GB/LC_MESSAGES/django.mo and b/django/conf/locale/en_GB/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.po b/django/conf/locale/en_GB/LC_MESSAGES/django.po index 1ca44df693bd..287547df64d6 100644 --- a/django/conf/locale/en_GB/LC_MESSAGES/django.po +++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/django/" "django/language/en_GB/)\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Enter a valid value." @@ -381,6 +390,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "and" @@ -710,15 +725,15 @@ msgstr "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." +msgid "Clear" +msgstr "Clear" + msgid "Currently" msgstr "Currently" msgid "Change" msgstr "Change" -msgid "Clear" -msgstr "Clear" - msgid "Unknown" msgstr "Unknown" @@ -1082,8 +1097,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/eo/LC_MESSAGES/django.mo b/django/conf/locale/eo/LC_MESSAGES/django.mo index 423989015afb..e9276e6eda8b 100644 Binary files a/django/conf/locale/eo/LC_MESSAGES/django.mo and b/django/conf/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/eo/LC_MESSAGES/django.po b/django/conf/locale/eo/LC_MESSAGES/django.po index 1d76cd1fab7f..972cac8d1362 100644 --- a/django/conf/locale/eo/LC_MESSAGES/django.po +++ b/django/conf/locale/eo/LC_MESSAGES/django.po @@ -2,17 +2,18 @@ # # Translators: # Baptiste Darthenay , 2012-2013 -# Baptiste Darthenay , 2013-2016 +# Baptiste Darthenay , 2013-2017 # batisteo , 2011 # Dinu Gherman , 2011 # kristjan , 2011 +# Nikolay Korotkiy , 2017 # Adamo Mesha , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-29 18:22+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 00:08+0000\n" "Last-Translator: Baptiste Darthenay \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" @@ -298,6 +299,15 @@ msgstr "Statikaj dosieroj" msgid "Syndication" msgstr "Abonrilato" +msgid "That page number is not an integer" +msgstr "Tuo paĝnumero ne estas entjero" + +msgid "That page number is less than 1" +msgstr "Tuo paĝnumero estas malpli ol 1" + +msgid "That page contains no results" +msgstr "Tiu paĝo ne enhavas rezultojn" + msgid "Enter a valid value." msgstr "Enigu validan valoron." @@ -395,6 +405,14 @@ msgid_plural "" msgstr[0] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto." msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"dosiersufikso '%(extension)s' ne estas permesita. Permesitaj dosiersufiksoj " +"estas: '%(allowed_extensions)s'." + msgid "and" msgstr "kaj" @@ -746,15 +764,15 @@ msgstr "" "%(datetime)s ne povus esti interpretita en horzono %(current_timezone)s; ĝi " "povas esti plursenca aŭ ne ekzistas." +msgid "Clear" +msgstr "Vakigi" + msgid "Currently" msgstr "Nuntempe" msgid "Change" msgstr "Ŝanĝi" -msgid "Clear" -msgstr "Vakigi" - msgid "Unknown" msgstr "Nekonate" @@ -1130,12 +1148,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Gratulojn por via unua Dĵanga paĝo." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Kompreneble, vi ankoraŭ ne reale faris ajnan laboron. Poste, komencu vian " -"unuan aplikaĵon lanĉante python manage.py startapp [aplikaĵo_etikedo]." +"Poste, komencu vian unuan aplikaĵon rulante python manage.py startapp " +"[app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 9511eb3c46c8..5b120ec0c53d 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 34d27f9aaadd..05408f030438 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -1,9 +1,10 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Abraham Estrada , 2013 +# Abraham Estrada, 2013 # albertoalcolea , 2014 -# Antoni Aloy , 2011-2014 +# Amanda Copete, 2017 +# Antoni Aloy , 2011-2014,2017 # Diego Andres Sanabria Martin , 2012 # Diego Schulz , 2012 # Ernesto Avilés Vázquez , 2015-2016 @@ -25,9 +26,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-08-03 15:35+0000\n" -"Last-Translator: Ernesto Avilés Vázquez \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 14:20+0000\n" +"Last-Translator: Amanda Copete\n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -37,7 +38,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Afrikaans" -msgstr "Afrikaans" +msgstr "Africano" msgid "Arabic" msgstr "Árabe" @@ -312,8 +313,17 @@ msgstr "Archivos estáticos" msgid "Syndication" msgstr "Sindicación" +msgid "That page number is not an integer" +msgstr "Este número de página no es un entero" + +msgid "That page number is less than 1" +msgstr "Este número de página es menor que 1" + +msgid "That page contains no results" +msgstr "Esa página no contiene resultados" + msgid "Enter a valid value." -msgstr "Introduzca un valor correcto." +msgstr "Introduzca un valor válido." msgid "Enter a valid URL." msgstr "Introduzca una URL válida." @@ -334,8 +344,7 @@ msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -"Ingrese un 'slug' consistente en letras, números, subrayados o guiones " -"Unicodes." +"Introduzca un 'slug' consistente en letras, números, subrayados o guiones." msgid "Enter a valid IPv4 address." msgstr "Introduzca una dirección IPv4 válida." @@ -413,6 +422,14 @@ msgstr[0] "" msgstr[1] "" "Asegúrese de que no haya más de %(max)s dígitos antes del punto decimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"La extensión de fichero '%(extension)s' no está permitida. Únicamente se " +"permiten: '%(allowed_extensions)s'." + msgid "and" msgstr "y" @@ -608,7 +625,7 @@ 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." msgid "Foreign Key (type determined by related field)" -msgstr "Llave foránea (tipo determinado por el campo relacionado)" +msgstr "Clave foránea (tipo determinado por el campo relacionado)" msgid "One-to-one relationship" msgstr "Relación uno-a-uno" @@ -704,7 +721,7 @@ msgstr ":" #, python-format msgid "(Hidden field %(name)s) %(error)s" -msgstr "(Compo oculto %(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" @@ -712,14 +729,14 @@ msgstr "Los datos de ManagementForm faltan o han sido manipulados" #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Por favor, envíe %d o menos formas." -msgstr[1] "Por favor, envíe %d o menos formas." +msgstr[0] "Por favor, envíe %d formulario o menos." +msgstr[1] "Por favor, envíe %d formularios o menos" #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." -msgstr[0] "Por favor, envíe %d o más formas." -msgstr[1] "Por favor, envíe %d o más formas." +msgstr[0] "Por favor, envíe %d formulario o más." +msgstr[1] "Por favor, envíe %d formularios o más." msgid "Order" msgstr "Orden" @@ -767,15 +784,15 @@ msgstr "" "%(datetime)s no puede interpretarse en la zona temporal " "%(current_timezone)s; puede ser ambiguo o puede no existir." +msgid "Clear" +msgstr "Limpiar" + msgid "Currently" msgstr "Actualmente" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Limpiar" - msgid "Unknown" msgstr "Desconocido" @@ -920,7 +937,7 @@ msgid "mar" msgstr "mar" msgid "apr" -msgstr "apr" +msgstr "abr" msgid "may" msgstr "may" @@ -1151,12 +1168,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Enhorabuena por tu primer página hecha en Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu " -"primera aplicación ejecutando python manage.py startapp [app_label]." +"Seguidamente, inicie su primera aplicación ejecutando python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index 14eaa0fb399f..306a77c41059 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 fa10c5072b52..284a097fe806 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-2016 +# Ramiro Morales, 2013-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-30 23:44+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-23 14:26+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -296,6 +296,15 @@ msgstr "Archivos estáticos" msgid "Syndication" msgstr "Sindicación" +msgid "That page number is not an integer" +msgstr "El número de página no es un entero" + +msgid "That page number is less than 1" +msgstr "El número de página es menor a 1" + +msgid "That page contains no results" +msgstr "Esa página no contiene resultados" + msgid "Enter a valid value." msgstr "Introduzca un valor válido." @@ -397,6 +406,14 @@ msgstr[0] "" msgstr[1] "" "Asegúrese de que no existan mas de %(max)s dígitos antes del punto decimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"La extensión de archivo '%(extension)s' no está permitida. Las extensiones " +"aceptadas son: '%(allowed_extensions)s'." + msgid "and" msgstr "y" @@ -755,15 +772,15 @@ msgstr "" "%(datetime)s no puede ser interpretado en la zona horaria " "%(current_timezone)s; ya que podría ser ambiguo o podría no existir." +msgid "Clear" +msgstr "Eliminar" + msgid "Currently" msgstr "Actualmente" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Eliminar" - msgid "Unknown" msgstr "Desconocido" @@ -1142,11 +1159,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Felicitationes por tu primera página Django-powered." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Obviamente en realidad todavia no has hecho nada. Ahora crea tu primera " -"aplicación ejecutando python manage.py startapp [app_label]." +"A continuación cree su primera aplicación ejecutando python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/es_VE/LC_MESSAGES/django.mo b/django/conf/locale/es_VE/LC_MESSAGES/django.mo index 36493b10ec51..66bfdbc699aa 100644 Binary files a/django/conf/locale/es_VE/LC_MESSAGES/django.mo and b/django/conf/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_VE/LC_MESSAGES/django.po b/django/conf/locale/es_VE/LC_MESSAGES/django.po index 17bcf513150c..bcfa01c2b710 100644 --- a/django/conf/locale/es_VE/LC_MESSAGES/django.po +++ b/django/conf/locale/es_VE/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 # Leonardo J. Caballero G. , 2016 # Sebastián Ramírez Magrí , 2011 +# Yoel Acevedo, 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 12:14+0000\n" +"Last-Translator: Eduardo \n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -61,7 +63,7 @@ msgid "German" msgstr "Alemán" msgid "Lower Sorbian" -msgstr "" +msgstr "Sorbio Inferior" msgid "Greek" msgstr "Griego" @@ -133,7 +135,7 @@ msgid "Croatian" msgstr "Croata" msgid "Upper Sorbian" -msgstr "" +msgstr "Sorbio Superior" msgid "Hungarian" msgstr "Húngaro" @@ -196,7 +198,7 @@ msgid "Burmese" msgstr "Birmano" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Noruego" msgid "Nepali" msgstr "Nepalí" @@ -294,6 +296,15 @@ msgstr "Archivos estáticos" msgid "Syndication" msgstr "Sindicación" +msgid "That page number is not an integer" +msgstr "Ese número de página no es un número entero" + +msgid "That page number is less than 1" +msgstr "Ese número de página es menor que 1" + +msgid "That page contains no results" +msgstr "Esa página no contiene resultados" + msgid "Enter a valid value." msgstr "Introduzca un valor válido." @@ -393,6 +404,14 @@ msgstr[0] "" msgstr[1] "" "Asegúrese de que no hayan más de %(max)s dígitos antes del punto decimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"La extensión de archivo '%(extension)s' no está permitida. Las extensiones " +"permitidas son ' %(allowed_extensions)s'." + msgid "and" msgstr "y" @@ -595,11 +614,11 @@ msgstr "Relación uno a uno" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "Relación %(from)s - %(to)s " #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "Relaciones %(from)s - %(to)s" msgid "Many-to-many relationship" msgstr "Relación muchos a muchos" @@ -746,15 +765,15 @@ msgstr "" "%(datetime)s no puede interpretarse en la zona horaria %(current_timezone)s; " "puede ser ambiguo o puede no existir." +msgid "Clear" +msgstr "Limpiar" + msgid "Currently" msgstr "Actualmente" msgid "Change" msgstr "Cambiar" -msgid "Clear" -msgstr "Limpiar" - msgid "Unknown" msgstr "Desconocido" @@ -1130,12 +1149,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Felicitaciones por su primera página con Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu " -"primera aplicación ejecutando python manage.py startapp [app_label]." +"Luego, inicia tu primera app corriendo python manage.py startapp " +"[app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo index 0a9889729382..59d2252a3bbe 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 67fa0edcc974..c5200bbb234f 100644 --- a/django/conf/locale/et/LC_MESSAGES/django.po +++ b/django/conf/locale/et/LC_MESSAGES/django.po @@ -6,15 +6,15 @@ # Janno Liivak , 2013-2015 # madisvain , 2011 # Martin Pajuste , 2014-2015 -# Martin Pajuste , 2016 +# Martin Pajuste , 2016-2017 # Marti Raudsepp , 2014,2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-18 21:42+0000\n" -"Last-Translator: Marti Raudsepp \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 19:46+0000\n" +"Last-Translator: Martin Pajuste \n" "Language-Team: Estonian (http://www.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -299,6 +299,15 @@ msgstr "Staatilised failid" msgid "Syndication" msgstr "Sündikeerimine" +msgid "That page number is not an integer" +msgstr "See lehe number ei ole täisarv" + +msgid "That page number is less than 1" +msgstr "See lehe number on väiksem kui 1" + +msgid "That page contains no results" +msgstr "See leht ei sisalda tulemusi" + msgid "Enter a valid value." msgstr "Sisestage korrektne väärtus." @@ -397,6 +406,14 @@ msgstr[0] "" msgstr[1] "" "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %(max)s." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Faililaiend '%(extension)s' ei ole lubatud. Lubatud laiendid on: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "ja" @@ -745,15 +762,15 @@ msgstr "" "%(datetime)s ei saanud tõlgendada ajavööndis %(current_timezone)s; see on " "kas puudu või mitmetähenduslik." +msgid "Clear" +msgstr "Tühjenda" + msgid "Currently" msgstr "Hetkel" msgid "Change" msgstr "Muuda" -msgid "Clear" -msgstr "Tühjenda" - msgid "Unknown" msgstr "Tundmatu" @@ -1129,11 +1146,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Õnnitleme Teie esimese Django-põhise lehe puhul." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Muidugi ei ole sa veel midagi tegelikult teinud. Järgmiseks käivita oma " -"rakendus käsuga python manage.py startapp [app_label]." +"Järgmiseks käivita oma rakendus käsuga python manage.py startapp " +"[app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo index 76718a01cb99..9d3b32d1ebc2 100644 Binary files a/django/conf/locale/eu/LC_MESSAGES/django.mo and b/django/conf/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/eu/LC_MESSAGES/django.po b/django/conf/locale/eu/LC_MESSAGES/django.po index bbf65ea26e56..ea44c15ca002 100644 --- a/django/conf/locale/eu/LC_MESSAGES/django.po +++ b/django/conf/locale/eu/LC_MESSAGES/django.po @@ -1,8 +1,9 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aitzol Naberan , 2013 +# Aitzol Naberan , 2013,2016 # Ander Martínez , 2013-2014 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 # jazpillaga , 2011 # julen , 2011-2012 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 15:06+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -30,16 +31,16 @@ msgid "Arabic" msgstr "Arabiera" msgid "Asturian" -msgstr "" +msgstr "Asturiera" msgid "Azerbaijani" -msgstr "Azerbaianera" +msgstr "Azerbaijanera" msgid "Bulgarian" msgstr "Bulgariera" msgid "Belarusian" -msgstr "Belarusiera" +msgstr "Bielorrusiera" msgid "Bengali" msgstr "Bengalera" @@ -57,16 +58,16 @@ msgid "Czech" msgstr "Txekiera" msgid "Welsh" -msgstr "Gales" +msgstr "Galesa" msgid "Danish" msgstr "Daniera" msgid "German" -msgstr "Alemaniera" +msgstr "Alemana" msgid "Lower Sorbian" -msgstr "" +msgstr "Behe-sorbiera" msgid "Greek" msgstr "Greziera" @@ -75,7 +76,7 @@ msgid "English" msgstr "Ingelesa" msgid "Australian English" -msgstr "" +msgstr "Australiar ingelesa" msgid "British English" msgstr "Ingelesa" @@ -84,22 +85,22 @@ msgid "Esperanto" msgstr "Esperantoa" msgid "Spanish" -msgstr "Espainola" +msgstr "Gaztelania" msgid "Argentinian Spanish" -msgstr "Espainola (Argentina)" +msgstr "Gaztelania (Argentina)" msgid "Colombian Spanish" -msgstr "" +msgstr "Gaztelania (Kolonbia)" msgid "Mexican Spanish" -msgstr "Espainola (Mexiko)" +msgstr "Gaztelania (Mexiko)" msgid "Nicaraguan Spanish" -msgstr "Espainola (Nikaragua)" +msgstr "Gaztelania (Nikaragua)" msgid "Venezuelan Spanish" -msgstr "Venezuelako gaztelera" +msgstr "Gaztelania (Venezuela)" msgid "Estonian" msgstr "Estoniera" @@ -120,10 +121,10 @@ msgid "Frisian" msgstr "Frisiera" msgid "Irish" -msgstr "Irlandako gaelera" +msgstr "Irlandako gaelikoa" msgid "Scottish Gaelic" -msgstr "" +msgstr "Eskoziako gaelikoa" msgid "Galician" msgstr "Galiziera" @@ -135,10 +136,10 @@ msgid "Hindi" msgstr "Hindi" msgid "Croatian" -msgstr "Kroaziarra" +msgstr "Kroaziera" msgid "Upper Sorbian" -msgstr "" +msgstr "Goi-sorbiera" msgid "Hungarian" msgstr "Hungariera" @@ -150,7 +151,7 @@ msgid "Indonesian" msgstr "Indonesiera" msgid "Ido" -msgstr "" +msgstr "Ido" msgid "Icelandic" msgstr "Islandiera" @@ -168,10 +169,10 @@ msgid "Kazakh" msgstr "Kazakhera" msgid "Khmer" -msgstr "Khemerera" +msgstr "Khmerera" msgid "Kannada" -msgstr "Kanadiera" +msgstr "Kannada" msgid "Korean" msgstr "Koreera" @@ -195,22 +196,22 @@ msgid "Mongolian" msgstr "Mongoliera" msgid "Marathi" -msgstr "" +msgstr "Marathera" msgid "Burmese" msgstr "Birmaniera" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Bokmåla (Norvegia)" msgid "Nepali" msgstr "Nepalera" msgid "Dutch" -msgstr "Holandera" +msgstr "Nederlandera" msgid "Norwegian Nynorsk" -msgstr "Nynorsk" +msgstr "Nynorsk (Norvegia)" msgid "Ossetic" msgstr "Osetiera" @@ -222,10 +223,10 @@ msgid "Polish" msgstr "Poloniera" msgid "Portuguese" -msgstr "Portugalera" +msgstr "Portugesa" msgid "Brazilian Portuguese" -msgstr "Portugalera (Brazil)" +msgstr "Portugesa (Brazil)" msgid "Romanian" msgstr "Errumaniera" @@ -258,7 +259,7 @@ msgid "Tamil" msgstr "Tamilera" msgid "Telugu" -msgstr "Telegu hizkuntza" +msgstr "Telugua" msgid "Thai" msgstr "Thailandiera" @@ -270,7 +271,7 @@ msgid "Tatar" msgstr "Tatarera" msgid "Udmurt" -msgstr "Udmurt" +msgstr "Udmurtera" msgid "Ukrainian" msgstr "Ukrainera" @@ -279,7 +280,7 @@ msgid "Urdu" msgstr "Urdua" msgid "Vietnamese" -msgstr "Vietnamamera" +msgstr "Vietnamera" msgid "Simplified Chinese" msgstr "Txinera (sinpletua)" @@ -288,28 +289,37 @@ msgid "Traditional Chinese" msgstr "Txinera (tradizionala)" msgid "Messages" -msgstr "" +msgstr "Mezuak" msgid "Site Maps" -msgstr "" +msgstr "Sitemap-ak" msgid "Static Files" msgstr "Fitxategi estatikoak" msgid "Syndication" -msgstr "" +msgstr "Sindikazioa" + +msgid "That page number is not an integer" +msgstr "Orrialde hori ez da zenbaki bat" + +msgid "That page number is less than 1" +msgstr "Orrialde zenbaki hori 1 baino txikiagoa da" + +msgid "That page contains no results" +msgstr "Orrialde horrek ez du emaitzarik" msgid "Enter a valid value." -msgstr "Idatzi balio zuzena." +msgstr "Idatzi baleko balio bat." msgid "Enter a valid URL." -msgstr "Idatzi baliozko URL bat." +msgstr "Idatzi baleko URL bat." msgid "Enter a valid integer." -msgstr "Idatzi baliozko osoko zenbakia." +msgstr "Idatzi baleko zenbaki bat." msgid "Enter a valid email address." -msgstr "Gehitu baleko email helbide bat" +msgstr "Idatzi baleko helbide elektroniko bat." msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." @@ -320,15 +330,17 @@ msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Idatzi Unicode hizki, zenbaki, azpimarra edo marratxoz osatutako baleko " +"'slug' bat." msgid "Enter a valid IPv4 address." -msgstr "Sartu IPv4 helbide zuzena." +msgstr "Idatzi baleko IPv4 sare-helbide bat." msgid "Enter a valid IPv6 address." -msgstr "Sartu IPv6 helbide zuzena" +msgstr "Idatzi baleko IPv6 sare-helbide bat." msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Sartu IPv4 edo IPv6 helbide zuzena." +msgstr "Idatzi baleko IPv4 edo IPv6 sare-helbide bat." msgid "Enter only digits separated by commas." msgstr "Idatzi komaz bereizitako digitoak soilik." @@ -336,8 +348,7 @@ msgstr "Idatzi komaz bereizitako digitoak soilik." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -"Ziurtatu balioak %(limit_value)s gutxienez karaktere dituela (orain " -"%(show_value)s dauzka)." +"Ziurtatu balio hau gutxienez %(limit_value)s dela (orain %(show_value)s da)." #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." @@ -395,22 +406,30 @@ msgid_plural "" msgstr[0] "Ziurtatu ez dagoela digitu %(max)s baino gehiago komaren aurretik." msgstr[1] "Ziurtatu ez dagoela %(max)s digitu baino gehiago komaren aurretik." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"'%(extension)s' fitxategi-luzapena ez da balekoa. Hauek dira onartutako " +"fitxategi-luzapenak: '%(allowed_extensions)s'." + msgid "and" msgstr "eta" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" +msgstr "%(field_labels)s hauek dauzkan %(model_name)s dagoeneko existitzen da." #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "%(value)r balioa ez da baliozko aukera." +msgstr "%(value)r balioa ez da baleko aukera bat." msgid "This field cannot be null." msgstr "Eremu hau ezin daiteke hutsa izan (null)." msgid "This field cannot be blank." -msgstr "Eremu hau ezin da hutsik egon." +msgstr "Eremu honek ezin du hutsik egon." #, python-format msgid "%(model_name)s with this %(field_label)s already exists." @@ -422,6 +441,7 @@ msgstr "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da." msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." #, python-format msgid "Field of type: %(field_type)s" @@ -432,21 +452,21 @@ msgstr "Zenbaki osoa" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "" +msgstr "'%(value)s' balioak integer bat izan behar du." msgid "Big (8 byte) integer" msgstr "Zenbaki osoa (handia 8 byte)" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "" +msgstr "'%(value)s' balioak True edo False izan behar du." msgid "Boolean (Either True or False)" -msgstr "Boolearra (egia ala gezurra)" +msgstr "Boolearra (True edo False)" #, python-format msgid "String (up to %(max_length)s)" -msgstr "Katea (%(max_length)s gehienez)" +msgstr "String-a (%(max_length)s gehienez)" msgid "Comma-separated integers" msgstr "Komaz bereiztutako zenbaki osoak" @@ -456,12 +476,16 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"'%(value)s' balioak ez dauka data formatu zuzena. Formatu zuzena UUUU-HH-EE " +"da." #, python-format msgid "" "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"'%(value)s' balioak formatu zuzena (UUUU-HH-EE) dauka, baina ez da data " +"zuzen bat." msgid "Date (without time)" msgstr "Data (ordurik gabe)" @@ -471,19 +495,24 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"'%(value)s' balioak ez dauka formatu zuzena. Formatu zuzena UUUU-HH-EE OO:" +"MM[:ss[.uuuuuu]][TZ] da." #, 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' balioak formatu zuzena dauka (UUUU-HH-EE OO:MM[:ss[.uuuuuu]]" +"[TZ]),\n" +"baina ez da data/ordu zuzena." msgid "Date (with time)" msgstr "Data (orduarekin)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "" +msgstr "'%(value)s' balioak zenbaki hamartarra izan behar du." msgid "Decimal number" msgstr "Zenbaki hamartarra" @@ -493,35 +522,37 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" +"'%(value)s' balioak ez dauka foramtu zuzena. [EE] [OO:[MM:]]ss[.uuuuuu] " +"formatuan egon behar da." msgid "Duration" -msgstr "" +msgstr "Iraupena" msgid "Email address" -msgstr "Eposta helbidea" +msgstr "Helbide elektronikoa" msgid "File path" msgstr "Fitxategiaren bidea" #, python-format msgid "'%(value)s' value must be a float." -msgstr "" +msgstr "'%(value)s' balioak float bat izan behar du." msgid "Floating point number" msgstr "Koma higikorreko zenbakia (float)" msgid "IPv4 address" -msgstr "IPv4 helbidea" +msgstr "IPv4 sare-helbidea" msgid "IP address" msgstr "IP helbidea" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "" +msgstr "'%(value)s' balioak True, False edo None izan behar du." msgid "Boolean (Either True, False or None)" -msgstr "Boolearra (egia, gezurra edo hutsa[None])" +msgstr "Boolearra (True, False edo None)" msgid "Positive integer" msgstr "Osoko positiboa" @@ -544,12 +575,17 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"'%(value)s' balioak ez dauka formatu zuzena. OO:MM[:ss[.uuuuuu]] formatuan " +"egon behar du." #, python-format msgid "" "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"'%(value)s' balioak formatu zuzena dauka (OO:MM[:ss[.uuuuuu]]) baina ez da " +"ordu \n" +"zuzena" msgid "Time" msgstr "Ordua" @@ -562,7 +598,7 @@ msgstr "Datu bitar gordinak" #, python-format msgid "'%(value)s' is not a valid UUID." -msgstr "" +msgstr "'%(value)s' ez da baleko UUID bat." msgid "File" msgstr "Fitxategia" @@ -573,6 +609,8 @@ msgstr "Irudia" #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" +"%(field)s %(value)r edukidun %(model)s modeloko instantziarik ez da " +"exiistitzen." msgid "Foreign Key (type determined by related field)" msgstr "1-N (mota erlazionatutako eremuaren arabera)" @@ -582,11 +620,11 @@ msgstr "Bat-bat erlazioa" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s erlazioa" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s erlazioak" msgid "Many-to-many relationship" msgstr "M:N erlazioa" @@ -607,19 +645,19 @@ msgid "Enter a number." msgstr "Idatzi zenbaki bat." msgid "Enter a valid date." -msgstr "Idatzi baliozko data bat." +msgstr "Idatzi baleko data bat." msgid "Enter a valid time." -msgstr "Idatzi baliozko ordu bat." +msgstr "Idatzi baleko ordu bat." msgid "Enter a valid date/time." -msgstr "Idatzi baliozko data/ordua." +msgstr "Idatzi baleko data/ordu bat." msgid "Enter a valid duration." -msgstr "" +msgstr "Idatzi baleko iraupen bat." msgid "No file was submitted. Check the encoding type on the form." -msgstr "Ez da fitxategirik bidali. Egiaztatu inprimakiaren kodeketa-mota." +msgstr "Ez da fitxategirik bidali. Egiaztatu formularioaren kodeketa-mota." msgid "No file was submitted." msgstr "Ez da fitxategirik bidali." @@ -645,21 +683,21 @@ msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Bidali baliozko irudia. Zuk bidalitako fitxategia ez da irudia edo akatsa " -"dauka." +"Igo baleko irudi bat. Zuk igotako fitxategia ez da irudi bat edo akatsen bat " +"du." #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "Hautatu baliozko aukera bat. %(value)s ez dago erabilgarri." +msgstr "Hautatu baleko aukera bat. %(value)s ez dago erabilgarri." msgid "Enter a list of values." msgstr "Idatzi balio-zerrenda bat." msgid "Enter a complete value." -msgstr "" +msgstr "Sartu balio osoa." msgid "Enter a valid UUID." -msgstr "" +msgstr "Idatzi baleko UUID bat." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -670,19 +708,19 @@ 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 "" +msgstr "ManagementForm daturik ez dago edo ez da balekoa." #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." -msgstr[0] "Bidali inprimaki %d ala gutxiago, mesedez." -msgstr[1] "Bidali %d inprimaki ala gutxiago, mesedez." +msgstr[0] "Bidali formulario %d edo gutxiago, mesedez." +msgstr[1] "Bidali %d formulario edo gutxiago, mesedez." #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Gehitu formulario %d edo gehiago" +msgstr[1] "Bidali %d formulario edo gehiago, mesedez." msgid "Order" msgstr "Ordena" @@ -727,15 +765,15 @@ msgstr "" "%(datetime)s ezin da interpretatu %(current_timezone)s ordu-eremuan;\n" "baliteke ez existitzea edo anbiguoa izatea" +msgid "Clear" +msgstr "Garbitu" + msgid "Currently" msgstr "Orain" msgid "Change" msgstr "Aldatu" -msgid "Clear" -msgstr "Garbitu" - msgid "Unknown" msgstr "Ezezaguna" @@ -793,82 +831,82 @@ msgid "noon" msgstr "eguerdia" msgid "Monday" -msgstr "Astelehena" +msgstr "astelehena" msgid "Tuesday" -msgstr "Asteartea" +msgstr "asteartea" msgid "Wednesday" -msgstr "Asteazkena" +msgstr "asteazkena" msgid "Thursday" -msgstr "Osteguna" +msgstr "osteguna" msgid "Friday" -msgstr "Ostirala" +msgstr "ostirala" msgid "Saturday" -msgstr "Larunbata" +msgstr "larunbata" msgid "Sunday" -msgstr "Igandea" +msgstr "igandea" msgid "Mon" -msgstr "Al" +msgstr "al" msgid "Tue" -msgstr "Ar" +msgstr "ar" msgid "Wed" -msgstr "Az" +msgstr "az" msgid "Thu" -msgstr "Og" +msgstr "og" msgid "Fri" -msgstr "Ol" +msgstr "ol" msgid "Sat" -msgstr "Lr" +msgstr "lr" msgid "Sun" -msgstr "Ig" +msgstr "ig" msgid "January" -msgstr "Urtarrila" +msgstr "urtarrila" msgid "February" -msgstr "Otsaila" +msgstr "otsaila" msgid "March" -msgstr "Martxoa" +msgstr "martxoa" msgid "April" -msgstr "Apirila" +msgstr "apirila" msgid "May" -msgstr "Maiatza" +msgstr "maiatza" msgid "June" -msgstr "Ekaina" +msgstr "ekaina" msgid "July" -msgstr "Uztaila" +msgstr "uztaila" msgid "August" -msgstr "Abuztua" +msgstr "abuztua" msgid "September" -msgstr "Iraila" +msgstr "iraila" msgid "October" -msgstr "Urria" +msgstr "urria" msgid "November" -msgstr "Azaroa" +msgstr "azaroa" msgid "December" -msgstr "Abendua" +msgstr "abendua" msgid "jan" msgstr "urt" @@ -908,102 +946,102 @@ msgstr "abe" msgctxt "abbrev. month" msgid "Jan." -msgstr "Urt." +msgstr "urt." msgctxt "abbrev. month" msgid "Feb." -msgstr "Ots." +msgstr "ots." msgctxt "abbrev. month" msgid "March" -msgstr "Mar." +msgstr "mar." msgctxt "abbrev. month" msgid "April" -msgstr "Api." +msgstr "api." msgctxt "abbrev. month" msgid "May" -msgstr "Mai." +msgstr "mai." msgctxt "abbrev. month" msgid "June" -msgstr "Eka." +msgstr "eka." msgctxt "abbrev. month" msgid "July" -msgstr "Uzt." +msgstr "uzt." msgctxt "abbrev. month" msgid "Aug." -msgstr "Abu." +msgstr "abu." msgctxt "abbrev. month" msgid "Sept." -msgstr "Ira." +msgstr "ira." msgctxt "abbrev. month" msgid "Oct." -msgstr "Urr." +msgstr "urr." msgctxt "abbrev. month" msgid "Nov." -msgstr "Aza." +msgstr "aza." msgctxt "abbrev. month" msgid "Dec." -msgstr "Abe." +msgstr "abe." msgctxt "alt. month" msgid "January" -msgstr "Urtarrila" +msgstr "urtarrila" msgctxt "alt. month" msgid "February" -msgstr "Otsaila" +msgstr "otsaila" msgctxt "alt. month" msgid "March" -msgstr "Martxoa" +msgstr "martxoa" msgctxt "alt. month" msgid "April" -msgstr "Apirila" +msgstr "apirila" msgctxt "alt. month" msgid "May" -msgstr "Maiatza" +msgstr "maiatza" msgctxt "alt. month" msgid "June" -msgstr "Ekaina" +msgstr "ekaina" msgctxt "alt. month" msgid "July" -msgstr "Uztaila" +msgstr "uztaila" msgctxt "alt. month" msgid "August" -msgstr "Abuztua" +msgstr "abuztua" msgctxt "alt. month" msgid "September" -msgstr "Iraila" +msgstr "iraila" msgctxt "alt. month" msgid "October" -msgstr "Urria" +msgstr "urria" msgctxt "alt. month" msgid "November" -msgstr "Azaroa" +msgstr "azaroa" msgctxt "alt. month" msgid "December" -msgstr "Abendua" +msgstr "abendua" msgid "This is not a valid IPv6 address." -msgstr "" +msgstr "Hau ez da baleko IPv6 helbide bat." #, python-format msgctxt "String to return when truncating text" @@ -1057,7 +1095,7 @@ msgid "0 minutes" msgstr "0 minutu" msgid "Forbidden" -msgstr "" +msgstr "Debekatuta" msgid "CSRF verification failed. Request aborted." msgstr "CSRF egiaztapenak huts egin du. Eskaera abortatu da." @@ -1068,45 +1106,61 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Mezu hau ikusten ari zara HTTPS gune honek, zure nabigatzaileak 'Referer " +"header' bat bidaltzea behar duelako, baina ez du batere bidali. Goiburuko " +"hau zure nabigatzailea beste norbaitek ordeztu ez duela ziurtatzeko eskatzen " +"da." 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 "" +"Zure nabigatzailera 'Refere' goiburukoak desgaitzeko konfiguratu baldin " +"baduzu, mesedez, gune honetarako, HTTPS konexio edo 'same-origin' " +"eskaeretarako gaitu berriro." 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 "" +"Formularioa bidaltzean gune honek CSRF cookie bat behar duelako ikusten duzu " +"mezu hau. Cookie hau beharrezkoa da segurtasun arrazoiengatik, zure " +"nabigatzailea beste batek ordezkatzen ez duela ziurtatzeko." 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 "" +"Nabigatzailea cookiak desgaitzeko konfiguratu baldin baduzu, mesedez " +"aktibatu behintzat gune honetarako, edo 'same-origin' eskaeretarako." msgid "More information is available with DEBUG=True." msgstr "Informazio gehiago erabilgarri dago DEBUG=True ezarrita." msgid "Welcome to Django" -msgstr "" +msgstr "Ongi etorri Djangora" msgid "It worked!" -msgstr "" +msgstr "Badabil!" msgid "Congratulations on your first Django-powered page." -msgstr "" +msgstr "Zorionak Djangorekin egindako zure lehen orrian." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" +"Jarraian sortu zure lehen aplikazioa python manage.py startapp " +"[aplikazioaren_etiketa] exekutatuz." msgid "" "You're seeing this message because you have DEBUG = True in " "your Django settings file and you haven't configured any URLs. Get to work!" msgstr "" +"Mezu hay Djangoren settings fitxategian code>DEBUG = True jarrita " +"daukazulako eta oraindik URLrik gehitu ez duzulako agertzen da. Lanera!" msgid "No year specified" msgstr "Ez da urterik zehaztu" @@ -1129,8 +1183,8 @@ msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -"Etorkizuneko %(verbose_name_plural)s ez dago aukeran \n" -"%(class_name)s.alloe_future False delako" +"Etorkizuneko %(verbose_name_plural)s ez dago aukeran %(class_name)s." +"allow_future False delako" #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py index 4ddf04ef5ab8..767491719baf 100644 --- a/django/conf/locale/eu/formats.py +++ b/django/conf/locale/eu/formats.py @@ -5,7 +5,7 @@ # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -DATE_FORMAT = r'Yeko M\re\n d\a' +DATE_FORMAT = r'Y\k\o N j\a' TIME_FORMAT = 'H:i' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = diff --git a/django/conf/locale/fa/LC_MESSAGES/django.mo b/django/conf/locale/fa/LC_MESSAGES/django.mo index 5949444db814..4d5bd20fa27f 100644 Binary files a/django/conf/locale/fa/LC_MESSAGES/django.mo and b/django/conf/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fa/LC_MESSAGES/django.po b/django/conf/locale/fa/LC_MESSAGES/django.po index e6f8bbcb8dfc..16b123df6b50 100644 --- a/django/conf/locale/fa/LC_MESSAGES/django.po +++ b/django/conf/locale/fa/LC_MESSAGES/django.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-01 20:23+0000\n" -"Last-Translator: Pouya Abbassi\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Persian (http://www.transifex.com/django/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -301,6 +301,15 @@ msgstr "پرونده‌های استاتیک" msgid "Syndication" msgstr "پیوند" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "یک مقدار معتبر وارد کنید." @@ -385,6 +394,12 @@ 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 "" + msgid "and" msgstr "و" @@ -726,15 +741,15 @@ msgstr "" "%(datetime)s نمیتواند در %(current_timezone)s معنی شود.شاید این زمان مبهم " "است و یا وجود ندارد." +msgid "Clear" +msgstr "پاک کردن" + msgid "Currently" msgstr "در حال حاضر" msgid "Change" msgstr "تغییر" -msgid "Clear" -msgstr "پاک کردن" - msgid "Unknown" msgstr "ناشناخته" @@ -1102,11 +1117,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "تبریک فراوان بابت اولین صفحهٔ Djangoای‌تان." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"مطمئنا شما هنوز کاری انجام نداده اید. اولین اپلیکیشن خود را با اجرای دستور " -"python manage.py startapp [app_label] شروع کنید." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo index ea96fdac6dac..8ff1da404e3d 100644 Binary files a/django/conf/locale/fi/LC_MESSAGES/django.mo and b/django/conf/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fi/LC_MESSAGES/django.po b/django/conf/locale/fi/LC_MESSAGES/django.po index 90e0d40e29e5..4913e3472760 100644 --- a/django/conf/locale/fi/LC_MESSAGES/django.po +++ b/django/conf/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,2017 # Antti Kaihola , 2011 # Jannis Leidel , 2011 # Lasse Liehu , 2015 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 12:03+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgid "German" msgstr "saksa" msgid "Lower Sorbian" -msgstr "" +msgstr "Alasorbi" msgid "Greek" msgstr "kreikka" @@ -136,7 +136,7 @@ msgid "Croatian" msgstr "kroatia" msgid "Upper Sorbian" -msgstr "" +msgstr "Yläsorbi" msgid "Hungarian" msgstr "unkari" @@ -199,7 +199,7 @@ msgid "Burmese" msgstr "burman kieli" msgid "Norwegian Bokmål" -msgstr "" +msgstr "norja (bokmål)" msgid "Nepali" msgstr "nepalin kieli" @@ -297,6 +297,15 @@ msgstr "Staattiset tiedostot" msgid "Syndication" msgstr "Syndikointi" +msgid "That page number is not an integer" +msgstr "Annettu sivunumero ei ole kokonaisluku" + +msgid "That page number is less than 1" +msgstr "Annettu sivunumero on alle 1" + +msgid "That page contains no results" +msgstr "Annetulla sivulla ei ole tuloksia" + msgid "Enter a valid value." msgstr "Syötä oikea arvo." @@ -396,6 +405,14 @@ msgstr[0] "" msgstr[1] "" "Tässä luvussa saa olla enintään %(max)s numeroa ennen desimaalipilkkua." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Pääte \"%(extension)s\" ei ole sallittu. Sallittuja päätteitä ovat " +"\"%(allowed_extensions)s\"." + msgid "and" msgstr "ja" @@ -595,11 +612,11 @@ msgstr "Yksi-yhteen relaatio" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s -suhde" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s -suhteet" msgid "Many-to-many relationship" msgstr "Moni-moneen relaatio" @@ -739,15 +756,15 @@ msgstr "" "%(datetime)s -arvoa ei pystytty lukemaan aikavyöhykkeellä " "%(current_timezone)s; se saattaa olla moniarvoinen tai määrittämätön." +msgid "Clear" +msgstr "Poista" + msgid "Currently" msgstr "Tällä hetkellä" msgid "Change" msgstr "Muokkaa" -msgid "Clear" -msgstr "Poista" - msgid "Unknown" msgstr "Tuntematon" @@ -1124,12 +1141,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Onnittelut ensimmäisestä Django-sivustasi!" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Et toki ole vielä tehnyt yhtään oikeaa työtä. Seuraavaksi voit aloittaa " -"ensimmäisen sovelluksesi ajamalla python manage.py startapp " -"[sovelluksen_nimike]." +"Seuraavaksi voit aloittaa ensimmäisen sovelluksesi ajamalla python " +"manage.py startapp [sovelluksen_nimike]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 43bde9f4f18a..9d69900b407e 100644 Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index f1947e825fc8..93cf0d2fbdad 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # charettes , 2012 -# Claude Paroz , 2013-2016 +# Claude Paroz , 2013-2017 # Claude Paroz , 2011 # Jannis Leidel , 2011 # Jean-Baptiste Mora, 2014 @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-05 14:01+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 14:47+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -298,6 +298,15 @@ msgstr "Fichiers statiques" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "Ce numéro de page n'est pas un nombre entier" + +msgid "That page number is less than 1" +msgstr "Ce numéro de page est plus petit que 1" + +msgid "That page contains no results" +msgstr "Cette page ne contient aucun résultat" + msgid "Enter a valid value." msgstr "Saisissez une valeur valide." @@ -403,6 +412,14 @@ msgstr[0] "" msgstr[1] "" "Assurez-vous qu'il n'y a pas plus de %(max)s chiffres avant la virgule." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"L'extension de fichier « %(extension)s » n'est pas autorisée. Les extensions " +"autorisées sont : %(allowed_extensions)s." + msgid "and" msgstr "et" @@ -762,15 +779,15 @@ msgstr "" "La valeur %(datetime)s n'a pas pu être interprétée dans le fuseau horaire " "%(current_timezone)s ; elle est peut-être ambigüe ou elle n'existe pas." +msgid "Clear" +msgstr "Effacer" + msgid "Currently" msgstr "Actuellement" msgid "Change" msgstr "Modifier" -msgid "Clear" -msgstr "Effacer" - msgid "Unknown" msgstr "Inconnu" @@ -1151,11 +1168,10 @@ msgid "Congratulations on your first Django-powered page." msgstr "Félicitations pour votre première page produite par Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Naturellement, il ne s'agit pas encore d'un résultat utilisable. La " -"prochaine étape est de créer une application en exécutant python " +"La prochaine étape est de créer une application en exécutant python " "manage.py startapp [nom_app]." msgid "" diff --git a/django/conf/locale/fy/LC_MESSAGES/django.mo b/django/conf/locale/fy/LC_MESSAGES/django.mo index 586f7d40860a..957ca4892af2 100644 Binary files a/django/conf/locale/fy/LC_MESSAGES/django.mo and b/django/conf/locale/fy/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fy/LC_MESSAGES/django.po b/django/conf/locale/fy/LC_MESSAGES/django.po index b9636cb9274a..4defddf887a5 100644 --- a/django/conf/locale/fy/LC_MESSAGES/django.po +++ b/django/conf/locale/fy/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Western Frisian (http://www.transifex.com/django/django/" "language/fy/)\n" @@ -293,6 +293,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Jou in falide wearde." @@ -380,6 +389,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "" @@ -708,13 +723,13 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" -msgid "Currently" +msgid "Clear" msgstr "" -msgid "Change" +msgid "Currently" msgstr "" -msgid "Clear" +msgid "Change" msgstr "" msgid "Unknown" @@ -1080,8 +1095,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/ga/LC_MESSAGES/django.mo b/django/conf/locale/ga/LC_MESSAGES/django.mo index 71513ea3e183..0f87c107d247 100644 Binary files a/django/conf/locale/ga/LC_MESSAGES/django.mo and b/django/conf/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ga/LC_MESSAGES/django.po b/django/conf/locale/ga/LC_MESSAGES/django.po index d3daf0a32982..3e5bd0589443 100644 --- a/django/conf/locale/ga/LC_MESSAGES/django.po +++ b/django/conf/locale/ga/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" @@ -298,6 +298,15 @@ msgstr "Comhaid Statach" msgid "Syndication" msgstr "Sindeacáitiú" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Iontráil luach bailí" @@ -403,6 +412,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "agus" @@ -746,15 +761,15 @@ msgstr "" "Ní féidir an %(datetime)s a léirmhíniú i gcrios ama %(current_timezone)s; " "B'fhéidir go bhfuil sé débhríoch nó nach bhfuil sé ann." +msgid "Clear" +msgstr "Glan" + msgid "Currently" msgstr "Faoi láthair" msgid "Change" msgstr "Athraigh" -msgid "Clear" -msgstr "Glan" - msgid "Unknown" msgstr "Anaithnid" @@ -1139,8 +1154,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/gd/LC_MESSAGES/django.mo b/django/conf/locale/gd/LC_MESSAGES/django.mo index 1d5abef58dc6..20250fa908b7 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 d53e1886c4fa..6d457d6d4940 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-2016 +# GunChleoc, 2015-2017 # 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: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-03 09:57+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 11:03+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" @@ -298,6 +298,15 @@ msgstr "Faidhlichean stadastaireachd" msgid "Syndication" msgstr "Siondacaideadh" +msgid "That page number is not an integer" +msgstr "Chan eil àireamh na duilleige seo 'na àireamh slàn" + +msgid "That page number is less than 1" +msgstr "Tha àireamh na duilleige seo nas lugha na 1" + +msgid "That page contains no results" +msgstr "Chan eil toradh aig an duilleag seo" + msgid "Enter a valid value." msgstr "Cuir a-steach luach dligheach." @@ -431,6 +440,14 @@ msgstr[3] "" "Dèan cinnteach nach eil barrachd air %(max)s àireamh ann ron phuing " "dheicheach." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Chan eil an leudachan faidhle \"%(extension)s\" ceadaichte. Seo na " +"leudachain a tha ceadaichte: \"%(allowed_extensions)s\"." + msgid "and" msgstr "agus" @@ -799,15 +816,15 @@ msgstr "" "Cha chiall dha %(datetime)s san roinn-tìde %(current_timezone)s; dh’fhaoidte " "gu bheil e dà-sheaghach no nach eil e ann." +msgid "Clear" +msgstr "Falamhaich" + msgid "Currently" msgstr "An-dràsta" msgid "Change" msgstr "Atharraich" -msgid "Clear" -msgstr "Falamhaich" - msgid "Unknown" msgstr "Chan eil fhios" @@ -1200,12 +1217,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Meal do naidheachd gu bheil a’ chiad duilleag le cumhachd Django agad." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Gu nàdarra, cha do rinn thu obair dha-rìribh fhathast. Nise, tòisich a’ " -"chiad aplacaid agad ’s tu a’ ruith python manage.py aplacaid_toisich " -"[leubail_aplacaid]." +"An uairsin, tòisich a' chiad aplacaid agad 's tu a' ruith python " +"manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 192264dcb3c5..febdc55a4be4 100644 Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 201d68c1526f..d515e110ab9c 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # fasouto , 2011-2012 # fonso , 2011,2013 # fonso , 2013 +# fasouto , 2017 # Jannis Leidel , 2011 # Leandro Regueiro , 2013 # Oscar Carballal , 2012 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-28 16:23+0000\n" +"Last-Translator: fasouto \n" "Language-Team: Galician (http://www.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgid "Arabic" msgstr "Árabe" msgid "Asturian" -msgstr "" +msgstr "Asturiano" msgid "Azerbaijani" msgstr "azerí" @@ -59,7 +60,7 @@ msgid "Welsh" msgstr "Galés" msgid "Danish" -msgstr "dinamarqués" +msgstr "Dinamarqués" msgid "German" msgstr "Alemán" @@ -74,7 +75,7 @@ msgid "English" msgstr "Inglés" msgid "Australian English" -msgstr "" +msgstr "Inglés australiano" msgid "British English" msgstr "inglés británico" @@ -116,7 +117,7 @@ msgid "French" msgstr "Francés" msgid "Frisian" -msgstr "frisón" +msgstr "Frisón" msgid "Irish" msgstr "irlandés" @@ -155,7 +156,7 @@ msgid "Icelandic" msgstr "islandés" msgid "Italian" -msgstr "italiano" +msgstr "Italiano" msgid "Japanese" msgstr "xaponés" @@ -173,7 +174,7 @@ msgid "Kannada" msgstr "canará" msgid "Korean" -msgstr "coreano" +msgstr "Coreano" msgid "Luxembourgish" msgstr "luxemburgués" @@ -298,6 +299,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Insira un valor válido." @@ -369,8 +379,8 @@ msgstr[1] "" #, 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] "Asegure que non hai mais de %(max)s díxito en total." +msgstr[1] "Asegure que non hai mais de %(max)s díxitos en total." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." @@ -386,6 +396,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "e" @@ -395,7 +411,7 @@ msgstr "" #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "" +msgstr "O valor %(value)r non é unha opción válida." msgid "This field cannot be null." msgstr "Este campo non pode ser nulo." @@ -652,7 +668,7 @@ msgid "Enter a complete value." msgstr "" msgid "Enter a valid UUID." -msgstr "" +msgstr "Insira un UUID válido." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -723,15 +739,15 @@ msgstr "" "%(datetime)s non se puido interpretar na zona hora horaria " "%(current_timezone)s; pode ser ambiguo ou non existir." +msgid "Clear" +msgstr "Limpar" + msgid "Currently" msgstr "Actualmente" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Limpar" - msgid "Unknown" msgstr "Descoñecido" @@ -1083,20 +1099,20 @@ msgid "" msgstr "" msgid "More information is available with DEBUG=True." -msgstr "" +msgstr "Pode ver máis información se establece DEBUG=True." msgid "Welcome to Django" -msgstr "" +msgstr "Benvido a Django" msgid "It worked!" -msgstr "" +msgstr "¡Funcionou!" msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo index d425cfa2a8bd..f71f69ee3eb0 100644 Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po index ea9829b7ca4e..a2d59bef13b5 100644 --- a/django/conf/locale/he/LC_MESSAGES/django.po +++ b/django/conf/locale/he/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # Translators: # Alex Gaynor , 2011-2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2015 +# Meir Kriheli , 2011-2015,2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-01 14:41+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" @@ -61,7 +61,7 @@ msgid "German" msgstr "גרמנית" msgid "Lower Sorbian" -msgstr "" +msgstr "סורבית תחתונה" msgid "Greek" msgstr "יוונית" @@ -133,7 +133,7 @@ msgid "Croatian" msgstr "קרואטית" msgid "Upper Sorbian" -msgstr "" +msgstr "סורבית עילית" msgid "Hungarian" msgstr "הונגרית" @@ -196,7 +196,7 @@ msgid "Burmese" msgstr "בּוּרְמֶזִית" msgid "Norwegian Bokmål" -msgstr "" +msgstr "נורבגית ספרותית" msgid "Nepali" msgstr "נפאלית" @@ -294,6 +294,15 @@ 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 "יש להזין ערך חוקי." @@ -384,6 +393,14 @@ msgid_plural "" msgstr[0] "נא לוודא שאין יותר מספרה %(max)s לפני הנקודה העשרונית" msgstr[1] "נא לוודא שאין יותר מ־%(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 "and" msgstr "ו" @@ -581,11 +598,11 @@ msgstr "יחס של אחד לאחד" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "קשר %(from)s-%(to)s" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "קשרי %(from)s-%(to)s" msgid "Many-to-many relationship" msgstr "יחס של רבים לרבים" @@ -721,15 +738,15 @@ msgstr "" "לא ניתן לפרש את %(datetime)s באזור זמן %(current_timezone)s; הוא עשוי להיות " "דו-משמעי או לא קיים." +msgid "Clear" +msgstr "לסלק" + msgid "Currently" msgstr "עכשיו" msgid "Change" msgstr "שינוי" -msgid "Clear" -msgstr "לסלק" - msgid "Unknown" msgstr "לא ידוע" @@ -1102,11 +1119,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "ברכות על העמוד מבוסס Django הראשון שלך." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"ברור שלא עשית עדיין כלום. בשלב הבא יש להתחיל את היישום הראשון שלך ע\"י הרצת " -"python manage.py startapp [app_label]." +"בשלב הבא יש להתחיל את היישום הראשון שלך ע\"י הרצת python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/hi/LC_MESSAGES/django.mo b/django/conf/locale/hi/LC_MESSAGES/django.mo index b27a42fb82a3..5d7c8d7252f2 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 57d1a442bf47..3582632ca284 100644 --- a/django/conf/locale/hi/LC_MESSAGES/django.po +++ b/django/conf/locale/hi/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Hindi (http://www.transifex.com/django/django/language/hi/)\n" "MIME-Version: 1.0\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "एक मान्य मूल्य दर्ज करें" @@ -382,6 +391,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "और" @@ -708,15 +723,15 @@ msgstr "" "%(current_timezone)s समय क्षेत्र में %(datetime)s का व्याख्या नहीं कर सकता है, यह " "अस्पष्ट हो सकता है या नहीं मौजूद हो सकते हैं." +msgid "Clear" +msgstr "रिक्त करें" + msgid "Currently" msgstr "फिलहाल" msgid "Change" msgstr "बदलें" -msgid "Clear" -msgstr "रिक्त करें" - msgid "Unknown" msgstr "अनजान" @@ -1080,8 +1095,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo index 79e6323ec939..67f95f0f14aa 100644 Binary files a/django/conf/locale/hr/LC_MESSAGES/django.mo and b/django/conf/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hr/LC_MESSAGES/django.po b/django/conf/locale/hr/LC_MESSAGES/django.po index fb23b90a20fe..7f3ae39164c5 100644 --- a/django/conf/locale/hr/LC_MESSAGES/django.po +++ b/django/conf/locale/hr/LC_MESSAGES/django.po @@ -4,8 +4,9 @@ # aljosa , 2011,2013 # berislavlopac , 2013 # Bojan Mihelač , 2012 +# Boni Đukić , 2017 # Jannis Leidel , 2011 -# Mislav Cimperšak , 2015 +# Mislav Cimperšak , 2015-2016 # Nino , 2013 # senko , 2012 # Ylodi , 2011 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-27 09:20+0000\n" +"Last-Translator: Boni Đukić \n" "Language-Team: Croatian (http://www.transifex.com/django/django/language/" "hr/)\n" "MIME-Version: 1.0\n" @@ -33,7 +34,7 @@ msgid "Arabic" msgstr "Arapski" msgid "Asturian" -msgstr "" +msgstr "Asturijski" msgid "Azerbaijani" msgstr "Azarbejdžanac" @@ -69,7 +70,7 @@ msgid "German" msgstr "Njemački" msgid "Lower Sorbian" -msgstr "" +msgstr "Donjolužičkosrpski" msgid "Greek" msgstr "Grčki" @@ -126,7 +127,7 @@ msgid "Irish" msgstr "Irski" msgid "Scottish Gaelic" -msgstr "" +msgstr "Škotski gaelski" msgid "Galician" msgstr "Galičanski" @@ -141,7 +142,7 @@ msgid "Croatian" msgstr "Hrvatski" msgid "Upper Sorbian" -msgstr "" +msgstr "Gornjolužičkosrpski" msgid "Hungarian" msgstr "Mađarski" @@ -204,7 +205,7 @@ msgid "Burmese" msgstr "Burmanski" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Bokmål" msgid "Nepali" msgstr "Nepalski" @@ -294,7 +295,7 @@ msgid "Messages" msgstr "Poruke" msgid "Site Maps" -msgstr "" +msgstr "Mape stranica" msgid "Static Files" msgstr "Statične datoteke" @@ -302,6 +303,15 @@ msgstr "Statične datoteke" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "Broj stranice nije cijeli broj" + +msgid "That page number is less than 1" +msgstr "Broj stranice je manji od 1" + +msgid "That page contains no results" +msgstr "Stranica ne sadrži rezultate" + msgid "Enter a valid value." msgstr "Unesite ispravnu vrijednost." @@ -416,6 +426,14 @@ msgstr[2] "" "Osigurajte da nema više od ukupno %(max)s numberičkih znakova prije " "decimalne točke." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Ekstenzija datoteke '%(extension)s' nije dopuštena. Dopuštene ekstenzije su: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "i" @@ -498,12 +516,16 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"'%(value)s' vrijednost je neispravnog formata. Vrijednost mora biti u YYYY-" +"MM-DD HH:MM[:ss[.uuuuuu]][TZ] formatu." #, 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' vrijednost je u točnom formatu (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]), ali je datum/vrijeme neispravno." msgid "Date (with time)" msgstr "Datum (sa vremenom/satima)" @@ -573,12 +595,16 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"'%(value)s' vrijednost je neispravnog formata. Vrijednost mora biti u HH:MM[:" +"ss[.uuuuuu]] formatu." #, python-format msgid "" "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"'%(value)s' vrijednost je u točnom formatu (HH:MM[:ss[.uuuuuu]]), ali je " +"datum/vrijeme neispravno." msgid "Time" msgstr "Vrijeme" @@ -587,7 +613,7 @@ msgid "URL" msgstr "URL" msgid "Raw binary data" -msgstr "" +msgstr "Binarni podaci" #, python-format msgid "'%(value)s' is not a valid UUID." @@ -601,7 +627,7 @@ msgstr "Slika" #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." -msgstr "" +msgstr "%(model)s instanca sa %(field)s %(value)r ne postoji." msgid "Foreign Key (type determined by related field)" msgstr "Foreign Key (type determined by related field)" @@ -611,11 +637,11 @@ msgstr "One-to-one relationship" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s veza" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s veze" msgid "Many-to-many relationship" msgstr "Many-to-many relationship" @@ -661,8 +687,11 @@ 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] "" +"Osigurajte da naziv datoteke ima najviše %(max)d znak (ima %(length)d)." msgstr[1] "" +"Osigurajte da naziv datoteke ima najviše %(max)d znakova (ima %(length)d)." msgstr[2] "" +"Osigurajte da naziv datoteke ima najviše %(max)d znakova (ima %(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Molimo Vas da pošaljete ili datoteku ili označite izbor, a ne oboje." @@ -682,7 +711,7 @@ msgid "Enter a list of values." msgstr "Unesite listu vrijednosti." msgid "Enter a complete value." -msgstr "" +msgstr "Unesite kompletnu vrijednost." msgid "Enter a valid UUID." msgstr "Unesite ispravan UUID." @@ -693,10 +722,10 @@ msgstr ":" #, python-format msgid "(Hidden field %(name)s) %(error)s" -msgstr "" +msgstr "(Skriveno polje %(name)s) %(error)s" msgid "ManagementForm data is missing or has been tampered with" -msgstr "" +msgstr "ManagementForm podaci nedostaju ili su promijenjeni" #, python-format msgid "Please submit %d or fewer forms." @@ -757,15 +786,15 @@ msgstr "" "%(datetime)s ne može biti interpretirano u vremenskoj zoni " "%(current_timezone)s; možda je dvosmisleno ili ne postoji." +msgid "Clear" +msgstr "Isprazni" + msgid "Currently" msgstr "Trenutno" msgid "Change" msgstr "Promijeni" -msgid "Clear" -msgstr "Isprazni" - msgid "Unknown" msgstr "Nepoznat pojam" @@ -1094,10 +1123,10 @@ msgid "0 minutes" msgstr "0 minuta" msgid "Forbidden" -msgstr "" +msgstr "Zabranjeno" msgid "CSRF verification failed. Request aborted." -msgstr "" +msgstr "CSRF verifikacija nije uspjela. Zahtjev je prekinut." msgid "" "You are seeing this message because this HTTPS site requires a 'Referer " @@ -1105,45 +1134,64 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Ova poruka je prikazana jer ova HTTPS stranica zahtijeva da 'zaglavlje " +"preporučitelja' bude poslano od strane internetskog preglednika, ali ono " +"nije poslano. Ovo zaglavlje je potrebno iz sigurnosnih razloga, kako bi se " +"osiguralo da vaš internetski preglednik ne bude otet od strane trećih osoba." 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 "" +"Ako ste konfigurirali svoj internetski preglednik da onemogući 'zaglavlje " +"preporučitelja', molimo da ga ponovno omogućite barem za ovu stranicu, na " +"svim HTTPS vezama, ili za zahtjeve 'istog podrijetla'." 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 "" +"Ova poruka vam se prikazuje jer stranica na kojoj se nalazite zahtjeva CSRF " +"kolačić prilikom slanja forme. Navedeni kolačić je obavezan iz sigurnosnih " +"razloga, kako bi se osiguralo da vaš internetski preglednik ne bude otet od " +"strane trećih osoba." 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 "" +"Ako ste konfigurirali svoj internetski preglednik da onemogući kolačiće, " +"molimo da ih ponovno omogućite barem za ovu stranicu ili za zahtjeve 'istog " +"podrijetla'." msgid "More information is available with DEBUG=True." -msgstr "" +msgstr "Dodatne informacije su dostupne sa postavkom DEBUG=True." msgid "Welcome to Django" -msgstr "" +msgstr "Dobrodošli u Django" msgid "It worked!" msgstr "Radi!" msgid "Congratulations on your first Django-powered page." -msgstr "" +msgstr "Čestitke na vašoj prvoj Django stranici." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" +"Za nastavak, započnite svoju prvu aplikaciju tako da pokrenite python " +"manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " "your Django settings file and you haven't configured any URLs. Get to work!" msgstr "" +"Ova poruka vam se prikazuje jer imate postavku DEBUG = True u " +"datoteci sa Django postavkama te niste konfigurirali niti jedan URL. Krenite " +"sa radom!" msgid "No year specified" msgstr "Nije navedena godina" diff --git a/django/conf/locale/hsb/LC_MESSAGES/django.mo b/django/conf/locale/hsb/LC_MESSAGES/django.mo index 515aea267c36..0b50d8cbfbf3 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 7d6cef6806aa..496ea75d358d 100644 --- a/django/conf/locale/hsb/LC_MESSAGES/django.po +++ b/django/conf/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 +# Michael Wolf , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-01 21:52+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:28+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -294,6 +294,15 @@ msgstr "Statiske dataje" msgid "Syndication" msgstr "Syndikacija" +msgid "That page number is not an integer" +msgstr "Tute čisko strony cyła ličba njeje." + +msgid "That page number is less than 1" +msgstr "Tute čisło strony je mjeńše hač 1." + +msgid "That page contains no results" +msgstr "Tuta strona wuslědki njewobsahuje" + msgid "Enter a valid value." msgstr "Zapodajće płaćiwu hódnotu." @@ -409,6 +418,14 @@ msgstr[1] "Zawěsćće, zo njeje wjace hač %(max)s cyfrow před decimalnej komu msgstr[2] "Zawěsćće, zo njeje wjace hač %(max)s cyfrow před decimalnej komu." msgstr[3] "Zawěsćće, zo njeje wjace hač %(max)s cyfrow před decimalnej komu." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Datajowy sufiks ' %(extension)s' dowoleny njeje. Dowolene sufiksy su: ' " +"%(allowed_extensions)s'." + msgid "and" msgstr "a" @@ -771,15 +788,15 @@ msgstr "" "%(datetime)s njeda so w časowym pasmje %(current_timezone)s interpretować; " "je snano dwuzmyslny abo njeeksistuje." +msgid "Clear" +msgstr "Zhašeć" + msgid "Currently" msgstr "Tuchwilu" msgid "Change" msgstr "Změnić" -msgid "Clear" -msgstr "Zhašeć" - msgid "Unknown" msgstr "Njeznaty" @@ -1169,12 +1186,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Zbožopřeće k wašej prěnjej stronje spěchowanej přez Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Njejsće wězo hišće žane dźěło činił. Wuwjedźće tuž jako přichodne " -"python manage.py startapp [app_label], zo byšće swóje prěnje " -"nałoženje startował." +"Wuwjedźće jako přichodne python manage.py startapp [app_label], " +"zo byšće swoje prěnje nałoženje startował." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/hu/LC_MESSAGES/django.mo b/django/conf/locale/hu/LC_MESSAGES/django.mo index 9717bba5127a..23e5746ec7c1 100644 Binary files a/django/conf/locale/hu/LC_MESSAGES/django.mo and b/django/conf/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hu/LC_MESSAGES/django.po b/django/conf/locale/hu/LC_MESSAGES/django.po index c87ff00f3808..55485087b01a 100644 --- a/django/conf/locale/hu/LC_MESSAGES/django.po +++ b/django/conf/locale/hu/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # András Veres-Szentkirályi, 2016 # Attila Nagy <>, 2012 +# Dóra Szendrei , 2017 # Jannis Leidel , 2011 # János Péter Ronkay , 2011-2012,2014 # Máté Őry , 2013 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-19 07:35+0000\n" -"Last-Translator: András Veres-Szentkirályi\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-24 11:22+0000\n" +"Last-Translator: Dóra Szendrei \n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -298,6 +299,15 @@ msgstr "Statikus fájlok" msgid "Syndication" msgstr "Szindikáció" +msgid "That page number is not an integer" +msgstr "Az oldalszám nem egész szám." + +msgid "That page number is less than 1" +msgstr "Az oldalszám kisebb, mint 1" + +msgid "That page contains no results" +msgstr "Az oldal nem tartalmaz találatokat" + msgid "Enter a valid value." msgstr "Adjon meg egy érvényes értéket." @@ -403,6 +413,14 @@ msgstr[1] "" "Bizonyosodjon meg arról, hogy legfeljebb %(max)s számjegy van a " "tizedesvessző előtt." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"'%(extension)s' kiterjesztés nem engedélyezett. Az engedélyezett " +"kiterjesztések a következők: '%(allowed_extensions)s'." + msgid "and" msgstr "és" @@ -761,15 +779,15 @@ msgstr "" "%(datetime)s értelmezhetetlen a megadott %(current_timezone)s időzónában; " "vagy félreérthető, vagy nem létezik." +msgid "Clear" +msgstr "Törlés" + msgid "Currently" msgstr "Jelenleg" msgid "Change" msgstr "Módosítás" -msgid "Clear" -msgstr "Törlés" - msgid "Unknown" msgstr "Ismeretlen" @@ -1145,12 +1163,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Gratulálunk az első Django alapú oldalhoz!" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Természetesen még hátra van a munka nagy része. Következő lépésként indítsa " -"el az első appot a python manage.py startapp [app_label] " -"paranccsal." +"Következő lépésként indítsa el az első appot a python manage.py " +"startapp [app_label] paranccsal." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ia/LC_MESSAGES/django.mo b/django/conf/locale/ia/LC_MESSAGES/django.mo index f1d5ffbbf098..7a9a6962fb59 100644 Binary files a/django/conf/locale/ia/LC_MESSAGES/django.mo and b/django/conf/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ia/LC_MESSAGES/django.po b/django/conf/locale/ia/LC_MESSAGES/django.po index 406dcf0024e6..aa41ca895ed3 100644 --- a/django/conf/locale/ia/LC_MESSAGES/django.po +++ b/django/conf/locale/ia/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Martijn Dekker , 2012,2014 +# Martijn Dekker , 2012,2014,2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Interlingua (http://www.transifex.com/django/django/language/" "ia/)\n" @@ -60,7 +60,7 @@ msgid "German" msgstr "germano" msgid "Lower Sorbian" -msgstr "" +msgstr "sorabo inferior" msgid "Greek" msgstr "greco" @@ -84,7 +84,7 @@ msgid "Argentinian Spanish" msgstr "espaniol argentin" msgid "Colombian Spanish" -msgstr "" +msgstr "espaniol colombian" msgid "Mexican Spanish" msgstr "espaniol mexican" @@ -117,7 +117,7 @@ msgid "Irish" msgstr "irlandese" msgid "Scottish Gaelic" -msgstr "" +msgstr "gaelico scotese" msgid "Galician" msgstr "galiciano" @@ -132,7 +132,7 @@ msgid "Croatian" msgstr "croato" msgid "Upper Sorbian" -msgstr "" +msgstr "sorabo superior" msgid "Hungarian" msgstr "hungaro" @@ -189,13 +189,13 @@ msgid "Mongolian" msgstr "mongolico" msgid "Marathi" -msgstr "" +msgstr "marathi" msgid "Burmese" -msgstr "" +msgstr "burmese" msgid "Norwegian Bokmål" -msgstr "" +msgstr "norvegianio bokmål" msgid "Nepali" msgstr "nepali" @@ -207,7 +207,7 @@ msgid "Norwegian Nynorsk" msgstr "norvegiano, nynorsk" msgid "Ossetic" -msgstr "" +msgstr "ossetico" msgid "Punjabi" msgstr "punjabi" @@ -264,7 +264,7 @@ msgid "Tatar" msgstr "tartaro" msgid "Udmurt" -msgstr "" +msgstr "udmurto" msgid "Ukrainian" msgstr "ukrainiano" @@ -282,7 +282,7 @@ msgid "Traditional Chinese" msgstr "chinese traditional" msgid "Messages" -msgstr "" +msgstr "Messages" msgid "Site Maps" msgstr "Mappas de sito" @@ -293,6 +293,15 @@ msgstr "Files static" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Specifica un valor valide." @@ -315,6 +324,8 @@ msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Specifica un 'slug' valide, consistente de litteras, numeros, tractos de " +"sublineamento o tractos de union in Unicode." msgid "Enter a valid IPv4 address." msgstr "Specifica un adresse IPv4 valide." @@ -372,14 +383,16 @@ msgstr[1] "" #, 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] "Assecura te que il non ha plus de %(max)s digito in total." +msgstr[1] "Assecura te que il non ha plus de %(max)s digitos in 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] "" +"Assecura te que il non ha plus de %(max)s cifra post le comma decimal." msgstr[1] "" +"Assecura te que il non ha plus de %(max)s cifras post le comma decimal." #, python-format msgid "" @@ -387,7 +400,15 @@ msgid "" msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +"Assecura te que il non ha plus de %(max)s cifra ante le comma decimal." msgstr[1] "" +"Assecura te que il non ha plus de %(max)s cifras ante le comma decimal." + +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" msgid "and" msgstr "e" @@ -470,19 +491,23 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Le valor '%(value)s' es in un formato invalide. Debe esser in formato AAAA-" +"MM-DD HH:MM[:ss[.uuuuuu]][FH]." #, 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 "" +"Le valor '%(value)s' es in le formato correcte (YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][FH]) ma es un data/hora invalide." msgid "Date (with time)" msgstr "Data (con hora)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "" +msgstr "Le valor '%(value)s' debe esser un numero decimal." msgid "Decimal number" msgstr "Numero decimal" @@ -492,9 +517,11 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" +"Le valor '%(value)s' es in un formato invalide. Debe esser in formato [DD] " +"[HH:[MM:]]ss[.uuuuuu]." msgid "Duration" -msgstr "" +msgstr "Duration" msgid "Email address" msgstr "Adresse de e-mail" @@ -504,7 +531,7 @@ msgstr "Cammino de file" #, python-format msgid "'%(value)s' value must be a float." -msgstr "" +msgstr "Le valor '%(value)s' debe esser un numero a comma flottante." msgid "Floating point number" msgstr "Numero a comma flottante" @@ -517,7 +544,7 @@ msgstr "Adresse IP" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "" +msgstr "Le valor '%(value)s'' debe esser None/Nulle, True/Ver o False." msgid "Boolean (Either True, False or None)" msgstr "Booleano (ver, false o nulle)" @@ -543,12 +570,16 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Le valor '%(value)s' es in un formato invalide. Debe esser in 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 "" +"Le valor '%(value)s' es in le formato correcte (HH:MM[:ss[.uuuuuu]]) ma es " +"un hora invalide." msgid "Time" msgstr "Hora" @@ -557,11 +588,11 @@ msgid "URL" msgstr "URL" msgid "Raw binary data" -msgstr "" +msgstr "Datos binari crude" #, python-format msgid "'%(value)s' is not a valid UUID." -msgstr "" +msgstr "'%(value)s' non es un UUID valide." msgid "File" msgstr "File" @@ -571,7 +602,7 @@ msgstr "Imagine" #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." -msgstr "" +msgstr "Le instantia de %(model)s con %(field)s %(value)r non existe." msgid "Foreign Key (type determined by related field)" msgstr "Clave estranier (typo determinate per le campo associate)" @@ -581,11 +612,11 @@ msgstr "Relation un a un" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "Relation %(from)s a %(to)s" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "Relationes %(from)s a %(to)s" msgid "Many-to-many relationship" msgstr "Relation multes a multes" @@ -615,7 +646,7 @@ msgid "Enter a valid date/time." msgstr "Specifica un data e hora valide." msgid "Enter a valid duration." -msgstr "" +msgstr "Specifica un duration valide." msgid "No file was submitted. Check the encoding type on the form." msgstr "" @@ -633,7 +664,10 @@ 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] "" +"Assecura te que iste valor ha al plus %(max)d character (illo ha %(length)d)." msgstr[1] "" +"Assecura te que iste valor ha al plus %(max)d characteres (illo ha " +"%(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Per favor o submitte un file o marca le quadrato \"rader\", non ambes." @@ -654,10 +688,10 @@ msgid "Enter a list of values." msgstr "Scribe un lista de valores." msgid "Enter a complete value." -msgstr "" +msgstr "Specifica un valor complete." msgid "Enter a valid UUID." -msgstr "" +msgstr "Specifica un UUID valide." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -665,22 +699,22 @@ msgstr "" #, python-format msgid "(Hidden field %(name)s) %(error)s" -msgstr "" +msgstr "(Campo celate %(name)s) %(error)s" msgid "ManagementForm data is missing or has been tampered with" -msgstr "" +msgstr "Le datos ManagementForm manca o ha essite manipulate" #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Per favor, submitte %d o minus formularios." +msgstr[1] "Per favor, submitte %d o minus formularios." #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Per favor, submitte %d o plus formularios." +msgstr[1] "Per favor, submitte %d o plus formularios." msgid "Order" msgstr "Ordine" @@ -720,7 +754,7 @@ msgstr "" #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "" +msgstr "\"%(pk)s\" non es un valor valide pro un clave primari." #, python-format msgid "" @@ -730,15 +764,15 @@ msgstr "" "%(datetime)s non poteva esser interpretate in le fuso horari " "%(current_timezone)s; illo pote esser ambigue o illo pote non exister." +msgid "Clear" +msgstr "Rader" + msgid "Currently" msgstr "Actualmente" msgid "Change" msgstr "Cambiar" -msgid "Clear" -msgstr "Rader" - msgid "Unknown" msgstr "Incognite" @@ -1006,7 +1040,7 @@ msgid "December" msgstr "Decembre" msgid "This is not a valid IPv6 address." -msgstr "" +msgstr "Isto non es un adresse IPv6 valide." #, python-format msgctxt "String to return when truncating text" @@ -1023,47 +1057,47 @@ msgstr ", " #, python-format msgid "%d year" msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d anno" +msgstr[1] "%d annos" #, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d mense" +msgstr[1] "%d menses" #, python-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d septimana" +msgstr[1] "%d septimanas" #, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d die" +msgstr[1] "%d dies" #, python-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d horas" +msgstr[1] "%d horas" #, python-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d minuta" +msgstr[1] "%d minutas" msgid "0 minutes" -msgstr "" +msgstr "0 minutas" msgid "Forbidden" -msgstr "" +msgstr "Prohibite" msgid "CSRF verification failed. Request aborted." -msgstr "" +msgstr "Verification CSRF fallite. Requesta abortate." msgid "" "You are seeing this message because this HTTPS site requires a 'Referer " @@ -1071,45 +1105,60 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Tu vide iste message perque iste sito HTTPS require que un capite 'Referer' " +"sia inviate per tu navigator Web, ma nulle tal capite esseva inviate. Iste " +"capite es requirite pro motivos de securitate, pro assecurar que tu " +"navigator non es sequestrate per tertie personas." 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 tu ha disactivate le invio de capites 'Referer' in tu navigator, per " +"favor re-activa isto, al minus pro iste sito, o pro connexiones HTTPS, o pro " +"requestas del 'mesme origine'." 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 "" +"Tu vide iste message perque iste sito require un cookie CSRF durante le " +"submission de formularios. Iste cookie es requirite pro motivos de " +"securitate, pro assecurar que tu navigator non es sequestrate per tertie " +"personas." 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 tu ha disactivate le cookies in tu navigator, per favor re-activa los, al " +"minus pro iste sito, o pro requestas del 'mesme origine'." msgid "More information is available with DEBUG=True." -msgstr "" +msgstr "Plus information es disponibile con DEBUG=True." msgid "Welcome to Django" -msgstr "" +msgstr "Benvenite a Django" msgid "It worked!" -msgstr "" +msgstr "Successo!" msgid "Congratulations on your first Django-powered page." -msgstr "" +msgstr "Felicitationes pro tu prime pagina actionate per Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" "You're seeing this message because you have DEBUG = True in " "your Django settings file and you haven't configured any URLs. Get to work!" msgstr "" +"Tu vide iste message perque tu ha inserite DEBUG = True in tu " +"file de configuration Django e tu non ha ancora configurate alcun URLs." msgid "No year specified" msgstr "Nulle anno specificate" @@ -1148,7 +1197,7 @@ msgstr "Pagina non es 'last', ni pote esser convertite in un numero integre." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "" +msgstr "Pagina invalide (%(page_number)s): %(message)s" #, python-format msgid "Empty list and '%(class_name)s.allow_empty' is False." diff --git a/django/conf/locale/id/LC_MESSAGES/django.mo b/django/conf/locale/id/LC_MESSAGES/django.mo index 353e61e0a4a9..3cbdc4e62ba4 100644 Binary files a/django/conf/locale/id/LC_MESSAGES/django.mo and b/django/conf/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/id/LC_MESSAGES/django.po b/django/conf/locale/id/LC_MESSAGES/django.po index bc782f34e32d..64c6a07181b7 100644 --- a/django/conf/locale/id/LC_MESSAGES/django.po +++ b/django/conf/locale/id/LC_MESSAGES/django.po @@ -1,19 +1,19 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Fery Setiawan , 2015-2016 +# Fery Setiawan , 2015-2017 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi (OonID) , 2016 # rodin , 2011 -# rodin , 2013-2015 +# rodin , 2013-2016 # Sutrisno Efendi , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-08-23 04:48+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-05 13:15+0000\n" "Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" @@ -66,7 +66,7 @@ msgid "German" msgstr "Jerman" msgid "Lower Sorbian" -msgstr "Lower Sorbian" +msgstr "Sorbian Bawah" msgid "Greek" msgstr "Yunani" @@ -75,7 +75,7 @@ msgid "English" msgstr "Inggris" msgid "Australian English" -msgstr "Australia Inggris" +msgstr "Inggris Australia" msgid "British English" msgstr "Inggris Britania" @@ -90,7 +90,7 @@ msgid "Argentinian Spanish" msgstr "Spanyol Argentina" msgid "Colombian Spanish" -msgstr "Kolombia Spanyol" +msgstr "Spanyol Kolombia" msgid "Mexican Spanish" msgstr "Spanyol Meksiko" @@ -123,7 +123,7 @@ msgid "Irish" msgstr "Irlandia" msgid "Scottish Gaelic" -msgstr "Gaelik Skotlandia" +msgstr "Skolandia Gaelik" msgid "Galician" msgstr "Galicia" @@ -138,7 +138,7 @@ msgid "Croatian" msgstr "Kroasia" msgid "Upper Sorbian" -msgstr "Upper Sorbian" +msgstr "Sorbian Atas" msgid "Hungarian" msgstr "Hungaria" @@ -150,7 +150,7 @@ msgid "Indonesian" msgstr "Indonesia" msgid "Ido" -msgstr "ido" +msgstr "Ido" msgid "Icelandic" msgstr "Islandia" @@ -201,7 +201,7 @@ msgid "Burmese" msgstr "Burma" msgid "Norwegian Bokmål" -msgstr "Bokmål Norwegian" +msgstr "Norwegia Bokmål" msgid "Nepali" msgstr "Nepal" @@ -297,7 +297,16 @@ msgid "Static Files" msgstr "Bidang Tetap" msgid "Syndication" -msgstr "Kongsi" +msgstr "Sindikasi" + +msgid "That page number is not an integer" +msgstr "Nomor halaman itu bukan sebuah integer" + +msgid "That page number is less than 1" +msgstr "Nomor halaman itu kurang dari 1" + +msgid "That page contains no results" +msgstr "Halaman itu mengandung tidak ada hasil" msgid "Enter a valid value." msgstr "Masukkan nilai yang valid." @@ -321,8 +330,8 @@ msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -"Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah, atau tanda " -"minus." +"Masukkan 'slug' valid yang terdiri dari karakter, bilangan, garis bawah, " +"atau tanda minus." msgid "Enter a valid IPv4 address." msgstr "Masukkan alamat IPv4 yang valid." @@ -389,6 +398,14 @@ msgstr[0] "" "Pastikan jumlah angka sebelum desimal pada bilangan tidak memiliki lebih " "dari %(max)s angka." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Tambahan berkas '%(extension)s' tidak diizinkan. Tambahan diizinkan adalah: " +"'%(allowed_extensions)s'. " + msgid "and" msgstr "dan" @@ -398,7 +415,7 @@ msgstr "%(model_name)s dengan %(field_labels)s ini tidak ada." #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "Nilai %(value)r bukan pilihan yang sah." +msgstr "Nilai %(value)r bukan pilihan yang valid." msgid "This field cannot be null." msgstr "Field ini tidak boleh null." @@ -427,14 +444,14 @@ msgstr "Bilangan Asli" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "%(value)s' nilai harus lah sebuah bilangan bulat" +msgstr "%(value)s' nilai harus merupakan bilangan bulat." msgid "Big (8 byte) integer" msgstr "Bilangan asli raksasa (8 byte)" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "nilai '%(value)s' haruslah berupa Benar atau Salah" +msgstr "Nilai '%(value)s' haruslah bernilai Benar atau Salah." msgid "Boolean (Either True or False)" msgstr "Nilai Boolean (Salah satu dari True atau False)" @@ -451,16 +468,16 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -"nilai '%(value)s' tidak sesuai format penanggalan. Formatnya harus dalam " -"YYYY-MM-DD." +"Nilai '%(value)s' tidak sesuai format penanggalan. Formatnya harus dalam " +"TTTT-BB-HH." #, python-format msgid "" "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" -"nilai '%(value)s' memiliki format yang sesuai (YYYY-MM-DD) tetap tanggalnya " -"tidak benar." +"Nilai '%(value)s' memiliki format yang sesuai (TTTT-BB-HH) tetap tanggalnya " +"tidak valid." msgid "Date (without time)" msgstr "Tanggal (tanpa waktu)" @@ -470,8 +487,8 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -"Nilai '%(value)s' mempunyai bentuk tidak sah. Itu harus dalam bentuk YYYY-MM-" -"DD HH:MM[:ss[.uuuuuu]][TZ]." +"Format nilai '%(value)s' tidak valid. Formatnya harus dalam TTTT-BB-HH JJ:" +"MM[:dd[.mmmmmm]][TZ]." #, python-format msgid "" @@ -486,7 +503,7 @@ msgstr "Tanggal (dengan waktu)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "Nilai '%(value)s' haruslah sebuah bilangan desimal" +msgstr "Nilai '%(value)s' haruslah berupa bilangan desimal." msgid "Decimal number" msgstr "Bilangan desimal" @@ -625,7 +642,7 @@ msgid "Enter a valid date/time." msgstr "Masukkan tanggal/waktu yang valid." msgid "Enter a valid duration." -msgstr "Masukan sebuah durasi waktu yang benar" +msgstr "Masukan durasi waktu yang benar." msgid "No file was submitted. Check the encoding type on the form." msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe pengaksaraan formulir." @@ -669,7 +686,7 @@ msgid "Enter a complete value." msgstr "Masukan sebuah nilai dengan komplit" msgid "Enter a valid UUID." -msgstr "Masukan sebuah UUID yang benar" +msgstr "Masukan UUID yang benar." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -738,15 +755,15 @@ msgstr "" "%(datetime)s tidak dapat diinterpretasikan pada zona waktu " "%(current_timezone)s; mungkin nilainya ambigu atau mungkin tidak ada." +msgid "Clear" +msgstr "Hapus" + msgid "Currently" msgstr "Saat ini" msgid "Change" msgstr "Ubah" -msgid "Clear" -msgstr "Hapus" - msgid "Unknown" msgstr "Tidak diketahui" @@ -1064,7 +1081,7 @@ msgid "Forbidden" msgstr "Terlarang" msgid "CSRF verification failed. Request aborted." -msgstr "verifikasi CSRF gagal, permintann di batalkan" +msgstr "Verifikasi CSRF gagal, Permintaan dibatalkan." msgid "" "You are seeing this message because this HTTPS site requires a 'Referer " @@ -1115,12 +1132,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Selamat untuk halaman Django pertama Anda." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Tentu saja, anda belum menyelesaikan pekerjaan apapun. Selanjutnya, mulai " -"aplikasi pertama anda dengan ekseskusi python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Selanjutnya, mulai aplikasi pertama anda dengan menjalankan python " +"manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index 1191517eedc9..5661b2bf6786 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 30031a8f5f87..8fc6d23a3ab9 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -1,18 +1,19 @@ # This file is distributed under the same license as the Django package. # # Translators: -# gudmundur , 2011 +# gudmundur , 2011 # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 # saevarom , 2011 # saevarom , 2013,2015 +# Thordur Sigurdsson , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-05 03:16+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -22,13 +23,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" msgid "Afrikaans" -msgstr "" +msgstr "Afríkanska" msgid "Arabic" msgstr "Arabíska" msgid "Asturian" -msgstr "" +msgstr "Astúríska" msgid "Azerbaijani" msgstr "Aserbaídsjíska" @@ -37,13 +38,13 @@ msgid "Bulgarian" msgstr "Búlgarska" msgid "Belarusian" -msgstr "" +msgstr "Hvítrússneska" msgid "Bengali" msgstr "Bengalska" msgid "Breton" -msgstr "" +msgstr "Bretónska" msgid "Bosnian" msgstr "Bosníska" @@ -64,7 +65,7 @@ msgid "German" msgstr "Þýska" msgid "Lower Sorbian" -msgstr "" +msgstr "Neðri sorbíska" msgid "Greek" msgstr "Gríska" @@ -73,13 +74,13 @@ msgid "English" msgstr "Enska" msgid "Australian English" -msgstr "" +msgstr "Áströlsk enska" msgid "British English" msgstr "Bresk enska" msgid "Esperanto" -msgstr "" +msgstr "Esperanto" msgid "Spanish" msgstr "Spænska" @@ -88,19 +89,19 @@ msgid "Argentinian Spanish" msgstr "Argentínsk spænska" msgid "Colombian Spanish" -msgstr "" +msgstr "Kólumbísk spænska" msgid "Mexican Spanish" -msgstr "Mexíkósk Spænska" +msgstr "Mexíkósk spænska" msgid "Nicaraguan Spanish" msgstr "Níkaragva spænska" msgid "Venezuelan Spanish" -msgstr "" +msgstr "Venesúelsk spænska" msgid "Estonian" -msgstr "Eistland" +msgstr "Eistneska" msgid "Basque" msgstr "Baskneska" @@ -121,7 +122,7 @@ msgid "Irish" msgstr "Írska" msgid "Scottish Gaelic" -msgstr "" +msgstr "Skosk gelíska" msgid "Galician" msgstr "Galíska" @@ -136,19 +137,19 @@ msgid "Croatian" msgstr "Króatíska" msgid "Upper Sorbian" -msgstr "" +msgstr "Efri sorbíska" msgid "Hungarian" msgstr "Ungverska" msgid "Interlingua" -msgstr "" +msgstr "Interlingua" msgid "Indonesian" msgstr "Indónesíska" msgid "Ido" -msgstr "" +msgstr "Ido" msgid "Icelandic" msgstr "Íslenska" @@ -163,7 +164,7 @@ msgid "Georgian" msgstr "Georgíska" msgid "Kazakh" -msgstr "" +msgstr "Kasakska" msgid "Khmer" msgstr "Kmeríska" @@ -175,7 +176,7 @@ msgid "Korean" msgstr "Kóreska" msgid "Luxembourgish" -msgstr "" +msgstr "Lúxemborgíska" msgid "Lithuanian" msgstr "Litháenska" @@ -193,16 +194,16 @@ msgid "Mongolian" msgstr "Mongólska" msgid "Marathi" -msgstr "" +msgstr "Maratí" msgid "Burmese" -msgstr "" +msgstr "Búrmíska" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Norskt bókmál" msgid "Nepali" -msgstr "" +msgstr "Nepalska" msgid "Dutch" msgstr "Hollenska" @@ -211,7 +212,7 @@ msgid "Norwegian Nynorsk" msgstr "Nýnorska" msgid "Ossetic" -msgstr "" +msgstr "Ossetíska" msgid "Punjabi" msgstr "Púndjabíska" @@ -223,7 +224,7 @@ msgid "Portuguese" msgstr "Portúgalska" msgid "Brazilian Portuguese" -msgstr "Brasilísk Portúgalska" +msgstr "Brasilísk portúgalska" msgid "Romanian" msgstr "Rúmenska" @@ -232,7 +233,7 @@ msgid "Russian" msgstr "Rússneska" msgid "Slovak" -msgstr "Slóvaska" +msgstr "Slóvakíska" msgid "Slovenian" msgstr "Slóvenska" @@ -250,7 +251,7 @@ msgid "Swedish" msgstr "Sænska" msgid "Swahili" -msgstr "" +msgstr "Svahílí" msgid "Tamil" msgstr "Tamílska" @@ -265,10 +266,10 @@ msgid "Turkish" msgstr "Tyrkneska" msgid "Tatar" -msgstr "" +msgstr "Tataríska" msgid "Udmurt" -msgstr "" +msgstr "Údmúrt" msgid "Ukrainian" msgstr "Úkraínska" @@ -286,7 +287,7 @@ msgid "Traditional Chinese" msgstr "Hefðbundin kínverska" msgid "Messages" -msgstr "" +msgstr "Skilaboð" msgid "Site Maps" msgstr "" @@ -297,6 +298,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "Þetta síðunúmer er ekki heiltala" + +msgid "That page number is less than 1" +msgstr "Þetta síðunúmer er minna en 1" + +msgid "That page contains no results" +msgstr "Þessi síða hefur engar niðurstöður" + msgid "Enter a valid value." msgstr "Sláðu inn gilt gildi." @@ -304,7 +314,7 @@ msgid "Enter a valid URL." msgstr "Sláðu inn gilt veffang (URL)." msgid "Enter a valid integer." -msgstr "" +msgstr "Sláðu inn gilda heiltölu." msgid "Enter a valid email address." msgstr "Sláðu inn gilt netfang." @@ -312,13 +322,15 @@ msgstr "Sláðu inn gilt netfang." msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -"Settu inn gildan vefslóðartitil sem samanstendur af latneskum bókstöfum, " -"númerin, undirstrikum og bandstrikum." +"Settu inn gildan vefslóðartitil sem má innihalda latneska bókstafi, " +"tölustafi, undirstrik og bandstrik." msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Settu inn gildan vefslóðartitil sem má innihalda unicode bókstafi, " +"tölustafi, undirstrik og bandstrik." msgid "Enter a valid IPv4 address." msgstr "Sláðu inn gilda IPv4 tölu." @@ -355,10 +367,10 @@ msgid_plural "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" -"Gildið má mest vera %(limit_value)d stafur að lengd (það er %(show_value)d " +"Gildið má minnst vera %(limit_value)d stafur að lengd (það er %(show_value)d " "nú)" msgstr[1] "" -"Gildið má mest vera %(limit_value)d stafir að lengd (það er %(show_value)d " +"Gildið má minnst vera %(limit_value)d stafir að lengd (það er %(show_value)d " "nú)" #, python-format @@ -369,7 +381,11 @@ msgid_plural "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Gildið má mest vera %(limit_value)d stafur að lengd (það er %(show_value)d " +"nú)" msgstr[1] "" +"Gildið má mest vera %(limit_value)d stafir að lengd (það er %(show_value)d " +"nú)" #, python-format msgid "Ensure that there are no more than %(max)s digit in total." @@ -380,27 +396,36 @@ msgstr[1] "Gildið má ekki hafa fleiri en %(max)s tölur." #, 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[0] "Gildið má ekki hafa meira en %(max)s tugatölustaf (decimal places)." msgstr[1] "" +"Gildið má ekki hafa meira en %(max)s tugatölustafi (decimal places)." #, 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] "" +msgstr[0] "Gildið má ekki hafa fleiri en %(max)s tölu fyrir tugabrotskil." +msgstr[1] "Gildið má ekki hafa fleiri en %(max)s tölur fyrir tugabrotskil." + +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Skrár með endingunni '%(extension)s' eru ekki leyfðar. Leyfilegar endingar " +"eru: '%(allowed_extensions)s'." msgid "and" msgstr "og" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" +msgstr "%(model_name)s með þessi %(field_labels)s er nú þegar til." #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "" +msgstr "Gildið %(value)r er ógilt." msgid "This field cannot be null." msgstr "Þessi reitur getur ekki haft tómgildi (null)." @@ -418,6 +443,8 @@ msgstr "%(model_name)s með þetta %(field_label)s er nú þegar til." msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" +"%(field_label)s verður að vera einkvæmt fyrir %(date_field_label)s " +"%(lookup_type)s." #, python-format msgid "Field of type: %(field_type)s" @@ -428,14 +455,14 @@ msgstr "Heiltala" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "" +msgstr "Gildi '%(value)s' verður að vera heiltala." msgid "Big (8 byte) integer" msgstr "Stór (8 bæta) heiltala" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "" +msgstr "'%(value)s' verður að vera annaðhvort satt eða ósatt." msgid "Boolean (Either True or False)" msgstr "Boole-gildi (True eða False)" @@ -452,12 +479,14 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"'%(value)s' er ógilt dagsetningarsnið. Það verður að vera á sniðinu 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' hefur rétt snið (YYYY-MM-DD) en dagsetningin er ógild." msgid "Date (without time)" msgstr "Dagsetning (án tíma)" @@ -467,19 +496,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' hefur ógilt snið. Það verður að vera á sniðinu: 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' hefur rétt snið (YYYY-MM-DD HH:MM [:ss[.uuuuuu]][TZ]) en það er " +"ógild dagsetning/tími." msgid "Date (with time)" msgstr "Dagsetning (með tíma)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "" +msgstr "'%(value)s' verður að vera tugatala." msgid "Decimal number" msgstr "Tugatala" @@ -489,9 +522,11 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" +"'%(value)s' er á ógildu sniði. Það verður að vera á sniðinu [DD] [HH:" +"[MM:]]ss[.uuuuuu]." msgid "Duration" -msgstr "" +msgstr "Tímalengd" msgid "Email address" msgstr "Netfang" @@ -501,7 +536,7 @@ msgstr "Skjalaslóð" #, python-format msgid "'%(value)s' value must be a float." -msgstr "" +msgstr "'%(value)s' verður að vera fleytitala." msgid "Floating point number" msgstr "Fleytitala (floating point number)" @@ -514,7 +549,7 @@ msgstr "IP tala" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "" +msgstr "'%(value)s' verður að vera eitt eftirtalinna: None, True eða False." msgid "Boolean (Either True, False or None)" msgstr "Boole-gildi (True, False eða None)" @@ -540,12 +575,16 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"'%(value)s' er á ógildu sniði. Það verður að vera á sniðinu 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' er á réttu sniði (HH:MM[:ss[.uuuuuu]]), en það er ógild " +"dagsetning/tími." msgid "Time" msgstr "Tími" @@ -554,11 +593,11 @@ msgid "URL" msgstr "Veffang" msgid "Raw binary data" -msgstr "" +msgstr "Hrá tvíundargögn (binary data)" #, python-format msgid "'%(value)s' is not a valid UUID." -msgstr "" +msgstr "'%(value)s' er ekki gilt UUID." msgid "File" msgstr "Skrá" @@ -568,7 +607,7 @@ msgstr "Mynd" #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." -msgstr "" +msgstr "%(model)s hlutur með %(field)s %(value)r er ekki til." msgid "Foreign Key (type determined by related field)" msgstr "Ytri lykill (Gerð ákveðin af skyldum reit)" @@ -578,11 +617,11 @@ msgstr "Einn-á-einn samband." #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s samband" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s sambönd" msgid "Many-to-many relationship" msgstr "Margir-til-margra samband." @@ -591,16 +630,16 @@ msgstr "Margir-til-margra samband." #. characters will prevent the default label_suffix to be appended to the #. label msgid ":?.!" -msgstr "" +msgstr ":?.!" msgid "This field is required." msgstr "Þennan reit þarf að fylla út." msgid "Enter a whole number." -msgstr "Sláðu inn heila tölu." +msgstr "Sláðu inn heiltölu." msgid "Enter a number." -msgstr "Sláðu inn heila tölu." +msgstr "Sláðu inn tölu." msgid "Enter a valid date." msgstr "Sláðu inn gilda dagsetningu." @@ -658,7 +697,7 @@ msgstr "Sláðu inn gilt UUID." #. Translators: This is the default suffix added to form field labels msgid ":" -msgstr "" +msgstr ":" #, python-format msgid "(Hidden field %(name)s) %(error)s" @@ -725,15 +764,15 @@ msgstr "" "%(datetime)s er ekki hægt að túlka í tímabelti %(current_timezone)s, það " "getur verið óljóst eða að það er ekki til." +msgid "Clear" +msgstr "Hreinsa" + msgid "Currently" msgstr "Eins og er:" msgid "Change" msgstr "Breyta" -msgid "Clear" -msgstr "Hreinsa" - msgid "Unknown" msgstr "Óþekkt" @@ -869,7 +908,7 @@ msgid "December" msgstr "desember" msgid "jan" -msgstr "Jan" +msgstr "jan" msgid "feb" msgstr "feb" @@ -1066,23 +1105,37 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Þú ert að fá þessi skilaboð því þetta HTTPS vefsvæði þarfnast að vafrinn " +"þinn sendi ‚Referer‘ haus (e. referer header) sem var ekki sendur. Þessi " +"haus er nauðsynlegur af öryggisástæðum til að ganga úr skugga um að " +"utanaðkomandi aðili sé ekki að senda fyrirspurnir úr vafranum þínum." 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 "" +"Ef þú hefur stillt vafrann þinn til að gera ‚Referer‘ hausa óvirka þarftu að " +"virkja þá aftur. Að minnsta kosti fyrir þetta vefsvæði, eða HTTPS tengingar " +"eða ‚same-origin‘ fyrirspurnir." 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 "" +"Þú ert að fá þessi skilaboð því þetta vefsvæði þarfnast að CSRF kaka (e. " +"cookie) sé send þegar form eru send. Þessi kaka er nauðsynleg af " +"öryggisástæðum til að ganga úr skugga um að utanaðkomandi aðili sé ekki að " +"senda fyrirspurnir úr vafranum þínum." 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 "" +"Ef þú hefur stillt vafrann þinn til að gera kökur óvirkar þarftu að virkja " +"þær aftur. Að minnsta kosti fyrir þetta vefsvæði eða ‚same-origin‘ " +"fyrirspurnir." msgid "More information is available with DEBUG=True." msgstr "Meiri upplýsingar fást með DEBUG=True." @@ -1097,11 +1150,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Til hamingju með fyrstu Django síðuna þína." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Þetta er auðvitað ekki nóg. Næst skaltu búa til fyrsta appið þitt með því að " -"nota skipuninapython manage.py startapp [app_heiti]." +"Næst skaltu búa til fyrsta appið þitt með því að nota skipuninapython " +"manage.py startapp [app_heiti]." msgid "" "You're seeing this message because you have DEBUG = True in " @@ -1124,7 +1177,7 @@ msgstr "Engin vika tilgreind" #, python-format msgid "No %(verbose_name_plural)s available" -msgstr "Ekkert %(verbose_name_plural)s í boði." +msgstr "Ekkert %(verbose_name_plural)s í boði" #, python-format msgid "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index c55552559fc3..74e8b8387d3b 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 90473ed12dd4..235b68f47e1d 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# bbstuntman , 2017 # Carlo Miron , 2011 # Carlo Miron , 2014 # Denis Darii , 2011 @@ -10,16 +11,17 @@ # Luciano De Falco Alfano, 2016 # Marco Bonetti, 2014 # Nicola Larosa , 2013 -# palmux , 2014-2015 +# palmux , 2014-2015,2017 # Mattia Procopio , 2015 +# Riccardo Magliocchetti , 2017 # Stefano Brentegani , 2014-2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-28 11:39+0000\n" -"Last-Translator: Stefano Brentegani \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-31 10:55+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -304,6 +306,15 @@ msgstr "File statici" msgid "Syndication" msgstr "Aggregazione" +msgid "That page number is not an integer" +msgstr "Quel numero di pagina non è un integer" + +msgid "That page number is less than 1" +msgstr "Quel numero di pagina è minore di 1" + +msgid "That page contains no results" +msgstr "Quella pagina non presenta alcun risultato" + msgid "Enter a valid value." msgstr "Inserisci un valore valido." @@ -403,6 +414,14 @@ msgstr[0] "Assicurati che non vi sia più di %(max)s cifra prima della virgola." msgstr[1] "" "Assicurati che non vi siano più di %(max)s cifre prima della virgola." +#, python-format +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 "and" msgstr "e" @@ -441,14 +460,14 @@ msgstr "Intero" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "Il valore di '%(value)s' deve essere un intero." +msgstr "Il valore '%(value)s' deve essere un intero." msgid "Big (8 byte) integer" msgstr "Intero grande (8 byte)" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "Il valore dir '%(value)s' deve essere Vero oppure Falso." +msgstr "Il valore '%(value)s' deve essere True oppure False." msgid "Boolean (Either True or False)" msgstr "Booleano (Vero o Falso)" @@ -465,7 +484,7 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -"Il valore di '%(value)s' ha un formato di data non valido. Deve essere nel " +"Il valore '%(value)s' ha un formato di data invalido. Deve essere nel " "formato AAAA-MM-GG." #, python-format @@ -484,8 +503,8 @@ msgid "" "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -"Il valore di '%(value)s' ha un formato non valido. Deve essere nel formato " -"AAAA-MM-GG HH:MM[:ss[.uuuuuu]][TZ]" +"Il valore '%(value)s' ha un formato non valido. Deve essere nel formato AAAA-" +"MM-GG HH:MM[:ss[.uuuuuu]][TZ]" #, python-format msgid "" @@ -500,7 +519,7 @@ msgstr "Data (con ora)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "Il valore di '%(value)s' deve essere un numero decimale." +msgstr "Il valore '%(value)s' deve essere un numero decimale." msgid "Decimal number" msgstr "Numero decimale" @@ -510,8 +529,8 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" -"Il valore di '%(value)s' ha un formato non valido. Deve essere nel formato " -"[GG][HH:[MM:]]ss[.uuuuuu]" +"Il valore '%(value)s' ha un formato non valido. Deve essere nel formato [GG]" +"[HH:[MM:]]ss[.uuuuuu]." msgid "Duration" msgstr "Durata" @@ -524,7 +543,7 @@ msgstr "Percorso file" #, python-format msgid "'%(value)s' value must be a float." -msgstr "Il valore di '%(value)s' deve essere un numero a virgola mobile." +msgstr "Il valore '%(value)s' deve essere un numero a virgola mobile." msgid "Floating point number" msgstr "Numero in virgola mobile" @@ -537,7 +556,7 @@ msgstr "Indirizzo IP" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "Il valore di '%(value)s' deve essere None, True oppure False." +msgstr "Il valore '%(value)s' deve essere None, True oppure False." msgid "Boolean (Either True, False or None)" msgstr "Booleano (True, False o None)" @@ -563,8 +582,8 @@ 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]]." +"Il valore '%(value)s' ha un formato non valido. Deve essere nel formato HH:" +"MM[:ss[.uuuuuu]]." #, python-format msgid "" @@ -756,15 +775,15 @@ msgstr "" " %(datetime)s non può essere interpretato nel fuso orario " "%(current_timezone)s: potrebbe essere ambiguo o non esistere." +msgid "Clear" +msgstr "Svuota" + msgid "Currently" msgstr "Attualmente" msgid "Change" msgstr "Cambia" -msgid "Clear" -msgstr "Svuota" - msgid "Unknown" msgstr "Sconosciuto" @@ -1140,11 +1159,10 @@ msgid "Congratulations on your first Django-powered page." msgstr "Congratulazioni per la tua prima pagina Django-powered." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Naturalmente non hai ancora svolto alcun lavoro. Il prossimo passo è creare " -"la tua prima app inserendo il comando python manage.py startapp " +"Ora, crea la tua prima app eseguendo python manage.py startapp " "[nome_app]" msgid "" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index 83c6a1c49114..0a3cd1e11296 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index abfbd05b491b..060b88f1bdf7 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -4,15 +4,15 @@ # xiu1 , 2016 # Jannis Leidel , 2011 # Kentaro Hori , 2015 -# Shinya Okano , 2012-2016 +# Shinya Okano , 2012-2017 # Tetsuya Morimoto , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-10 13:16+0000\n" -"Last-Translator: xiu1 \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-25 09:49+0000\n" +"Last-Translator: Shinya Okano \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -297,6 +297,15 @@ 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 "値を正しく入力してください。" @@ -385,6 +394,14 @@ 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 "and" msgstr "と" @@ -728,15 +745,15 @@ msgstr "" "%(datetime)s は%(current_timezone)sのタイムゾーンでは解釈できませんでした。そ" "れは曖昧であるか、存在しない可能性があります。" +msgid "Clear" +msgstr "クリア" + msgid "Currently" msgstr "現在" msgid "Change" msgstr "変更" -msgid "Clear" -msgstr "クリア" - msgid "Unknown" msgstr "不明" @@ -1104,11 +1121,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "おめでとうございます、Djangoで出力された最初のページです。" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"もちろん、実際にはまだ少しも作業をしていません。次は、 python manage." -"py startapp [app_label] を実行して、最初のアプリを開始します。" +"次は、 python manage.py startapp [app_label] を実行して、最初の" +"アプリを開始します。" msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ka/LC_MESSAGES/django.mo b/django/conf/locale/ka/LC_MESSAGES/django.mo index f1d45568f32f..9f95c79fa97c 100644 Binary files a/django/conf/locale/ka/LC_MESSAGES/django.mo and b/django/conf/locale/ka/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ka/LC_MESSAGES/django.po b/django/conf/locale/ka/LC_MESSAGES/django.po index fe020ab33c6c..291153e55990 100644 --- a/django/conf/locale/ka/LC_MESSAGES/django.po +++ b/django/conf/locale/ka/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Georgian (http://www.transifex.com/django/django/language/" "ka/)\n" @@ -295,6 +295,15 @@ msgstr "სტატიკური ფაილები" msgid "Syndication" msgstr "სინდიკაცია" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "შეიყვანეთ სწორი მნიშვნელობა." @@ -381,6 +390,12 @@ msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "და" @@ -719,15 +734,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "წაშლა" + msgid "Currently" msgstr "ამჟამად" msgid "Change" msgstr "შეცვლა" -msgid "Clear" -msgstr "წაშლა" - msgid "Unknown" msgstr "გაურკვეველი" @@ -1084,8 +1099,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "გილოცავთ თქვენს პრიველ Django-ზე მომუშავე გვერდს." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/kk/LC_MESSAGES/django.mo b/django/conf/locale/kk/LC_MESSAGES/django.mo index a25f3f005710..86adc38bb68c 100644 Binary files a/django/conf/locale/kk/LC_MESSAGES/django.mo and b/django/conf/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/kk/LC_MESSAGES/django.po b/django/conf/locale/kk/LC_MESSAGES/django.po index b763701485bc..b4ce8c0b4e85 100644 --- a/django/conf/locale/kk/LC_MESSAGES/django.po +++ b/django/conf/locale/kk/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # Translators: # Baurzhan Muftakhidinov , 2015 # Zharzhan Kulmyrza , 2011 +# Leo Trubach , 2017 # Nurlan Rakhimzhanov , 2011 # yun_man_ger , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" @@ -295,6 +296,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Тура мәнін енгізіңіз." @@ -380,6 +390,12 @@ msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "және" @@ -703,15 +719,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "Тазалау" + msgid "Currently" msgstr "Ағымдағы" msgid "Change" msgstr "Түзету" -msgid "Clear" -msgstr "Тазалау" - msgid "Unknown" msgstr "Белгісіз" @@ -883,11 +899,11 @@ msgstr "жел" msgctxt "abbrev. month" msgid "Jan." -msgstr "Ақп." +msgstr "Қаң." msgctxt "abbrev. month" msgid "Feb." -msgstr "Қаң." +msgstr "Ақп." msgctxt "abbrev. month" msgid "March" @@ -1068,8 +1084,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/km/LC_MESSAGES/django.mo b/django/conf/locale/km/LC_MESSAGES/django.mo index 2ffa89d3411a..498778bf9826 100644 Binary files a/django/conf/locale/km/LC_MESSAGES/django.mo and b/django/conf/locale/km/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/km/LC_MESSAGES/django.po b/django/conf/locale/km/LC_MESSAGES/django.po index 2a94fc846d22..ce9e8e97aa3f 100644 --- a/django/conf/locale/km/LC_MESSAGES/django.po +++ b/django/conf/locale/km/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Khmer (http://www.transifex.com/django/django/language/km/)\n" "MIME-Version: 1.0\n" @@ -292,6 +292,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "" @@ -372,6 +381,12 @@ msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "និង" @@ -691,15 +706,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "" + msgid "Currently" msgstr "" msgid "Change" msgstr "ផ្លាស់ប្តូរ" -msgid "Clear" -msgstr "" - msgid "Unknown" msgstr "មិន​ដឹង" @@ -1056,8 +1071,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/kn/LC_MESSAGES/django.mo b/django/conf/locale/kn/LC_MESSAGES/django.mo index 3140001b7bf8..4b4f1ad6eafc 100644 Binary files a/django/conf/locale/kn/LC_MESSAGES/django.mo and b/django/conf/locale/kn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/kn/LC_MESSAGES/django.po b/django/conf/locale/kn/LC_MESSAGES/django.po index fd9331d77535..cb012eacdf6b 100644 --- a/django/conf/locale/kn/LC_MESSAGES/django.po +++ b/django/conf/locale/kn/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Kannada (http://www.transifex.com/django/django/language/" "kn/)\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "ಸಿಂಧುವಾದ ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಿ." @@ -382,6 +391,12 @@ msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "ಮತ್ತು" @@ -712,15 +727,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "ಮುಕ್ತಗೊಳಿಸು" + msgid "Currently" msgstr "ಪ್ರಸಕ್ತ" msgid "Change" msgstr "ಬದಲಾವಣೆ" -msgid "Clear" -msgstr "ಮುಕ್ತಗೊಳಿಸು" - msgid "Unknown" msgstr "ಗೊತ್ತಿರದ" @@ -1077,8 +1092,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo index de0026924d51..bce3cf503722 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/django.mo and b/django/conf/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po index d731b63dca33..e391d7b2f0bd 100644 --- a/django/conf/locale/ko/LC_MESSAGES/django.po +++ b/django/conf/locale/ko/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # Ian Y. Choi , 2015 # Jaehong Kim , 2011 # Jannis Leidel , 2011 -# Jeong Seongtae , 2014,2016 +# Le Tartuffe , 2014,2016 # JuneHyeon Bae , 2014 # Chr0m3 , 2015 # Subin Choi , 2016 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-16 06:09+0000\n" -"Last-Translator: Jiyoon, Ha \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \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" @@ -301,6 +301,15 @@ msgstr "정적 파일" msgid "Syndication" msgstr "신디케이션" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "올바른 값을 입력하세요." @@ -389,6 +398,12 @@ 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 "" + msgid "and" msgstr "또한" @@ -727,15 +742,15 @@ msgstr "" "%(datetime)s 은/는 %(current_timezone)s 시간대에서 해석될 수 없습니다; 정보" "가 모호하거나 존재하지 않을 수 있습니다." +msgid "Clear" +msgstr "취소" + msgid "Currently" msgstr "현재" msgid "Change" msgstr "변경" -msgid "Clear" -msgstr "취소" - msgid "Unknown" msgstr "알 수 없습니다." @@ -1103,11 +1118,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "첫 번째 Django 페이지를 만든 것을 축하드립니다." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"물론, 당신은 아직 어떤 결과물을 만든 것은 아닙니다. 첫 어플리케이션은 다음 명" -"령을 실행하여 시작하세요. python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/lt/LC_MESSAGES/django.mo b/django/conf/locale/lt/LC_MESSAGES/django.mo index 3d71e458e3a8..551995e5365f 100644 Binary files a/django/conf/locale/lt/LC_MESSAGES/django.mo and b/django/conf/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/lt/LC_MESSAGES/django.po b/django/conf/locale/lt/LC_MESSAGES/django.po index 0e78097cd69c..51a970ad7393 100644 --- a/django/conf/locale/lt/LC_MESSAGES/django.po +++ b/django/conf/locale/lt/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # Jannis Leidel , 2011 # Kostas , 2011 # lauris , 2011 -# Matas Dailyda , 2015-2016 +# Matas Dailyda , 2015-2017 # naktinis , 2012 # Nikolajus Krauklis , 2013 # Povilas Balzaravičius , 2011-2012 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-18 09:11+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-30 14:06+0000\n" "Last-Translator: Matas Dailyda \n" "Language-Team: Lithuanian (http://www.transifex.com/django/django/language/" "lt/)\n" @@ -302,6 +302,15 @@ msgstr "Statiniai failai" msgid "Syndication" msgstr "Sindikacija" +msgid "That page number is not an integer" +msgstr "To puslapio numeris nėra sveikasis skaičius." + +msgid "That page number is less than 1" +msgstr "To numerio puslapis yra mažesnis už 1" + +msgid "That page contains no results" +msgstr "Tas puslapis neturi jokių rezultatų" + msgid "Enter a valid value." msgstr "Įveskite tinkamą reikšmę." @@ -412,6 +421,14 @@ msgstr[1] "" msgstr[2] "" "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenų prieš kablelį." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Bylos tipas '%(extension)s' negalimas. Galimi tipai yra: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "ir" @@ -766,15 +783,15 @@ msgstr "" "Nepavyko interpretuoti %(datetime)s %(current_timezone)s laiko juostoje; " "Data gali turėti keletą reikšmių arba neegzistuoti." +msgid "Clear" +msgstr "Išvalyti" + msgid "Currently" msgstr "Šiuo metu" msgid "Change" msgstr "Pakeisti" -msgid "Clear" -msgstr "Išvalyti" - msgid "Unknown" msgstr "Nežinomas" @@ -1157,11 +1174,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Sveikiname Jus su Jūsų pirmuoju Django tinklalapiu." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Kolkas Jūs neatlikote jokių darbų. Paleiskite savo pirmąją aplikaciją " -"suvesdami python manage.py startapp [app_label]." +"Toliau, pradėkite pirmą savo aplikaciją paleisdami python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo index 6c36efea224f..e8835b1fd349 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 03f017ccdef3..252551b4729d 100644 --- a/django/conf/locale/lv/LC_MESSAGES/django.po +++ b/django/conf/locale/lv/LC_MESSAGES/django.po @@ -4,12 +4,14 @@ # edgars , 2011 # Jannis Leidel , 2011 # krikulis , 2014 +# Māris Nartišs , 2016 +# peterisb , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -72,7 +74,7 @@ msgid "English" msgstr "angļu" msgid "Australian English" -msgstr "" +msgstr "Austrālijas angļu" msgid "British English" msgstr "Lielbritānijas angļu" @@ -120,7 +122,7 @@ msgid "Irish" msgstr "īru" msgid "Scottish Gaelic" -msgstr "" +msgstr "skotu gēlu" msgid "Galician" msgstr "galīciešu" @@ -273,7 +275,7 @@ msgid "Ukrainian" msgstr "ukraiņu" msgid "Urdu" -msgstr "" +msgstr "urdu" msgid "Vietnamese" msgstr "vjetnamiešu" @@ -285,7 +287,7 @@ msgid "Traditional Chinese" msgstr "tradicionālā ķīniešu" msgid "Messages" -msgstr "" +msgstr "Ziņojumi" msgid "Site Maps" msgstr "Lapas kartes" @@ -296,6 +298,15 @@ msgstr "Statiski faili" msgid "Syndication" msgstr "Sindikācija" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Ievadiet korektu vērtību." @@ -318,6 +329,8 @@ msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Ievadiet korektu 'vienkāršā teksta' vērtību, kas satur tikai burtus, " +"numurus, apakšsvītras vai šķērssvītras." msgid "Enter a valid IPv4 address." msgstr "Ievadiet korektu IPv4 adresi." @@ -394,16 +407,22 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "un" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" +msgstr "%(model_name)s ar šiem %(field_labels)s jau eksistē." #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "" +msgstr "Vērtība %(value)r ir nederīga izvēle." msgid "This field cannot be null." msgstr "Šis lauks nevar neksistēt (būt null)." @@ -431,14 +450,14 @@ msgstr "Vesels skaitlis" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "" +msgstr "'%(value)s' vērtībai ir jābūt veselam skaitlim." msgid "Big (8 byte) integer" msgstr "Liels (8 baitu) vesels skaitlis" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "" +msgstr "'%(value)s' vērtībai ir jābūt vai nu True vai False." msgid "Boolean (Either True or False)" msgstr "Boolean (True vai False)" @@ -455,12 +474,15 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"'%(value)s' vērtība ir nepareizā datuma formātā. Pareizs formāts ir GGGG-MM-" +"DD." #, python-format msgid "" "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"'%(value)s' vērtība ir pareizā formātā (GGGG-MM-DD), bet ir nederīgs datums." msgid "Date (without time)" msgstr "Datums (bez laika)" @@ -494,7 +516,7 @@ msgid "" msgstr "" msgid "Duration" -msgstr "" +msgstr "Ilgums" msgid "Email address" msgstr "E-pasta adrese" @@ -504,7 +526,7 @@ msgstr "Faila ceļš" #, python-format msgid "'%(value)s' value must be a float." -msgstr "" +msgstr "'%(value)s' vērtībai ir jābūt daļskaitlim." msgid "Floating point number" msgstr "Plūstošā punkta skaitlis" @@ -561,7 +583,7 @@ msgstr "Bināri dati" #, python-format msgid "'%(value)s' is not a valid UUID." -msgstr "" +msgstr "'%(value)s' ir nederīgs UUID." msgid "File" msgstr "Fails" @@ -615,7 +637,7 @@ msgid "Enter a valid date/time." msgstr "Ievadiet korektu datumu/laiku." msgid "Enter a valid duration." -msgstr "" +msgstr "Ievadiet korektu ilgumu." msgid "No file was submitted. Check the encoding type on the form." msgstr "Nav nosūtīts fails. Pārbaudiet formas kodējuma tipu." @@ -655,7 +677,7 @@ msgid "Enter a complete value." msgstr "Ievadiet pilnu vērtību." msgid "Enter a valid UUID." -msgstr "" +msgstr "Ievadi derīgu UUID." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -663,7 +685,7 @@ msgstr "" #, python-format msgid "(Hidden field %(name)s) %(error)s" -msgstr "" +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" @@ -724,15 +746,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "Notīrīt" + msgid "Currently" -msgstr "" +msgstr "Pašlaik" msgid "Change" msgstr "Izmainīt" -msgid "Clear" -msgstr "" - msgid "Unknown" msgstr "Nezināms" @@ -906,11 +928,11 @@ msgstr "dec" msgctxt "abbrev. month" msgid "Jan." -msgstr "" +msgstr "Jan." msgctxt "abbrev. month" msgid "Feb." -msgstr "" +msgstr "Feb." msgctxt "abbrev. month" msgid "March" @@ -934,23 +956,23 @@ msgstr "jūlijs" msgctxt "abbrev. month" msgid "Aug." -msgstr "" +msgstr "Aug." msgctxt "abbrev. month" msgid "Sept." -msgstr "" +msgstr "Sept." msgctxt "abbrev. month" msgid "Oct." -msgstr "" +msgstr "Okt." msgctxt "abbrev. month" msgid "Nov." -msgstr "" +msgstr "Nov." msgctxt "abbrev. month" msgid "Dec." -msgstr "" +msgstr "Dec." msgctxt "alt. month" msgid "January" @@ -1058,7 +1080,7 @@ msgstr[1] "" msgstr[2] "" msgid "0 minutes" -msgstr "" +msgstr "0 minūšu" msgid "Forbidden" msgstr "Aizliegts" @@ -1094,17 +1116,17 @@ msgid "More information is available with DEBUG=True." msgstr "Vairāk informācijas ir pieejams ar DEBUG=True" msgid "Welcome to Django" -msgstr "" +msgstr "Esi sveicināts Django" msgid "It worked!" -msgstr "" +msgstr "Nostrādāja!" msgid "Congratulations on your first Django-powered page." -msgstr "" +msgstr "Apsveicam, tava pirmā Django darbinātā lapa." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo index 4ffceeb03c4d..23efbe6ad636 100644 Binary files a/django/conf/locale/mk/LC_MESSAGES/django.mo and b/django/conf/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po index 371752271212..5d2b04202afb 100644 --- a/django/conf/locale/mk/LC_MESSAGES/django.po +++ b/django/conf/locale/mk/LC_MESSAGES/django.po @@ -3,15 +3,15 @@ # Translators: # dekomote , 2015 # Jannis Leidel , 2011 -# Vasil Vangelovski , 2016 +# Vasil Vangelovski , 2016-2017 # Vasil Vangelovski , 2013-2015 # Vasil Vangelovski , 2011-2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-08 09:35+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-05 09:39+0000\n" "Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" @@ -297,6 +297,15 @@ 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 "Внесете правилна вредност." @@ -400,6 +409,14 @@ msgstr[0] "" msgstr[1] "" "Осигурајте се дека нема повеќе од %(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 "and" msgstr "и" @@ -753,15 +770,15 @@ msgstr "" "%(datetime)s не може да се толкува во временска зона %(current_timezone)s; " "можеби е двосмислена или не постои." +msgid "Clear" +msgstr "Исчисти" + msgid "Currently" msgstr "Моментално" msgid "Change" msgstr "Измени" -msgid "Clear" -msgstr "Исчисти" - msgid "Unknown" msgstr "Непознато" @@ -1140,12 +1157,11 @@ msgstr "" "Ви честитаме на поставување на вашата прва страница подржана од Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Се разбира, сеуште немате направено ништо. Наредно, направете ја вашата прва " -"апликација со повикување на командата python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Наредно, направете ја вашата прва апликација со повикување на командата " +"python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ml/LC_MESSAGES/django.mo b/django/conf/locale/ml/LC_MESSAGES/django.mo index ce3f3db30131..97ddf0f87dd6 100644 Binary files a/django/conf/locale/ml/LC_MESSAGES/django.mo and b/django/conf/locale/ml/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ml/LC_MESSAGES/django.po b/django/conf/locale/ml/LC_MESSAGES/django.po index 316d54c1dc9f..91d022f27b4a 100644 --- a/django/conf/locale/ml/LC_MESSAGES/django.po +++ b/django/conf/locale/ml/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Malayalam (http://www.transifex.com/django/django/language/" "ml/)\n" @@ -297,6 +297,15 @@ msgstr " സ്റ്റാറ്റിക്ക് ഫയൽസ്" msgid "Syndication" msgstr "വിതരണം " +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "സാധുതയുള്ള മൂല്യം നല്‍കുക." @@ -384,6 +393,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "ഉം" @@ -721,15 +736,15 @@ msgstr "" "%(datetime)s %(current_timezone)s എന്ന സമയമേഖലയിലേക്ക് വ്യാഖ്യാനിക്കാന്‍ " "സാധിച്ചിട്ടില്ല; ഇത് ഒന്നുകില്‍ അവ്യക്തമാണ്, അല്ലെങ്കില്‍ നിലവിലില്ല." +msgid "Clear" +msgstr "കാലിയാക്കുക" + msgid "Currently" msgstr "നിലവിലുള്ളത്" msgid "Change" msgstr "മാറ്റുക" -msgid "Clear" -msgstr "കാലിയാക്കുക" - msgid "Unknown" msgstr "അജ്ഞാതം" @@ -1093,8 +1108,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "താങ്കളുടെ ആദ്യത്തെ ജാങ്കോ നിർമ്മിത പേജിന് അഭിനന്ദനങ്ങൾ" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/mn/LC_MESSAGES/django.mo b/django/conf/locale/mn/LC_MESSAGES/django.mo index 1b40af4d51f7..ad9abb75b2e0 100644 Binary files a/django/conf/locale/mn/LC_MESSAGES/django.mo and b/django/conf/locale/mn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/mn/LC_MESSAGES/django.po b/django/conf/locale/mn/LC_MESSAGES/django.po index 910407a940e5..4c266ce509c9 100644 --- a/django/conf/locale/mn/LC_MESSAGES/django.po +++ b/django/conf/locale/mn/LC_MESSAGES/django.po @@ -8,16 +8,16 @@ # jargalan , 2011 # Tsolmon , 2011 # Zorig , 2013-2014,2016 -# Анхбаяр Анхаа , 2013-2015 -# Баясгалан Цэвлээ , 2011,2015 +# Анхбаяр Анхаа , 2013-2016 +# Баясгалан Цэвлээ , 2011,2015,2017 # Ганзориг БП , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-13 07:03+0000\n" +"Last-Translator: Баясгалан Цэвлээ \n" "Language-Team: Mongolian (http://www.transifex.com/django/django/language/" "mn/)\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgid "German" msgstr "Герман" msgid "Lower Sorbian" -msgstr "" +msgstr "Доод Сорбин" msgid "Greek" msgstr "Грек" @@ -141,7 +141,7 @@ msgid "Croatian" msgstr "Хорват" msgid "Upper Sorbian" -msgstr "" +msgstr "Дээд Сорбин" msgid "Hungarian" msgstr "Унгар" @@ -204,7 +204,7 @@ msgid "Burmese" msgstr "Бирм" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Норвеги Бокмал" msgid "Nepali" msgstr "Непал" @@ -302,6 +302,15 @@ msgstr "Статик файлууд" msgid "Syndication" msgstr "Нэгтгэл" +msgid "That page number is not an integer" +msgstr "Хуудасны дугаар бүхэл тоо / Integer / биш байна" + +msgid "That page number is less than 1" +msgstr "Хуудасны дугаар 1-ээс байга байна" + +msgid "That page contains no results" +msgstr "Хуудас үр дүн агуулаагүй байна" + msgid "Enter a valid value." msgstr "Зөв утга оруулна уу." @@ -399,6 +408,14 @@ msgid_plural "" msgstr[0] "Энд бутархайн таслалаас өмнө %(max)s-аас олонгүй цифр байх ёстой." msgstr[1] "Энд бутархайн таслалаас өмнө %(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 "and" msgstr "ба" @@ -598,11 +615,11 @@ msgstr "Нэг-нэг холбоос" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s холбоос" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s холбоосууд" msgid "Many-to-many relationship" msgstr "Олон-олон холбоос" @@ -746,15 +763,15 @@ msgstr "" "%(datetime)s цагийн бүсийг хөрвүүлэж чадахгүй байна. %(current_timezone)s; " "цагийн бүс буруу эсвэл байхгүй байж магадгүй." +msgid "Clear" +msgstr "Цэвэрлэх" + msgid "Currently" msgstr "Одоогийн" msgid "Change" msgstr "Засах" -msgid "Clear" -msgstr "Цэвэрлэх" - msgid "Unknown" msgstr "Тодорхойгүй" @@ -1128,11 +1145,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Баяр хүргэе!. Таний эхний Django-оор хийсэн хуудас." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Мэдээж таны ажил дөнгөж эхлэж байна. Үүний дараа дараах коммандыг ажиллуулаж " -"эхний app аа үүсгэнэ. python manage.py startapp [app_label]." +"Одоо Та анхныхаа програмыг дараах командыг хийж ажиллуулна уу python " +"manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/nb/LC_MESSAGES/django.mo b/django/conf/locale/nb/LC_MESSAGES/django.mo index 53c5ff213f88..26d32a7c1272 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 8c7a20f6979d..17d086eb87d5 100644 --- a/django/conf/locale/nb/LC_MESSAGES/django.po +++ b/django/conf/locale/nb/LC_MESSAGES/django.po @@ -5,19 +5,19 @@ # Eirik Krogstad , 2014 # Jannis Leidel , 2011 # jensadne , 2014-2015 -# Jon , 2015-2016 -# Jon , 2014 -# Jon , 2013 -# Jon , 2011 +# Jon , 2015-2016 +# Jon , 2014 +# 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: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-27 08:59+0000\n" -"Last-Translator: Jon \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -302,6 +302,15 @@ msgstr "Statiske filer" msgid "Syndication" msgstr "Syndikering" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Oppgi en gyldig verdi." @@ -398,6 +407,12 @@ msgid_plural "" msgstr[0] "Sørg for at det kun %(max)s tall før desimalpunkt." msgstr[1] "Sørg for at det er %(max)s eller færre tall før desimalpunkt." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "og" @@ -740,15 +755,15 @@ msgstr "" "%(datetime)s kunne ikke tolkes i tidssonen %(current_timezone)s, det kan " "være tvetydig eller ikke eksistere." +msgid "Clear" +msgstr "Fjern" + msgid "Currently" msgstr "Nåværende" msgid "Change" msgstr "Endre" -msgid "Clear" -msgstr "Fjern" - msgid "Unknown" msgstr "Ukjent" @@ -1126,11 +1141,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "Gratulerer med din første Django-drevne side." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Selvfølgelig, du har ikke gjort noe faktisk arbeid enda. Nå kan du lage din " -"første app ved å kjøre python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ne/LC_MESSAGES/django.mo b/django/conf/locale/ne/LC_MESSAGES/django.mo index 528edd700ce5..640fc9d72e0a 100644 Binary files a/django/conf/locale/ne/LC_MESSAGES/django.mo and b/django/conf/locale/ne/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ne/LC_MESSAGES/django.po b/django/conf/locale/ne/LC_MESSAGES/django.po index e876d8e32a5f..ea8e523e8cc7 100644 --- a/django/conf/locale/ne/LC_MESSAGES/django.po +++ b/django/conf/locale/ne/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-15 15:53+0000\n" -"Last-Translator: Sagar Chalise \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \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" @@ -295,6 +295,15 @@ msgstr "स्टेेटिक फाइलहरु" msgid "Syndication" msgstr "सिन्डिकेसन" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "उपयुक्त मान राख्नुहोस ।" @@ -388,6 +397,12 @@ msgid_plural "" msgstr[0] "दशमलव अघि %(max)s भन्दा बढी अक्षर नभएको निश्चित पार्नु होस ।" msgstr[1] "दशमलव अघि %(max)s भन्दा बढी अक्षरहरु नभएको निश्चित पार्नु होस ।" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "र" @@ -719,15 +734,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "सबै खाली गर्नु होस ।" + msgid "Currently" msgstr "अहिले" msgid "Change" msgstr "फेर्नुहोस" -msgid "Clear" -msgstr "सबै खाली गर्नु होस ।" - msgid "Unknown" msgstr "अज्ञात" @@ -1091,16 +1106,16 @@ msgid "Congratulations on your first Django-powered page." msgstr "Django ले बनाइएको प्रथम वेब पृष्ठको लागी तपाईँलाई शुभकामना ।" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"सबै काम सिद्धिएको छैन । आफ्नो एप चलाउन python manage.py startapp " -"[app_label] राख्नु होस ।" msgid "" "You're seeing this message because you have DEBUG = True in " "your Django settings file and you haven't configured any URLs. Get to work!" msgstr "" +"सेटिङमा DEBUG = True राख्नाले यो सूचना देखी राख्नु भएको छ । अगाडि बढ्नु " +"होस ।" msgid "No year specified" msgstr "साल तोकिएको छैन ।" diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index 13c72a660313..cbf223d13241 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 43ffbbeafe78..56892388d088 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -3,23 +3,25 @@ # Translators: # Bas Peschier , 2011,2013 # Blue , 2011-2012 -# Bouke Haarsma , 2013 +# Bouke Haarsma , 2013 # Claude Paroz , 2014 # Erik Romijn , 2013 +# Evelijn Saaltink , 2016 # Harro van der Klauw , 2011-2012 # Ilja Maas , 2015 # Jannis Leidel , 2011 # Jeffrey Gelens , 2011-2012,2014 # Michiel Overtoom , 2014 -# Sander Steffann , 2014-2015 +# Sander Steffann , 2014-2015 # Tino de Bruijn , 2013 +# Tonnes , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-05-02 10:55+0000\n" +"Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +39,7 @@ msgid "Asturian" msgstr "Asturisch" msgid "Azerbaijani" -msgstr "Azerbaijani" +msgstr "Azerbeidzjaans" msgid "Bulgarian" msgstr "Bulgaars" @@ -58,7 +60,7 @@ msgid "Catalan" msgstr "Catalaans" msgid "Czech" -msgstr "Tjechisch" +msgstr "Tsjechisch" msgid "Welsh" msgstr "Welsh" @@ -70,7 +72,7 @@ msgid "German" msgstr "Duits" msgid "Lower Sorbian" -msgstr "" +msgstr "Nedersorbisch" msgid "Greek" msgstr "Grieks" @@ -91,10 +93,10 @@ msgid "Spanish" msgstr "Spaans" msgid "Argentinian Spanish" -msgstr "Argentijns-Spaans" +msgstr "Argentijns Spaans" msgid "Colombian Spanish" -msgstr "Columbiaans Spaans" +msgstr "Colombiaans Spaans" msgid "Mexican Spanish" msgstr "Mexicaans Spaans" @@ -142,7 +144,7 @@ msgid "Croatian" msgstr "Kroatisch" msgid "Upper Sorbian" -msgstr "" +msgstr "Oppersorbisch" msgid "Hungarian" msgstr "Hongaars" @@ -196,7 +198,7 @@ msgid "Malayalam" msgstr "Malayalam" msgid "Mongolian" -msgstr "Mongolisch" +msgstr "Mongools" msgid "Marathi" msgstr "Marathi" @@ -205,7 +207,7 @@ msgid "Burmese" msgstr "Birmaans" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Noors Bokmål" msgid "Nepali" msgstr "Nepalees" @@ -214,7 +216,7 @@ msgid "Dutch" msgstr "Nederlands" msgid "Norwegian Nynorsk" -msgstr "Noorse Nynorsk" +msgstr "Noors Nynorsk" msgid "Ossetic" msgstr "Ossetisch" @@ -265,7 +267,7 @@ msgid "Telugu" msgstr "Telegu" msgid "Thai" -msgstr "Thais" +msgstr "Thai" msgid "Turkish" msgstr "Turks" @@ -303,42 +305,51 @@ msgstr "Statische bestanden" msgid "Syndication" msgstr "Syndicatie" +msgid "That page number is not an integer" +msgstr "Dat paginanummer is geen geheel getal" + +msgid "That page number is less than 1" +msgstr "Dat paginanummer is kleiner dan 1" + +msgid "That page contains no results" +msgstr "Die pagina bevat geen resultaten" + msgid "Enter a valid value." -msgstr "Geef een geldige waarde." +msgstr "Voer een geldige waarde in." msgid "Enter a valid URL." -msgstr "Geef een geldige URL op." +msgstr "Voer een geldige URL in." msgid "Enter a valid integer." -msgstr "Geef een geldig geheel getal op." +msgstr "Voer een geldig geheel getal in." msgid "Enter a valid email address." -msgstr "Vul een geldig emailadres in." +msgstr "Voer een geldig e-mailadres in." msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -"Vul een geldigde 'slug' in, bestaande uit letters, cijfers, liggende " +"Voer een geldige 'slug' in, bestaande uit letters, cijfers, liggende " "streepjes en verbindingsstreepjes." msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -"Vul een geldigde 'slug' in, bestaande uit Unicode letters, cijfers, liggende " -"streepjes of verbindingsstreepjes." +"Voer een geldige 'slug' in, bestaande uit Unicode-letters, cijfers, liggende " +"streepjes en verbindingsstreepjes." msgid "Enter a valid IPv4 address." -msgstr "Geef een geldig IPv4-adres op." +msgstr "Voer een geldig IPv4-adres in." msgid "Enter a valid IPv6 address." msgstr "Voer een geldig IPv6-adres in." msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Voer een geldig IPv4 of IPv6-adres in." +msgstr "Voer een geldig IPv4- of IPv6-adres in." msgid "Enter only digits separated by commas." -msgstr "Geef alleen cijfers op, gescheiden door komma's." +msgstr "Voer alleen cijfers in, gescheiden door komma's." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." @@ -402,6 +413,14 @@ msgid_plural "" msgstr[0] "Zorg dat er niet meer dan %(max)s cijfer voor de komma staat." msgstr[1] "Zorg dat er niet meer dan %(max)s cijfers voor de komma staan." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Bestandsextensie '%(extension)s' is niet toegestaan. Toegestane extensies " +"zijn: '%(allowed_extensions)s'." + msgid "and" msgstr "en" @@ -440,21 +459,21 @@ msgstr "Geheel getal" #, python-format msgid "'%(value)s' value must be an integer." -msgstr "'%(value)s' waarde moet een geheel getal zijn." +msgstr "Waarde van '%(value)s' moet een geheel getal zijn." msgid "Big (8 byte) integer" msgstr "Groot (8 byte) geheel getal" #, python-format msgid "'%(value)s' value must be either True or False." -msgstr "'%(value)s' waarde moet True of False zijn." +msgstr "Waarde van '%(value)s' moet True of False zijn." msgid "Boolean (Either True or False)" msgstr "Boolean (True danwel False)" #, python-format msgid "String (up to %(max_length)s)" -msgstr "Karakterreeks (hooguit %(max_length)s)" +msgstr "Tekenreeks (hooguit %(max_length)s)" msgid "Comma-separated integers" msgstr "Komma-gescheiden gehele getallen" @@ -464,15 +483,15 @@ msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -"'%(value)s' waarde heeft een ongeldige datumnotatie. Deze moet in de YYYY-MM-" -"DD notatie opgegeven worden." +"Waarde van '%(value)s' heeft een ongeldige datumnotatie. De juiste notatie " +"is 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' waarde heeft een geldige notatie (YYYY-MM-DD) maar is een " +"Waarde van '%(value)s' heeft de juiste notatie (YYYY-MM-DD), maar het is een " "ongeldige datum." msgid "Date (without time)" @@ -483,23 +502,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' waarde heeft een ongeldige notatie. Deze moet in de YYYY-MM-DD " -"HH:MM[:ss[.uuuuuu]][TZ] notatie opgegeven worden." +"Waarde van '%(value)s' heeft een ongeldige notatie. De juiste notatie is " +"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' waarde heeft een geldige notatie (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) maar is een ongeldige datum/tijd." +"Waarde van '%(value)s' heeft de juiste notatie (YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ]), maar is een ongeldige datum/tijd." msgid "Date (with time)" msgstr "Datum (met tijd)" #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "'%(value)s' waarde moet een decimaal getal zijn." +msgstr "Waarde van '%(value)s' moet een decimaal getal zijn." msgid "Decimal number" msgstr "Decimaal getal" @@ -509,8 +528,8 @@ msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" -"'%(value)s' waarde heeft een ongeldig formaat. Het juiste formaat is [DD] " -"[HH:[MM:]]ss[.uuuuuu]." +"Waarde van '%(value)s' heeft een ongeldige notatie. De juiste notatie is " +"[DD] [HH:[MM:]]ss[.uuuuuu]." msgid "Duration" msgstr "Tijdsduur" @@ -523,20 +542,20 @@ msgstr "Bestandspad" #, python-format msgid "'%(value)s' value must be a float." -msgstr "'%(value)s' waarde moet een decimaal getal zijn." +msgstr "Waarde van '%(value)s' moet een drijvende-kommagetal zijn." msgid "Floating point number" -msgstr "Decimaal getal" +msgstr "Drijvende-kommagetal" msgid "IPv4 address" -msgstr "IPv4 address" +msgstr "IPv4-adres" msgid "IP address" msgstr "IP-adres" #, python-format msgid "'%(value)s' value must be either None, True or False." -msgstr "'%(value)s' waarde moet None, True of False zijn." +msgstr "Waarde van '%(value)s' moet None, True of False zijn." msgid "Boolean (Either True, False or None)" msgstr "Boolean (True, False of None)" @@ -562,16 +581,16 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -"'%(value)s' waarde heeft een ongeldige notatie. Deze moet in de HH:MM[:ss[." -"uuuuuu]] notatie opgegeven worden." +"Waarde van '%(value)s' heeft een ongeldige notatie. De juiste notatie is 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' waarde heeft een geldige notatie (HH:MM[:ss[.uuuuuu]]) maar is " -"een ongeldige tijd." +"Waarde van '%(value)s' heeft de juiste notatie (HH:MM[:ss[.uuuuuu]]), maar " +"het is een ongeldige tijd." msgid "Time" msgstr "Tijd" @@ -580,7 +599,7 @@ msgid "URL" msgstr "URL" msgid "Raw binary data" -msgstr "Ruwe binaire data" +msgstr "Onbewerkte binaire gegevens" #, python-format msgid "'%(value)s' is not a valid UUID." @@ -590,28 +609,28 @@ msgid "File" msgstr "Bestand" msgid "Image" -msgstr "Plaatje" +msgstr "Afbeelding" #, 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." msgid "Foreign Key (type determined by related field)" -msgstr "Refererende sleutel (type wordt bepaalde door gerelateerde veld)" +msgstr "Refererende sleutel (type wordt bepaald door gerelateerde veld)" msgid "One-to-one relationship" -msgstr "Één-op-één relatie" +msgstr "Een-op-een-relatie" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s-relatie" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s-relaties" msgid "Many-to-many relationship" -msgstr "Veel-op-veel relatie" +msgstr "Veel-op-veel-relatie" #. Translators: If found as last label character, these punctuation #. characters will prevent the default label_suffix to be appended to the @@ -623,22 +642,22 @@ msgid "This field is required." msgstr "Dit veld is verplicht." msgid "Enter a whole number." -msgstr "Geef een geheel getal op." +msgstr "Voer een geheel getal in." msgid "Enter a number." -msgstr "Geef een getal op." +msgstr "Voer een getal in." msgid "Enter a valid date." -msgstr "Geef een geldige datum op." +msgstr "Voer een geldige datum in." msgid "Enter a valid time." -msgstr "Geef een geldige tijd op." +msgstr "Voer een geldige tijd in." msgid "Enter a valid date/time." -msgstr "Geef een geldige datum/tijd op." +msgstr "Voer een geldige datum/tijd in." msgid "Enter a valid duration." -msgstr "Geef een geldige tijdsduur op." +msgstr "Voer een geldige tijdsduur in." msgid "No file was submitted. Check the encoding type on the form." msgstr "" @@ -663,7 +682,7 @@ msgstr[1] "" "nu %(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." -msgstr "Upload a.u.b. een bestand of vink de verwijder vink, niet allebei." +msgstr "Upload een bestand of vink het vakje Wissen aan, niet allebei." msgid "" "Upload a valid image. The file you uploaded was either not an image or a " @@ -677,13 +696,13 @@ msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Selecteer een geldige keuze. %(value)s is geen beschikbare keuze." msgid "Enter a list of values." -msgstr "Geef een lijst op met waardes." +msgstr "Voer een lijst met waarden in." msgid "Enter a complete value." -msgstr "Geef een volledige waarde op." +msgstr "Voer een volledige waarde in." msgid "Enter a valid UUID." -msgstr "Geef een geldige UUID op." +msgstr "Voer een geldige UUID in." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -705,8 +724,8 @@ msgstr[1] "Verstuur niet meer dan %d formulieren." #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." -msgstr[0] "Geef alstublieft %d of meer formulieren op." -msgstr[1] "Geef alstublieft %d of meer formulieren op." +msgstr[0] "Verstuur %d of meer formulieren." +msgstr[1] "Verstuur %d of meer formulieren." msgid "Order" msgstr "Volgorde" @@ -743,7 +762,7 @@ msgstr "Selecteer een geldige keuze. Deze keuze is niet beschikbaar." #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "\"%(pk)s\" is geen geldige waarde voor een primaire sleutel." +msgstr "'%(pk)s' is geen geldige waarde voor een primaire sleutel." #, python-format msgid "" @@ -751,7 +770,10 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" "%(datetime)s kon niet worden geïnterpreteerd in tijdzone " -"%(current_timezone)s. Waarschijnlijk is deze ambigu of bestaat niet." +"%(current_timezone)s; mogelijk is deze dubbelzinnig of bestaat deze niet." + +msgid "Clear" +msgstr "Wissen" msgid "Currently" msgstr "Huidige" @@ -759,9 +781,6 @@ msgstr "Huidige" msgid "Change" msgstr "Wijzigen" -msgid "Clear" -msgstr "Verwijder" - msgid "Unknown" msgstr "Onbekend" @@ -846,19 +865,19 @@ msgid "Tue" msgstr "di" msgid "Wed" -msgstr "woe" +msgstr "wo" msgid "Thu" -msgstr "don" +msgstr "do" msgid "Fri" -msgstr "vrij" +msgstr "vr" msgid "Sat" -msgstr "zat" +msgstr "za" msgid "Sun" -msgstr "zon" +msgstr "zo" msgid "January" msgstr "januari" @@ -1047,7 +1066,7 @@ msgstr ", " msgid "%d year" msgid_plural "%d years" msgstr[0] "%d jaar" -msgstr[1] "%d jaren" +msgstr[1] "%d jaar" #, python-format msgid "%d month" @@ -1071,7 +1090,7 @@ msgstr[1] "%d dagen" msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" -msgstr[1] "%d uren" +msgstr[1] "%d uur" #, python-format msgid "%d minute" @@ -1086,7 +1105,7 @@ msgid "Forbidden" msgstr "Verboden" msgid "CSRF verification failed. Request aborted." -msgstr "CSRF verificatie mislukt. Verzoek afgebroken." +msgstr "CSRF-verificatie mislukt. Aanvraag afgebroken." msgid "" "You are seeing this message because this HTTPS site requires a 'Referer " @@ -1094,37 +1113,36 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" -"U ziet deze melding omdat deze HTTPS website vereist dat uw webbrowser een " -"'Referer header' meestuurt, maar deze ontbreekt. Deze header is noodzakelijk " -"om veiligheidsredenen om er zeker van te zijn dat uw browser niet door " -"derden gekaapt wordt." +"U ziet deze melding, omdat deze HTTPS-website vereist dat uw webbrowser een " +"'Referer header' meestuurt, maar deze ontbreekt. Deze header is om " +"veiligheidsredenen vereist om er zeker van te zijn dat uw browser niet door " +"derden wordt gekaapt." 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 "" -"Als u uw webbrowser ingesteld heeft om geen 'Referer headers' mee te sturen, " -"schakelt u deze dan alstublieft weer in, op zijn minst voor deze website, " -"voor HTTPS verbindingen, of voor 'same-origin' verzoeken." +"Als u uw webbrowser hebt ingesteld heeft om geen 'Referer headers' mee te " +"sturen, schakelt u deze dan weer in, op zijn minst voor deze website, of " +"voor HTTPS-verbindingen, of voor 'same-origin'-aanvragen." 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 "" -"U ziet deze melding omdat deze website vereist dat een CSRF cookie wordt " -"meegestuurd bij het versturen van formulieren. Dit cookie is vereist om " -"veiligheidsredenen om er zeker van te zijn dat uw browser niet door derden " -"gekaapt wordt." +"U ziet deze melding, omdat deze website vereist dat een CSRF-cookie wordt " +"meegestuurd bij het verzenden van formulieren. Dit cookie is om " +"veiligheidsredenen vereist om er zeker van te zijn dat uw browser niet door " +"derden wordt gekaapt." 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 "" -"Als u cookies in uw webbrowser heeft uitgeschakeld, schakel deze dan " -"alstublieft weer in, op zijn minst voor deze website of voor 'same-origin' " -"verzoeken." +"Als u cookies in uw webbrowser hebt uitgeschakeld, schakel deze dan weer in, " +"op zijn minst voor deze website, of voor 'same-origin'-aanvragen." msgid "More information is available with DEBUG=True." msgstr "Meer informatie is beschikbaar met DEBUG=True." @@ -1139,19 +1157,19 @@ msgid "Congratulations on your first Django-powered page." msgstr "Gefeliciteerd met uw eerste Django-aangedreven pagina." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"U heeft natuurlijk nog geen echt werk gedaan. Om verder te gaan start u uw " -"eerste app door python manage.py startapp [app_label] uit te " -"voeren." +"Start nu uw eerste app door python manage.py startapp [app_label] uit te voeren." msgid "" "You're seeing this message because you have DEBUG = True in " "your Django settings file and you haven't configured any URLs. Get to work!" msgstr "" -"U ziet dit bericht omdat u DEBUG = True in uw Django settings " -"bestand heeft staan en u nog geen URLs geconfigureerd heeft. Aan het werk!" +"U ziet dit bericht, omdat u DEBUG = True in uw Django-" +"instellingenbestand hebt staan en u nog geen URL's hebt geconfigureerd. Aan " +"het werk!" msgid "No year specified" msgstr "Geen jaar opgegeven" @@ -1174,12 +1192,12 @@ msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -"Geen toekomstige %(verbose_name_plural)s beschikbaar omdat %(class_name)s." +"Geen toekomstige %(verbose_name_plural)s beschikbaar, omdat %(class_name)s." "allow_future de waarde False (Onwaar) heeft." #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "Ongeldige datum tekst '%(datestr)s' op basis van formaat '%(format)s'" +msgstr "Ongeldige datumtekst '%(datestr)s' op basis van notatie '%(format)s'" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1187,7 +1205,8 @@ msgstr "Geen %(verbose_name)s gevonden die voldoet aan de query" msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -"Pagina is niet 'last' en kan ook niet geconverteerd worden naar een int." +"Pagina is niet 'last' en kan ook niet naar een geheel getal worden " +"geconverteerd." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1199,12 +1218,12 @@ msgstr "" "Lege lijst en %(class_name)s.allow_empty heeft de waarde False (Onwaar)." msgid "Directory indexes are not allowed here." -msgstr "Directory overzicht is hier niet toegestaan" +msgstr "Directoryindexen zijn hier niet toegestaan." #, python-format msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" bestaat niet" +msgstr "'%(path)s' bestaat niet" #, python-format msgid "Index of %(directory)s" -msgstr "Overzicht van %(directory)s" +msgstr "Index van %(directory)s" diff --git a/django/conf/locale/nn/LC_MESSAGES/django.mo b/django/conf/locale/nn/LC_MESSAGES/django.mo index fa2036e99547..6113d502252c 100644 Binary files a/django/conf/locale/nn/LC_MESSAGES/django.mo and b/django/conf/locale/nn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nn/LC_MESSAGES/django.po b/django/conf/locale/nn/LC_MESSAGES/django.po index 8ad79dd35584..b8265aa6b300 100644 --- a/django/conf/locale/nn/LC_MESSAGES/django.po +++ b/django/conf/locale/nn/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/django/django/" "language/nn/)\n" @@ -297,6 +297,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Oppgje ein gyldig verdi." @@ -384,6 +393,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "og" @@ -714,15 +729,15 @@ msgstr "" "%(datetime)s kunne ikkje bli tolka i tidssona %(current_timezone)s. Verdien " "er anten tvetydig eller ugyldig." +msgid "Clear" +msgstr "Tøm" + msgid "Currently" msgstr "Noverande" msgid "Change" msgstr "Endre" -msgid "Clear" -msgstr "Tøm" - msgid "Unknown" msgstr "Ukjend" @@ -1086,8 +1101,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo index 75624effb86f..b3cda1264fc5 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 27a99062dc1a..8ba19f66e474 100644 --- a/django/conf/locale/pl/LC_MESSAGES/django.po +++ b/django/conf/locale/pl/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ # konryd , 2011 # konryd , 2011 # Łukasz Rekucki , 2011 -# m_aciek , 2016 +# m_aciek , 2016-2017 # m_aciek , 2015 # Michał Pasternak , 2013 # p , 2012 @@ -25,20 +25,22 @@ # Radek Czajka , 2013 # Roman Barczyński , 2012 # sidewinder , 2014 +# Tomasz Kajtoch , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-08-09 13:26+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-21 23:12+0000\n" "Last-Translator: m_aciek \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Afrikaans" msgstr "afrykanerski" @@ -95,7 +97,7 @@ msgid "Australian English" msgstr "australijski angielski" msgid "British English" -msgstr "angielski brytyjski" +msgstr "brytyjski angielski" msgid "Esperanto" msgstr "esperanto" @@ -107,7 +109,7 @@ msgid "Argentinian Spanish" msgstr "hiszpański argentyński" msgid "Colombian Spanish" -msgstr "Kolumbijczyk hiszpański" +msgstr "hiszpański kolumbijski" msgid "Mexican Spanish" msgstr "hiszpański meksykański" @@ -227,7 +229,7 @@ msgid "Dutch" msgstr "holenderski" msgid "Norwegian Nynorsk" -msgstr "norweski (Nynorsk)" +msgstr "norweski (nynorsk)" msgid "Ossetic" msgstr "osetyjski" @@ -242,7 +244,7 @@ msgid "Portuguese" msgstr "portugalski" msgid "Brazilian Portuguese" -msgstr "brazylijski portugalski" +msgstr "portugalski brazylijski" msgid "Romanian" msgstr "rumuński" @@ -316,6 +318,15 @@ msgstr "Pliki statyczne" msgid "Syndication" msgstr "Syndykacja treści" +msgid "That page number is not an integer" +msgstr "Ten numer strony nie jest liczbą całkowitą" + +msgid "That page number is less than 1" +msgstr "Ten numer strony jest mniejszy niż 1" + +msgid "That page contains no results" +msgstr "Ta strona nie zawiera wyników" + msgid "Enter a valid value." msgstr "Wpisz poprawną wartość." @@ -330,14 +341,16 @@ msgstr "Wprowadź poprawny adres email." msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki." +msgstr "" +"Wpisz poprawną uproszczoną nazwę zawierającą jedynie litery, cyfry, " +"podkreślenia i myślniki." msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -"Poprawna wartość składa się z poprawnych liter alfabetu unicode, cyfr, " -"podkreśleń lub myślników." +"Wpisz poprawną uproszczoną nazwę zawierającą jedynie litery Unicode, cyfry, " +"podkreślenia i myślniki." msgid "Enter a valid IPv4 address." msgstr "Wprowadź poprawny adres IPv4." @@ -379,6 +392,9 @@ msgstr[1] "" msgstr[2] "" "Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znaków (obecnie " "ma %(show_value)d)." +msgstr[3] "" +"Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znaków (obecnie " +"ma %(show_value)d)." #, python-format msgid "" @@ -396,13 +412,17 @@ msgstr[1] "" msgstr[2] "" "Upewnij się, że ta wartość ma co najwyżej %(limit_value)d znaków (obecnie ma " "%(show_value)d)." +msgstr[3] "" +"Upewnij się, że ta wartość ma co najwyżej %(limit_value)d znaków (obecnie ma " +"%(show_value)d)." #, 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] "Upewnij się, że jest nie więcej niż %(max)s cyfra." -msgstr[1] "Upewnij się, że jest nie więcej niż %(max)s cyfr." -msgstr[2] "Upewnij się, że jest nie więcej niż %(max)s cyfr." +msgstr[0] "Upewnij się, że łącznie nie ma więcej niż %(max)s cyfry." +msgstr[1] "Upewnij się, że łącznie nie ma więcej niż %(max)s cyfry." +msgstr[2] "Upewnij się, że łącznie nie ma więcej niż %(max)s cyfr." +msgstr[3] "Upewnij się, że łącznie nie ma więcej niż %(max)s cyfr." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." @@ -412,6 +432,7 @@ msgstr[0] "" msgstr[1] "" "Upewnij się, że liczba ma nie więcej niż %(max)s cyfry po przecinku." msgstr[2] "Upewnij się, że liczba ma nie więcej niż %(max)s cyfr po przecinku." +msgstr[3] "Upewnij się, że liczba ma nie więcej niż %(max)s cyfr po przecinku." #, python-format msgid "" @@ -424,6 +445,16 @@ msgstr[1] "" "Upewnij się, że liczba ma nie więcej niż %(max)s cyfry przed przecinkiem." msgstr[2] "" "Upewnij się, że liczba ma nie więcej niż %(max)s cyfr przed przecinkiem." +msgstr[3] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfr przed przecinkiem." + +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Rozszerzenie pliku '%(extension)s' jest niedozwolone. Dozwolone rozszerzenia " +"to: '%(allowed_extensions)s'." msgid "and" msgstr "i" @@ -444,7 +475,7 @@ msgstr "To pole nie może być puste." #, python-format msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "%(field_label)s już istnieje w %(model_name)s." +msgstr "Istnieje już %(model_name)s z tą wartością pola %(field_label)s." #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. #. Eg: "Title must be unique for pub_date year" @@ -474,11 +505,11 @@ msgid "'%(value)s' value must be either True or False." msgstr "wartość '%(value)s' musi być True lub False." msgid "Boolean (Either True or False)" -msgstr "Wartość logiczna (True, False - prawda lub fałsz)" +msgstr "Wartość logiczna (True lub False – prawda lub fałsz)" #, python-format msgid "String (up to %(max_length)s)" -msgstr "Łańcuch (do %(max_length)s znaków)" +msgstr "Ciąg znaków (do %(max_length)s znaków)" msgid "Comma-separated integers" msgstr "Liczby całkowite rozdzielone przecinkami" @@ -562,7 +593,7 @@ msgid "'%(value)s' value must be either None, True or False." msgstr "wartość '%(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)" +msgstr "Wartość logiczna (True, False, None – prawda, fałsz lub nic)" msgid "Positive integer" msgstr "Dodatnia liczba całkowita" @@ -585,7 +616,7 @@ msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -"wartość '%(value)s' ma nieprawidłowy format. Musi być w formacie HH:MM[:ss[." +"Wartość '%(value)s' ma nieprawidłowy format. Musi być w formacie HH:MM[:ss[." "uuuuuu]]." #, python-format @@ -593,7 +624,7 @@ msgid "" "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" -"wartość '%(value)s' ma prawidłowy format (HH:MM[:ss[.uuuuuu]]), ale jest " +"Wartość '%(value)s' ma prawidłowy format (HH:MM[:ss[.uuuuuu]]), ale jest " "nieprawidłową godziną." msgid "Time" @@ -685,6 +716,9 @@ msgstr[1] "" msgstr[2] "" "Upewnij się, że nazwa pliku ma co najwyżej %(max)d znaków (obecnie ma " "%(length)d)." +msgstr[3] "" +"Upewnij się, że nazwa pliku ma co najwyżej %(max)d znaków (obecnie ma " +"%(length)d)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Prześlij plik lub zaznacz by usunąć, ale nie oba na raz." @@ -727,6 +761,7 @@ 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." #, python-format msgid "Please submit %d or more forms." @@ -734,9 +769,10 @@ 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 "Order" -msgstr "Porządek" +msgstr "Kolejność" msgid "Delete" msgstr "Usuń" @@ -778,15 +814,15 @@ msgstr "" "%(datetime)s nie może być interpretowany w strefie czasowej " "%(current_timezone)s; może być niejednoznaczne lub nie istnieć." +msgid "Clear" +msgstr "Wyczyść" + msgid "Currently" msgstr "Teraz" msgid "Change" msgstr "Zmień" -msgid "Clear" -msgstr "Wyczyść" - msgid "Unknown" msgstr "Nieznany" @@ -805,6 +841,7 @@ msgid_plural "%(size)d bytes" msgstr[0] "%(size)d bajt" msgstr[1] "%(size)d bajty" msgstr[2] "%(size)d bajtów" +msgstr[3] "%(size)d bajtów" #, python-format msgid "%s KB" @@ -926,53 +963,53 @@ msgid "jan" msgstr "sty" msgid "feb" -msgstr "luty" +msgstr "lut" msgid "mar" -msgstr "marz" +msgstr "mar" msgid "apr" -msgstr "kwie" +msgstr "kwi" msgid "may" msgstr "maj" msgid "jun" -msgstr "czerw" +msgstr "cze" msgid "jul" msgstr "lip" msgid "aug" -msgstr "sier" +msgstr "sie" msgid "sep" -msgstr "wrze" +msgstr "wrz" msgid "oct" msgstr "paź" msgid "nov" -msgstr "list" +msgstr "lis" msgid "dec" msgstr "gru" msgctxt "abbrev. month" msgid "Jan." -msgstr "Sty" +msgstr "Sty." msgctxt "abbrev. month" msgid "Feb." -msgstr "Lut" +msgstr "Lut." msgctxt "abbrev. month" msgid "March" -msgstr "Mar" +msgstr "Mar." msgctxt "abbrev. month" msgid "April" -msgstr "Kwi" +msgstr "Kwi." msgctxt "abbrev. month" msgid "May" @@ -980,27 +1017,27 @@ msgstr "Maj" msgctxt "abbrev. month" msgid "June" -msgstr "Cze" +msgstr "Cze." msgctxt "abbrev. month" msgid "July" -msgstr "Lip" +msgstr "Lip." msgctxt "abbrev. month" msgid "Aug." -msgstr "Sie" +msgstr "Sie." msgctxt "abbrev. month" msgid "Sept." -msgstr "Wrz" +msgstr "Wrz." msgctxt "abbrev. month" msgid "Oct." -msgstr "Paź" +msgstr "Paź." msgctxt "abbrev. month" msgid "Nov." -msgstr "Lis" +msgstr "Lis." msgctxt "abbrev. month" msgid "Dec." @@ -1075,6 +1112,7 @@ msgid_plural "%d years" msgstr[0] "%d rok" msgstr[1] "%d lata" msgstr[2] "%d lat" +msgstr[3] "%d lat" #, python-format msgid "%d month" @@ -1082,6 +1120,7 @@ msgid_plural "%d months" msgstr[0] "%d miesiąc" msgstr[1] "%d miesiące" msgstr[2] "%d miesięcy" +msgstr[3] "%d miesięcy" #, python-format msgid "%d week" @@ -1089,6 +1128,7 @@ msgid_plural "%d weeks" msgstr[0] "%d tydzień" msgstr[1] "%d tygodnie" msgstr[2] "%d tygodni" +msgstr[3] "%d tygodni" #, python-format msgid "%d day" @@ -1096,6 +1136,7 @@ msgid_plural "%d days" msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" +msgstr[3] "%d dni" #, python-format msgid "%d hour" @@ -1103,6 +1144,7 @@ msgid_plural "%d hours" msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" +msgstr[3] "%d godzin" #, python-format msgid "%d minute" @@ -1110,6 +1152,7 @@ msgid_plural "%d minutes" msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" +msgstr[3] "%d minut" msgid "0 minutes" msgstr "0 minut" @@ -1167,15 +1210,14 @@ msgid "It worked!" msgstr "Zadziałało!" msgid "Congratulations on your first Django-powered page." -msgstr "Gratulujemy utworzenia Twojej pierwszej strony w Django." +msgstr "Gratulujemy utworzenia twojej pierwszej strony w Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Oczywiście, nie zostało tu jeszcze dużo zrobione. Zacznij od utworzenia " -"swojej pierwszej aplikacji wpisując: python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Teraz stwórz swoją pierwszą aplikację uruchamiając python manage.py " +"startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " @@ -1199,7 +1241,7 @@ msgstr "Nie określono tygodnia" #, python-format msgid "No %(verbose_name_plural)s available" -msgstr "%(verbose_name_plural)s nie jest dostępny" +msgstr "%(verbose_name_plural)s nie są dostępne" #, python-format msgid "" diff --git a/django/conf/locale/pt/LC_MESSAGES/django.mo b/django/conf/locale/pt/LC_MESSAGES/django.mo index 4299f23a5822..a323d259b97c 100644 Binary files a/django/conf/locale/pt/LC_MESSAGES/django.mo and b/django/conf/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt/LC_MESSAGES/django.po b/django/conf/locale/pt/LC_MESSAGES/django.po index a64317eb3b2c..fc8269971473 100644 --- a/django/conf/locale/pt/LC_MESSAGES/django.po +++ b/django/conf/locale/pt/LC_MESSAGES/django.po @@ -7,15 +7,15 @@ # Jannis Leidel , 2011 # José Durães , 2014 # jorgecarleitao , 2014-2015 -# Nuno Mariz , 2011-2013,2015-2016 +# Nuno Mariz , 2011-2013,2015-2017 # Paulo Köch , 2011 # Raúl Pedro Fernandes Santos, 2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Portuguese (http://www.transifex.com/django/django/language/" "pt/)\n" @@ -301,6 +301,15 @@ msgstr "Ficheiros Estáticos" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Introduza um valor válido." @@ -397,6 +406,12 @@ msgid_plural "" msgstr[0] "Garanta que não tem mais de %(max)s dígito antes do ponto decimal." msgstr[1] "Garanta que não tem mais de %(max)s dígitos antes do ponto decimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "e" @@ -599,11 +614,11 @@ msgstr "Relação de um-para-um" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "Relação de %(from)s-%(to)s" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "Relações de %(from)s-%(to)s" msgid "Many-to-many relationship" msgstr "Relação de muitos-para-muitos" @@ -751,15 +766,15 @@ msgstr "" "%(datetime)s não pode ser interpretada de fuso horário %(current_timezone)s; " "pode ser ambígua ou não podem existir." +msgid "Clear" +msgstr "Limpar" + msgid "Currently" msgstr "Atualmente" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Limpar" - msgid "Unknown" msgstr "Desconhecido" @@ -1135,11 +1150,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "Parabéns pela sua primeira página em Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Claro que ainda não fizeste qualquer trabalho. Cria a tua primeira aplicação " -"correndo python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 5ccf898b8da5..375c358f9b3f 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 146d73366b9b..2d3174de41f8 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -5,15 +5,16 @@ # andrewsmedina , 2014-2015 # bruno.devpod , 2014 # Carlos E C Leite , 2016 -# FilipeCifali , 2016 +# Filipe Cifali Stangler , 2016 # dudanogueira , 2012 # Elyézer Rezende , 2013 # Fábio C. Barrionuevo da Luz , 2014-2015 # Felipe Rodrigues , 2016 # Gladson , 2013 -# Guilherme Gondim, 2011-2014 +# semente, 2011-2014 # Jannis Leidel , 2011 # Lucas Infante , 2015 +# Luiz Boaretto , 2017 # Sandro , 2011 # Sergio Garcia , 2015 # Wiliam Souza , 2015 @@ -21,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-04 00:25+0000\n" -"Last-Translator: andrewsmedina \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-06 02:33+0000\n" +"Last-Translator: Luiz Boaretto \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -308,6 +309,15 @@ msgstr "Arquivos Estáticos" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "Esse número de página não é um número inteiro" + +msgid "That page number is less than 1" +msgstr "Esse número de página é menor que 1" + +msgid "That page contains no results" +msgstr "Essa página não contém resultados" + msgid "Enter a valid value." msgstr "Informe um valor válido." @@ -408,6 +418,14 @@ msgstr[1] "" "Certifique-se de que não tenha mais de %(max)s dígitos antes do ponto " "decimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"A extensão de arquivo '%(extension)s' não é permitida. As extensões " +"permitidas são: '%(allowed_extensions)s'." + msgid "and" msgstr "e" @@ -758,15 +776,15 @@ msgstr "" " %(datetime)s não pôde ser interpretado no fuso horário " "%(current_timezone)s; pode estar ambíguo ou pode não existir." +msgid "Clear" +msgstr "Limpar" + msgid "Currently" msgstr "Atualmente" msgid "Change" msgstr "Modificar" -msgid "Clear" -msgstr "Limpar" - msgid "Unknown" msgstr "Desconhecido" @@ -1143,12 +1161,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Parabéns pela sua primeira página feita com Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"É claro que você realmente não fez qualquer trabalho ainda. O próximo passo " -"é iniciar o seu primeiro app rodando python manage.py startapp " -"[app_label] ." +"Em seguida, inicie o seu primeiro aplicativo executando python manage." +"py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 2aeaf003225e..41a490d9041b 100644 Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index f87ec6ca8442..50e401de9999 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Abel Radac , 2017 # mihneasim , 2011 # Daniel Ursache-Dogariu , 2011 # Denis Darii , 2011,2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-05-31 08:00+0000\n" +"Last-Translator: Abel Radac \n" "Language-Team: Romanian (http://www.transifex.com/django/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -300,6 +301,15 @@ msgstr "Fișiere statice" msgid "Syndication" msgstr "Sindicalizare" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Introduceți o valoare validă." @@ -310,7 +320,7 @@ msgid "Enter a valid integer." msgstr "Introduceți un întreg valid." msgid "Enter a valid email address." -msgstr "Introduceți o adresă de email validaă." +msgstr "Introduceți o adresă de email validă." msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." @@ -412,6 +422,12 @@ msgstr[1] "" msgstr[2] "" "Asigurați-vă că nu sunt mai mult de %(max)s cifre înainte de punctul zecimal." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "și" @@ -768,15 +784,15 @@ msgstr "" "%(datetime)s nu poate fi interpetat in fusul orar %(current_timezone)s; este " "ambiguu sau nu există." +msgid "Clear" +msgstr "Șterge" + msgid "Currently" msgstr "În prezent" msgid "Change" msgstr "Schimbă" -msgid "Clear" -msgstr "Șterge" - msgid "Unknown" msgstr "Necunoscut" @@ -1160,11 +1176,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "Felicitări pentru prima ta pagină Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Desigur, încă nu ați prestat nici o activiate. În continuare, inițiați prima " -"aplicație executând python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 421ad7903dbe..dc34e1877f6b 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index d66e50448853..bfa216206ebb 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Mingun , 2014 +# Anton Bazhanov , 2017 # Denis Darii , 2011 # Dimmus , 2011 # eigrad , 2012 @@ -11,15 +12,16 @@ # Jannis Leidel , 2011 # lilo.panic, 2016 # Mikhail Zholobov , 2013 +# Vasiliy Anikin , 2017 # Алексей Борискин , 2013-2016 # Дмитрий Шатера , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-20 09:53+0000\n" -"Last-Translator: Алексей Борискин \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-25 05:25+0000\n" +"Last-Translator: Vasiliy Anikin \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -306,6 +308,15 @@ 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 "Введите правильное значение." @@ -422,6 +433,14 @@ msgstr[1] "Убедитесь, что вы ввели не более %(max)s ц msgstr[2] "Убедитесь, что вы ввели не более %(max)s цифр перед запятой." msgstr[3] "Убедитесь, что вы ввели не более %(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 "and" msgstr "и" @@ -788,15 +807,15 @@ msgstr "" "%(current_timezone)s; дата может быть неоднозначной или оказаться " "несуществующей." +msgid "Clear" +msgstr "Очистить" + msgid "Currently" msgstr "На данный момент" msgid "Change" msgstr "Изменить" -msgid "Clear" -msgstr "Очистить" - msgid "Unknown" msgstr "Неизвестно" @@ -1194,12 +1213,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Поздравляем вас с вашей первой страницей, работающей на Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Конечно, это только начало. Сейчас вы можете создать ваше первое приложение. " -"Чтобы сделать это, запустите команду python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Сейчас вы можете создать ваше первое приложение, запустив команду " +"python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 2b4553c8dd25..31134cd0c6ca 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 9e652091758f..f15c65c7879f 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Slovak (http://www.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Zadajte platnú hodnotu." @@ -405,6 +414,12 @@ msgstr[2] "" "Uistite sa, že nie je zadaných viac ako %(max)s číslic pred desatinnou " "čiarkou." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "a" @@ -743,15 +758,15 @@ msgstr "" "Hodnota %(datetime)s v časovej zóne %(current_timezone)s sa nedá " "interpretovať; môže byť nejednoznačná alebo nemusí existovať." +msgid "Clear" +msgstr "Vymazať" + msgid "Currently" msgstr "Súčasne" msgid "Change" msgstr "Zmeniť" -msgid "Clear" -msgstr "Vymazať" - msgid "Unknown" msgstr "Neznámy" @@ -1122,8 +1137,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo index 88364be12c43..3b3453084da4 100644 Binary files a/django/conf/locale/sl/LC_MESSAGES/django.mo and b/django/conf/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po index 231027f753cb..797896a21ab8 100644 --- a/django/conf/locale/sl/LC_MESSAGES/django.po +++ b/django/conf/locale/sl/LC_MESSAGES/django.po @@ -4,15 +4,17 @@ # iElectric , 2011-2012 # Jannis Leidel , 2011 # Jure Cuhalev , 2012-2013 +# Marko Zabreznik , 2016 +# Primož Verdnik , 2017 # zejn , 2013,2016 # zejn , 2011-2013 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-27 19:12+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-02 08:26+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -296,7 +298,16 @@ msgid "Static Files" msgstr "Statične datoteke" msgid "Syndication" -msgstr "" +msgstr "Sindiciranje" + +msgid "That page number is not an integer" +msgstr "Število te strani ni naravno število" + +msgid "That page number is less than 1" +msgstr "Število te strani je manj kot 1" + +msgid "That page contains no results" +msgstr "Ta stran nima zadetkov" msgid "Enter a valid value." msgstr "Vnesite veljavno vrednost." @@ -418,6 +429,14 @@ msgstr[2] "" msgstr[3] "" "Poskrbite, da skupno ne bo več kot %(max)s števk pred decimalno vejico." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"Končnica datoteke '%(extension)s' ni dovoljena. Dovoljene končnice so: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "in" @@ -777,15 +796,15 @@ msgstr "" "Vrednosti %(datetime)s ni bilo možno razumeti v časovnem pasu " "%(current_timezone)s; ali je izraz dvoumen ali pa ne obstaja." +msgid "Clear" +msgstr "Počisti" + msgid "Currently" msgstr "Trenutno" msgid "Change" msgstr "Spremeni" -msgid "Clear" -msgstr "Počisti" - msgid "Unknown" msgstr "Neznano" @@ -1175,11 +1194,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Dobrodošli na vaši prvi spletni strani, zgrajeni na Django platformi." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Seveda se tu resno delo šele prične. Ustvarite prvo aplikacijo tako, da " -"poženete python manage.py startapp [ime_aplikacije]." +"Nato ustvarite svojo prvo aplikacijo tako, da poženete python manage." +"py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/sq/LC_MESSAGES/django.mo b/django/conf/locale/sq/LC_MESSAGES/django.mo index b0f57c4c2614..27b5dbbed904 100644 Binary files a/django/conf/locale/sq/LC_MESSAGES/django.mo and b/django/conf/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sq/LC_MESSAGES/django.po b/django/conf/locale/sq/LC_MESSAGES/django.po index 7b9b64525fc8..5a3267ce570f 100644 --- a/django/conf/locale/sq/LC_MESSAGES/django.po +++ b/django/conf/locale/sq/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Albanian (http://www.transifex.com/django/django/language/" "sq/)\n" @@ -295,6 +295,15 @@ msgstr "Kartela Statike" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Jepni vlerë të vlefshme." @@ -396,6 +405,12 @@ msgstr[0] "" msgstr[1] "" "Sigurohuni që nuk ka më tepër se %(max)s shifra para presjes dhjetore." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr " dhe " @@ -753,15 +768,15 @@ msgstr "" "%(datetime)s nuk u interpretua dot brenda zonë kohore %(current_timezone)s; " "mund të jetë e dykuptimtë ose mund të mos ekzistojë." +msgid "Clear" +msgstr "Pastroje" + msgid "Currently" msgstr "Tani" msgid "Change" msgstr "Ndryshoje" -msgid "Clear" -msgstr "Pastroje" - msgid "Unknown" msgstr "E panjohur" @@ -1137,11 +1152,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "Urime për faqen tuaj të parë me Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Kuptohet, që s’keni bërë ende ndonjë punë. Në vazhdim, filloni aplikacionin " -"tuaj të parë duke xhiruar python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index a14adaa99ab3..655d0fbe94bf 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 1ff12a283c03..d9c347c31432 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Serbian (http://www.transifex.com/django/django/language/" "sr/)\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Унесите исправну вредност." @@ -387,6 +396,12 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "и" @@ -720,15 +735,15 @@ msgstr "" "Време %(datetime)s не може се представити у временској зони " "%(current_timezone)s." +msgid "Clear" +msgstr "Очисти" + msgid "Currently" msgstr "Тренутно" msgid "Change" msgstr "Измени" -msgid "Clear" -msgstr "Очисти" - msgid "Unknown" msgstr "Непознато" @@ -1099,8 +1114,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo index 48ce600c3e72..1515dcc47114 100644 Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index f531c9aa16fe..ea3fb0d20a05 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ # Jonathan Lindén, 2015 # Jonathan Lindén, 2014 # Mattias Hansson , 2016 -# Mattias Jansson , 2011 +# Mattias Benjaminsson , 2011 # Rasmus Précenth , 2014 # Samuel Linde , 2011 # Thomas Lundqvist , 2013,2016 @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-07 19:03+0000\n" -"Last-Translator: Mattias Hansson \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -303,6 +303,15 @@ msgstr "Statiska filer" msgid "Syndication" msgstr "Syndikering" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Fyll i ett giltigt värde." @@ -405,6 +414,12 @@ msgstr[0] "" msgstr[1] "" "Säkerställ att det inte är mer än %(max)s siffror före decimalavskiljaren." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "och" @@ -758,15 +773,15 @@ msgstr "" "%(datetime)s kunde inte tolkas i tidszonen %(current_timezone)s; det kan " "vara en ogiltig eller tvetydigt tidpunkt" +msgid "Clear" +msgstr "Rensa" + msgid "Currently" msgstr "Nuvarande" msgid "Change" msgstr "Ändra" -msgid "Clear" -msgstr "Rensa" - msgid "Unknown" msgstr "Okänt" @@ -1141,11 +1156,9 @@ msgid "Congratulations on your first Django-powered page." msgstr "Grattis till din nya Django-drivna sida." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Självklart har du inte hunnit jobba något med sidan än. Starta din första " -"app genom att köra python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/ta/LC_MESSAGES/django.mo b/django/conf/locale/ta/LC_MESSAGES/django.mo index 7e02a0d766a7..1ea801829b49 100644 Binary files a/django/conf/locale/ta/LC_MESSAGES/django.mo and b/django/conf/locale/ta/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ta/LC_MESSAGES/django.po b/django/conf/locale/ta/LC_MESSAGES/django.po index 2e342dc8e995..e827bf68b161 100644 --- a/django/conf/locale/ta/LC_MESSAGES/django.po +++ b/django/conf/locale/ta/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Tamil (http://www.transifex.com/django/django/language/ta/)\n" "MIME-Version: 1.0\n" @@ -292,6 +292,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "" @@ -377,6 +386,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "மற்றும்" @@ -701,15 +716,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "" + msgid "Currently" msgstr "" msgid "Change" msgstr "மாற்றுக" -msgid "Clear" -msgstr "" - msgid "Unknown" msgstr "தெரியாத" @@ -1073,8 +1088,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo index fa9fdc43b2d5..492e1522791b 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 b8c87ce5f1f5..5485347e7a83 100644 --- a/django/conf/locale/te/LC_MESSAGES/django.po +++ b/django/conf/locale/te/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Telugu (http://www.transifex.com/django/django/language/te/)\n" "MIME-Version: 1.0\n" @@ -295,6 +295,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "సరైన విలువని ఇవ్వండి." @@ -382,6 +391,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "మరియు" @@ -704,15 +719,15 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" +msgid "Clear" +msgstr "" + msgid "Currently" msgstr "ప్రస్తుతము " msgid "Change" msgstr "మార్చు" -msgid "Clear" -msgstr "" - msgid "Unknown" msgstr "తెలియనది" @@ -1076,8 +1091,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/th/LC_MESSAGES/django.mo b/django/conf/locale/th/LC_MESSAGES/django.mo index 2542f7a427f2..168e2de10b9a 100644 Binary files a/django/conf/locale/th/LC_MESSAGES/django.mo and b/django/conf/locale/th/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/th/LC_MESSAGES/django.po b/django/conf/locale/th/LC_MESSAGES/django.po index b9a71ede7335..c2311e687d0c 100644 --- a/django/conf/locale/th/LC_MESSAGES/django.po +++ b/django/conf/locale/th/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Thai (http://www.transifex.com/django/django/language/th/)\n" "MIME-Version: 1.0\n" @@ -298,6 +298,15 @@ msgstr "" msgid "Syndication" msgstr "" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "กรุณาใส่ค่าที่ถูกต้อง" @@ -378,6 +387,12 @@ msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "และ" @@ -702,15 +717,15 @@ msgstr "" "%(datetime)s ไม่สามารถแปลงให้อยู่ใน %(current_timezone)s time zone ได้ เนื่องจาก " "time zone ไม่ชัดเจน หรือไม่มีอยู่จริง" +msgid "Clear" +msgstr "ล้าง" + msgid "Currently" msgstr "ปัจจุบัน" msgid "Change" msgstr "เปลี่ยนแปลง" -msgid "Clear" -msgstr "ล้าง" - msgid "Unknown" msgstr "ไม่รู้" @@ -1067,8 +1082,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py index 1b0e2d4f917b..8315e79b676e 100644 --- a/django/conf/locale/th/formats.py +++ b/django/conf/locale/th/formats.py @@ -12,13 +12,25 @@ MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' SHORT_DATETIME_FORMAT = 'j M Y, G:i' -# FIRST_DAY_OF_WEEK = +FIRST_DAY_OF_WEEK = 0 # Sunday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +DATE_INPUT_FORMATS = [ + '%d/%m/%Y', # 25/10/2006 + '%d %b %Y', # 25 ต.ค. 2006 + '%d %B %Y', # 25 ตุลาคม 2006 +] +TIME_INPUT_FORMATS = [ + '%H:%M:%S.%f', # 14:30:59.000200 + '%H:%M:%S', # 14:30:59 + '%H:%M', # 14:30 +] +DATETIME_INPUT_FORMATS = [ + '%d/%m/%Y %H:%M:%S.%f', # 25/10/2006 14:30:59.000200 + '%d/%m/%Y %H:%M:%S', # 25/10/2006 14:30:59 + '%d/%m/%Y %H:%M', # 25/10/2006 14:30 +] DECIMAL_SEPARATOR = '.' THOUSAND_SEPARATOR = ',' -# NUMBER_GROUPING = +NUMBER_GROUPING = 3 diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo index cfaf17b1f3d0..29ddb3d5bdab 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 7584e4942550..77ef78b08f3d 100644 --- a/django/conf/locale/tr/LC_MESSAGES/django.po +++ b/django/conf/locale/tr/LC_MESSAGES/django.po @@ -2,9 +2,9 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2016 +# BouRock, 2015-2017 # 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 @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 09:50+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 17:47+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -303,6 +303,15 @@ msgstr "Sabit Dosyalar" msgid "Syndication" msgstr "Dağıtım" +msgid "That page number is not an integer" +msgstr "Bu sayfa numarası bir tamsayı değil" + +msgid "That page number is less than 1" +msgstr "Bu sayfa numarası 1'den az" + +msgid "That page contains no results" +msgstr "Bu sayfa hiç sonuç içermiyor" + msgid "Enter a valid value." msgstr "Geçerli bir değer girin." @@ -403,6 +412,14 @@ msgstr[0] "" msgstr[1] "" "Ondalık noktasından önce %(max)s rakamdan daha fazla olmadığından emin olun." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" +"'%(extension)s' dosya uzantısına izin verilmiyor. İzin verilen uzantılar: " +"'%(allowed_extensions)s'." + msgid "and" msgstr "ve" @@ -755,15 +772,15 @@ msgstr "" " %(datetime)s, %(current_timezone)s saat dilimi olarak yorumlanamadı; bu " "belirsiz olabilir ya da mevcut olmayabilir." +msgid "Clear" +msgstr "Temizle" + msgid "Currently" msgstr "Şu anki" msgid "Change" msgstr "Değiştir" -msgid "Clear" -msgstr "Temizle" - msgid "Unknown" msgstr "Bilinmiyor" @@ -1141,12 +1158,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "İlk Django-destekli sayfanız için tebrikler." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"Tabii ki, aslında henüz herhangi bir çalışma yapmadınız. Sonrasında, " -"python manage.py startapp [app_label] komutunu çalıştırarak ilk " -"uygulamanızı başlatın." +"Sonra, python manage.py startapp [app_label] komutunu " +"çalıştırarak ilk uygulamanızı başlatın." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo index 499a89be9b10..553fe8faf341 100644 Binary files a/django/conf/locale/uk/LC_MESSAGES/django.mo and b/django/conf/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/uk/LC_MESSAGES/django.po b/django/conf/locale/uk/LC_MESSAGES/django.po index 67e36e1d674a..74f90dcf57b8 100644 --- a/django/conf/locale/uk/LC_MESSAGES/django.po +++ b/django/conf/locale/uk/LC_MESSAGES/django.po @@ -3,8 +3,8 @@ # Translators: # Oleksandr Chernihov , 2014 # Boryslav Larin , 2011 -# Denis Podlesniy , 2016 -# Igor Melnyk, 2014-2015 +# Денис Подлесный , 2016 +# Igor Melnyk, 2014-2015,2017 # Jannis Leidel , 2011 # Kirill Gagarski , 2014 # Max V. Stotsky , 2014 @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-07-07 22:24+0000\n" -"Last-Translator: Denis Podlesniy \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-22 13:44+0000\n" +"Last-Translator: Igor Melnyk\n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -306,6 +306,15 @@ 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 "Введіть коректне значення." @@ -420,6 +429,14 @@ msgstr[1] "" msgstr[2] "" "Переконайтеся, що тут не більше ніж %(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 "and" msgstr "та" @@ -776,15 +793,15 @@ msgstr "" "%(datetime)s не може бути інтерпретована в часовому поясі " "%(current_timezone)s; дата може бути неодзначною або виявитись неіснуючою." +msgid "Clear" +msgstr "Очистити" + msgid "Currently" msgstr "Наразі" msgid "Change" msgstr "Змінити" -msgid "Clear" -msgstr "Очистити" - msgid "Unknown" msgstr "Невідомо" @@ -1169,12 +1186,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "Вітаємо Вас на першій сторінці яка створена за допомогою Django." msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." -msgstr "" -"Звичайно, Ви ще, насправді, нічого не зробили. Наступним кроком, розпочніть " -"створення Вашого першого додатку, виконавши python manage.py startapp " +"Next, start your first app by running python manage.py startapp " "[app_label]." +msgstr "" +"Наступним кроком, розпочніть створення Вашого першого додатку, виконавши " +"python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/vi/LC_MESSAGES/django.mo b/django/conf/locale/vi/LC_MESSAGES/django.mo index cb074260b807..a3cb0a648e5b 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 f214678a7e0e..bc5e725ea928 100644 --- a/django/conf/locale/vi/LC_MESSAGES/django.po +++ b/django/conf/locale/vi/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-06-30 08:31+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:03+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Vietnamese (http://www.transifex.com/django/django/language/" "vi/)\n" @@ -299,6 +299,15 @@ msgstr "Tập tin tĩnh" msgid "Syndication" msgstr "Syndication" +msgid "That page number is not an integer" +msgstr "" + +msgid "That page number is less than 1" +msgstr "" + +msgid "That page contains no results" +msgstr "" + msgid "Enter a valid value." msgstr "Nhập một giá trị hợp lệ." @@ -383,6 +392,12 @@ msgstr[0] "" "Hãy chắc chắn rằng không có nhiều hơn %(max)s chữ số trước dấu phẩy thập " "phân." +#, python-format +msgid "" +"File extension '%(extension)s' is not allowed. Allowed extensions are: " +"'%(allowed_extensions)s'." +msgstr "" + msgid "and" msgstr "và" @@ -715,15 +730,15 @@ msgstr "" "%(datetime)s không thích hợp với khu vực thời gian %(current_timezone)s; " "phần này có thể còn mơ hồ chưa rõ nghĩa hoặc không hề tồn tại." +msgid "Clear" +msgstr "Xóa" + msgid "Currently" msgstr "Hiện nay" msgid "Change" msgstr "Thay đổi" -msgid "Clear" -msgstr "Xóa" - msgid "Unknown" msgstr "Chưa xác định" @@ -1080,8 +1095,8 @@ msgid "Congratulations on your first Django-powered page." msgstr "" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" msgid "" diff --git a/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo b/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo index b6e8c399aee3..eb2ec27bd0b1 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 73b40c3558fd..cf02e9197b86 100644 --- a/django/conf/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_Hans/LC_MESSAGES/django.po @@ -4,8 +4,8 @@ # Daniel Duan , 2013 # Jannis Leidel , 2011 # Kevin Sze , 2012 -# Lele Long , 2011,2015 -# Liping Wang , 2016 +# Lele Long , 2011,2015,2017 +# Liping Wang , 2016-2017 # mozillazg , 2016 # Ronald White , 2014 # pylemon , 2013 @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-09-20 02:26+0000\n" -"Last-Translator: Liping Wang \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-14 11:34+0000\n" +"Last-Translator: Lele Long \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -307,6 +307,15 @@ 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 "输入一个有效的值。" @@ -389,6 +398,14 @@ 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 "and" msgstr "和" @@ -718,15 +735,15 @@ msgstr "" "%(datetime)s 不能在时区 %(current_timezone)s正确解读; 可能时间有歧义或者不存" "在." +msgid "Clear" +msgstr "清除" + msgid "Currently" msgstr "目前" msgid "Change" msgstr "修改" -msgid "Clear" -msgstr "清除" - msgid "Unknown" msgstr "未知" @@ -1044,7 +1061,7 @@ msgid "Forbidden" msgstr "禁止访问" msgid "CSRF verification failed. Request aborted." -msgstr "CSRF验证失败. 相应中断." +msgstr "CSRF验证失败. 请求被中断." msgid "" "You are seeing this message because this HTTPS site requires a 'Referer " @@ -1091,11 +1108,10 @@ msgid "Congratulations on your first Django-powered page." msgstr "祝贺你的第一个由Django驱动的页面。" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"当然，您还没有真正开始工作。接下来，请执行 python manage.py startapp " -"[app_label] 来创建您的第一个应用。" +"接下来运行你的第一个程序 python manage.py startapp [app_label]." msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo b/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo index 9cb4303ff3e3..c17ecd0aa9ab 100644 Binary files a/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_Hant/LC_MESSAGES/django.po b/django/conf/locale/zh_Hant/LC_MESSAGES/django.po index e9097b5e7322..a7c888758fac 100644 --- a/django/conf/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,15 +8,15 @@ # mail6543210 , 2013 # ming hsien tzang , 2011 # tcc , 2011 -# Tzu-ping Chung , 2016 +# Tzu-ping Chung , 2016-2017 # Yeh-Yung , 2013 # Yeh-Yung , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-29 20:57+0200\n" -"PO-Revision-Date: 2016-08-30 09:04+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 16:32+0000\n" "Last-Translator: Tzu-ping Chung \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" "language/zh_TW/)\n" @@ -302,6 +302,15 @@ 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 "請輸入有效的值。" @@ -384,6 +393,13 @@ 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 "and" msgstr "和" @@ -708,15 +724,15 @@ msgstr "" "%(datetime)s 無法被轉換成 %(current_timezone)s 時區格式; 可能是不符格式或不存" "在。" +msgid "Clear" +msgstr "清除" + msgid "Currently" msgstr "目前" msgid "Change" msgstr "變更" -msgid "Clear" -msgstr "清除" - msgid "Unknown" msgstr "未知" @@ -1081,11 +1097,11 @@ msgid "Congratulations on your first Django-powered page." msgstr "觀迎來到你的第一個 Django 頁面。" msgid "" -"Of course, you haven't actually done any work yet. Next, start your first " -"app by running python manage.py startapp [app_label]." +"Next, start your first app by running python manage.py startapp " +"[app_label]." msgstr "" -"當然，你什麼都還沒做。馬上用 python manage.py startapp [app_label] 建立你的第一個 app 吧。" +"馬上用 python manage.py startapp [app_label] 建立你的第一個 app " +"吧。" msgid "" "You're seeing this message because you have DEBUG = True in " diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index f07f3549cbda..4e6ea18a5273 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -17,7 +17,7 @@ def delete_selected(modeladmin, request, queryset): Default action which deletes the selected objects. This action first displays a confirmation page which shows all the - deleteable objects, or, if the user has no permission one of the related + deletable objects, or, if the user has no permission one of the related childs (foreignkeys), a "permission denied" message. Next, it deletes all selected objects and redirects back to the change list. diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 286c1169a489..f000fc269bd6 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -468,7 +468,8 @@ def _check_ordering_item(self, obj, model, field_name, label): else: if field_name.startswith('-'): field_name = field_name[1:] - + if field_name == 'pk': + return [] try: model._meta.get_field(field_name) except FieldDoesNotExist: diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 87839c313064..8980370fbf75 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -135,7 +135,9 @@ def has_output(self): def queryset(self, request, queryset): try: return queryset.filter(**self.used_parameters) - except ValidationError as e: + except (ValueError, ValidationError) as e: + # Fields may raise a ValueError or ValidationError when converting + # the parameters to the correct type. raise IncorrectLookupParameters(e) @classmethod diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index cbe03031a97c..b0726cee1207 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -355,7 +355,7 @@ def needs_explicit_pk_field(self): # Also search any parents for an auto field. (The pk info is propagated to child # models so that does not need to be checked in parents.) for parent in self.form._meta.model._meta.get_parent_list(): - if parent._meta.auto_field: + if parent._meta.auto_field or not parent._meta.model._meta.pk.editable: return True return False diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo index 8fea7f81b5af..24c2e880fa97 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 bdb247cb89a9..dc634d596814 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 +# znotdead , 2016-2017 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: 2016-09-15 10:32+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-15 07:03+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -212,8 +212,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Сьцерлі %(name)s «%(obj)s»." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Аб’ект %(name)s з галоўным ключом %(key)r не існуе." +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" diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo index 1c5885597367..59580fce6c97 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 11ce2fe2c10b..2c669bdaca96 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po @@ -6,13 +6,13 @@ # Jannis Leidel , 2011 # Lyuboslav Petrov , 2014 # Todor Lubenov , 2014-2015 -# Venelin Stoykov , 2015-2016 +# Venelin Stoykov , 2015-2017 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: 2016-06-30 17:44+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-25 23:02+0000\n" "Last-Translator: Venelin Stoykov \n" "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/" "bg/)\n" @@ -221,8 +221,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит. " #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s обект с първичен ключ %(key)r не съществува." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s с ИД \"%(key)s\" несъществува. Може би е изтрито?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo index 236615f9684c..e769eadb2344 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 b51d0888cb48..30a6932c743a 100644 --- a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Antoni Aloy , 2014-2015 +# Antoni Aloy , 2014-2015,2017 # Carles Barrobés , 2011-2012,2014 # duub qnnp, 2015 # Jannis Leidel , 2011 @@ -10,9 +10,9 @@ 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:28+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -67,10 +67,10 @@ msgid "This year" msgstr "Aquest any" msgid "No date" -msgstr "" +msgstr "Sense data" msgid "Has date" -msgstr "" +msgstr "Té data" #, python-format msgid "" @@ -136,7 +136,7 @@ msgstr "Objecte entrada del registre" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Afegit {name} \"{object}\"." msgid "Added." msgstr "Afegit." @@ -146,15 +146,15 @@ msgstr "i" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "Canviat {fields} a {name} \"{object}\"." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Canviats {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Eliminat {name} \"{object}\"." msgid "No fields changed." msgstr "Cap camp modificat." @@ -170,31 +170,39 @@ msgstr "Premi \"Control\" o \"Command\" a un Mac per seleccionar-ne més d'un." 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." #, 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 " +"sota." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "El {name} \"{obj}\" fou afegit amb èxit." #, 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." #, 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 " +"sota." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "El {name} \"{obj}\" fou canviat amb èxit." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -211,8 +219,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s amb ID \"%(key)s\" no existeix. Potser va ser eliminat?" #, python-format msgid "Add %s" @@ -466,10 +474,10 @@ msgid "You don't have permission to edit anything." msgstr "No teniu permís per editar res." msgid "Recent actions" -msgstr "" +msgstr "Accions recents" msgid "My actions" -msgstr "" +msgstr "Les meves accions" msgid "None available" msgstr "Cap disponible" diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo index e9a9352ec376..32c5bc54e97b 100644 Binary files a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po index 8e1e6612992e..c3d48e42d78a 100644 --- a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Antoni Aloy , 2017 # Carles Barrobés , 2011-2012,2014 # Jannis Leidel , 2011 # Roger Pons , 2015 @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-14 07:22+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -150,68 +151,68 @@ msgid "Tomorrow" msgstr "Demà" msgid "January" -msgstr "" +msgstr "Gener" msgid "February" -msgstr "" +msgstr "Febrer" msgid "March" -msgstr "" +msgstr "Març" msgid "April" -msgstr "" +msgstr "Abril" msgid "May" -msgstr "" +msgstr "Maig" msgid "June" -msgstr "" +msgstr "Juny" msgid "July" -msgstr "" +msgstr "Juliol" msgid "August" -msgstr "" +msgstr "Agost" msgid "September" -msgstr "" +msgstr "Setembre" msgid "October" -msgstr "" +msgstr "Octubre" msgid "November" -msgstr "" +msgstr "Novembre" msgid "December" -msgstr "" +msgstr "Desembre" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "D" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "L" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "M" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "X" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "J" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "V" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "S" msgid "Show" msgstr "Mostrar" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo index ea58660a5428..2badc904c973 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 ffe3d6a5ef5d..04ec15f94f29 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-2016 +# Vláďa Macek , 2015-2017 # yedpodtrzitko , 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: 2016-09-16 22:14+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-21 09:43+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" @@ -221,8 +221,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně odstraněna." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Položka \"%(name)s\" s primárním klíčem \"%(key)r\" neexistuje." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "Objekt %(name)s s klíčem \"%(key)s\" neexistuje. Možná byl odstraněn." #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo index cba678daaa69..b5174075f616 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 1ac6e9dc9792..38e7c9bd8842 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/da/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Christian Joergensen , 2012 # Dimitris Glezos , 2012 -# Erik Wognsen , 2013,2015-2016 +# Erik Wognsen , 2013,2015-2017 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 # valberg , 2014-2015 @@ -11,8 +11,8 @@ 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: 2016-05-21 09:51+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 22:41+0000\n" "Last-Translator: Erik Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" @@ -213,8 +213,9 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" blev slettet." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" +"%(name)s med ID \"%(key)s\" findes ikke. Måske er objektet blevet slettet?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo index 4a940a13e98a..8cac2044974f 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 91b0c134bdce..bc47bda66b47 100644 --- a/django/contrib/admin/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/de/LC_MESSAGES/django.po @@ -5,15 +5,15 @@ # Florian Apolloner , 2011 # Dimitris Glezos , 2012 # Jannis, 2013 -# Jannis Leidel , 2013-2016 +# Jannis Leidel , 2013-2017 # Jannis, 2016 # Markus Holtermann , 2013,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: 2016-07-26 11:53+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 09:17+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n" "MIME-Version: 1.0\n" @@ -78,8 +78,8 @@ msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Bitte einen gültigen %(username)s und ein Passwort für einen Staff-Account " -"eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung." +"Bitte %(username)s und Passwort für einen Staff-Account eingeben. Beide " +"Felder berücksichtigen die Groß-/Kleinschreibung." msgid "Action:" msgstr "Aktion:" @@ -221,9 +221,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" -"Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s mit ID \"%(key)s\" existiert nicht. Eventuell gelöscht?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo index 2c9f6a0c3f46..306b35582c92 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 125c4f22ba8f..d2f9bb87be04 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 +# Michael Wolf , 2016-2017 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: 2016-06-12 16:37+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:36+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -214,8 +214,8 @@ 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 object with primary key %(key)r does not exist." -msgstr "Objekt %(name)s z primarnym klucom %(key)r njeeksistěrujo." +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" diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo index 30f6ac519a7c..3405f602b51c 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 5e32ed20934f..c2b6f39aedde 100644 --- a/django/contrib/admin/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/el/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # Dimitris Glezos , 2011 # Giannis Meletakis , 2015 # Jannis Leidel , 2011 +# Nick Mavrakis , 2017 # Nick Mavrakis , 2016 # Pãnoș , 2014 # Pãnoș , 2016 @@ -12,9 +13,9 @@ 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: 2016-07-20 19:46+0000\n" -"Last-Translator: Pãnoș \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 10:59+0000\n" +"Last-Translator: Nick Mavrakis \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" @@ -224,8 +225,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr " Το αντικείμενο %(name)s με πρωτεύον κλειδί %(key)r δεν βρέθηκε." +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" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 172c8224c3d6..7ff80586691d 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: 2016-05-17 23:12+0200\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -250,10 +250,9 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/options.py:1424 contrib/admin/options.py:1682 -#: contrib/admin/options.py:1738 +#: contrib/admin/options.py:1397 #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" msgstr "" #: contrib/admin/options.py:1475 diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo index 5aff0679201e..c7f1a69c67b5 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 f425de19d281..1db922d2376e 100644 --- a/django/contrib/admin/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/eo/LC_MESSAGES/django.po @@ -3,16 +3,18 @@ # Translators: # Baptiste Darthenay , 2012-2013 # Baptiste Darthenay , 2013-2016 +# Claude Paroz , 2016 # Dinu Gherman , 2011 # kristjan , 2012 +# Nikolay Korotkiy , 2017 # Adamo Mesha , 2012 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: 2016-09-28 11:25+0000\n" -"Last-Translator: Baptiste Darthenay \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-20 12:56+0000\n" +"Last-Translator: Nikolay Korotkiy \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" "MIME-Version: 1.0\n" @@ -219,8 +221,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "La %(name)s \"%(obj)s\" estis forigita sukcese." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s objekto kun ĉefŝlosilo %(key)r ne ekzistas." +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?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo index 85f3320bd8c9..59da2d28d40e 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 c8e764a28599..be63df18c5e3 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.po @@ -13,15 +13,16 @@ # Yusuf (Josè) Luis , 2016 # Josue Naaman Nistal Guerra , 2014 # Marc Garcia , 2011 +# Miguel Angel Tribaldos , 2017 # Pablo, 2015 # 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: 2016-08-03 15:38+0000\n" -"Last-Translator: Ernesto Avilés Vázquez \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:36+0000\n" +"Last-Translator: Miguel Angel Tribaldos \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -200,16 +201,20 @@ msgstr "Se añadió con éxito el {name} \"{obj}\"." msgid "" "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 " +"continuación." #, python-brace-format msgid "" "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 " +"continuación." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "Se modificó con éxito el {name} \"{obj}\"." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -226,8 +231,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r." +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?" #, python-format msgid "Add %s" 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 a761c7f6b6e9..4a5c88c3e490 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 af34ad1d1fae..45663d6abea6 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-2016 +# Ramiro Morales, 2013-2017 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: 2016-08-02 03:26+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 10:57+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -149,7 +149,7 @@ msgstr "Se modifican {fields} en {name} \"{object}\"." #, python-brace-format msgid "Changed {fields}." -msgstr "Se modifican {fields}." +msgstr "Modificación de {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." @@ -170,32 +170,35 @@ msgstr "" #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgstr "Se agregó con éxito {name} \"{obj}\". Puede modificarlo/a abajo." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"Se agregó con éxito {name} \"{obj}\". Puede agregar otro/a {name} abajo." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "Se agregó con éxito {name} \"{obj}\"." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." msgstr "" +"Se modificó con éxito {name} \"{obj}\". Puede modificarlo/a nuevamente abajo." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" +"Se modificó con éxito {name} \"{obj}\". Puede agregar otro {name} abajo." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "Se modificó con éxito {name} \"{obj}\"." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -212,8 +215,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "No existe %(name)s con ID \"%(key)s\". ¿Quizá fue eliminado/a?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo index 07076f36e6d5..803555bd7de9 100644 Binary files a/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po index 2bd79e01e908..e4e22c595541 100644 --- a/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 # Hotellook, 2014 # Leonardo J. Caballero G. , 2016 +# Yoel Acevedo, 2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 12:07+0000\n" +"Last-Translator: Eduardo \n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -64,10 +66,10 @@ msgid "This year" msgstr "Este año" msgid "No date" -msgstr "" +msgstr "Sin fecha" msgid "Has date" -msgstr "" +msgstr "Tiene fecha" #, python-format msgid "" @@ -133,7 +135,7 @@ msgstr "Objeto LogEntry" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Agregado {name} \"{object}\"." msgid "Added." msgstr "Añadido." @@ -143,15 +145,15 @@ msgstr "y" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "Modificado {fields} por {name} \"{object}\"." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Modificado {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Eliminado {name} \"{object}\"." msgid "No fields changed." msgstr "No ha cambiado ningún campo." @@ -169,31 +171,39 @@ msgstr "" msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." msgstr "" +"El {name} \"{obj}\" fue agregado satisfactoriamente. Puede editarlo " +"nuevamente a continuación. " #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"El {name} \"{obj}\" fue agregado satisfactoriamente. Puede agregar otro " +"{name} a continuación. " #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "El {name} \"{obj}\" fue cambiado satisfactoriamente." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." msgstr "" +"El {name} \"{obj}\" fue cambiado satisfactoriamente. Puede editarlo " +"nuevamente a continuación. " #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" +"El {name} \"{obj}\" fue cambiado satisfactoriamente. Puede agregar otro " +"{name} a continuación." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "El {name} \"{obj}\" fue cambiado satisfactoriamente." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -210,8 +220,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s con ID \"%(key)s\" no existe. ¿Tal vez fue eliminada?" #, python-format msgid "Add %s" @@ -466,10 +476,10 @@ msgid "You don't have permission to edit anything." msgstr "No tiene permiso para editar nada." msgid "Recent actions" -msgstr "" +msgstr "Acciones recientes" msgid "My actions" -msgstr "" +msgstr "Mis acciones" msgid "None available" msgstr "Ninguno disponible" diff --git a/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo index 543e40a2e329..de759b1b9384 100644 Binary files a/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po index 65aa92260a4c..0551a773448b 100644 --- a/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 # FIRST AUTHOR , 2012 # Hotellook, 2014 # Leonardo J. Caballero G. , 2016 @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-14 18:16+0000\n" +"Last-Translator: Eduardo \n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -151,68 +152,68 @@ msgid "Tomorrow" msgstr "Mañana" msgid "January" -msgstr "" +msgstr "Enero" msgid "February" -msgstr "" +msgstr "Febrero" msgid "March" -msgstr "" +msgstr "Marzo" msgid "April" -msgstr "" +msgstr "Abril" msgid "May" -msgstr "" +msgstr "Mayo" msgid "June" -msgstr "" +msgstr "Junio" msgid "July" -msgstr "" +msgstr "Julio" msgid "August" -msgstr "" +msgstr "Agosto" msgid "September" -msgstr "" +msgstr "Septiembre" msgid "October" -msgstr "" +msgstr "Octubre" msgid "November" -msgstr "" +msgstr "Noviembre" msgid "December" -msgstr "" +msgstr "Diciembre" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "D" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "L" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "M" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "M" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "J" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "V" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "S" msgid "Show" msgstr "Mostrar" diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo index 61058f57a8df..9c254d9070d5 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 b2b213c60d9d..c19b555481b4 100644 --- a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po @@ -1,7 +1,8 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aitzol Naberan , 2013 +# Aitzol Naberan , 2013,2016 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 # julen , 2012-2013 # julen , 2013 @@ -9,9 +10,9 @@ 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-04 12:38+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -28,14 +29,14 @@ msgid "Cannot delete %(name)s" msgstr "Ezin da %(name)s ezabatu" msgid "Are you sure?" -msgstr "Ziur zaude?" +msgstr "Ziur al zaude?" #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ezabatu aukeratutako %(verbose_name_plural)s" msgid "Administration" -msgstr "" +msgstr "Kudeaketa" msgid "All" msgstr "Dena" @@ -65,10 +66,10 @@ msgid "This year" msgstr "Urte hau" msgid "No date" -msgstr "" +msgstr "Datarik ez" msgid "Has date" -msgstr "" +msgstr "Data dauka" #, python-format msgid "" @@ -92,18 +93,18 @@ msgid "action time" msgstr "Ekintza hordua" msgid "user" -msgstr "" +msgstr "erabiltzailea" msgid "content type" -msgstr "" +msgstr "eduki mota" msgid "object id" -msgstr "Objetuaren id-a" +msgstr "objetuaren id-a" #. Translators: 'repr' means representation #. (https://docs.python.org/3/library/functions.html#repr) msgid "object repr" -msgstr "Objeturaren aurkezpena" +msgstr "objeturaren adierazpena" msgid "action flag" msgstr "Ekintza botoia" @@ -130,14 +131,14 @@ msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" ezabatuta." msgid "LogEntry Object" -msgstr "LogEntry objektua" +msgstr "LogEntry objetua" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "{name} \"{object}\" gehitu." msgid "Added." -msgstr "" +msgstr "Gehituta" msgid "and" msgstr "eta" @@ -209,8 +210,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ondo ezabatu da." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Ez dago %(key)r gakodun %(name)s objekturik." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -221,7 +222,7 @@ msgid "Change %s" msgstr "Aldatu %s" msgid "Database error" -msgstr "Datu-basearen errorea" +msgstr "Errorea datu-basean" #, python-format msgid "%(count)s %(name)s was changed successfully." @@ -297,7 +298,7 @@ msgid "" "email and should be fixed shortly. Thanks for your patience." msgstr "" "Errore bat gertatu da. Errorea guneko kudeatzaileari jakinarazi zaio email " -"bidez eta laister egon beharko luke konponduta. Barkatu eragozpenak." +"bidez eta laster egon beharko luke konponduta. Barkatu eragozpenak." msgid "Run the selected action" msgstr "Burutu hautatutako ekintza" @@ -323,7 +324,7 @@ msgstr "" "gehiago aldatu ahal izango dituzu." msgid "Enter a username and password." -msgstr "Idatzi erabiltzaile-izen eta pasahitza." +msgstr "Sartu erabiltzaile izen eta pasahitz bat." msgid "Change password" msgstr "Aldatu pasahitza" @@ -343,7 +344,7 @@ msgid "Welcome," msgstr "Ongi etorri," msgid "View site" -msgstr "" +msgstr "Webgunea ikusi" msgid "Documentation" msgstr "Dokumentazioa" @@ -403,7 +404,7 @@ msgstr "" "Erlazionaturik dauden hurrengo elementuak ere ezabatuko dira:" msgid "Objects" -msgstr "" +msgstr "Objetuak" msgid "Yes, I'm sure" msgstr "Bai, ziur nago" @@ -451,7 +452,7 @@ msgid " By %(filter_title)s " msgstr "Irizpidea: %(filter_title)s" msgid "Summary" -msgstr "" +msgstr "Laburpena" #, python-format msgid "Models in the %(name)s application" @@ -464,10 +465,10 @@ msgid "You don't have permission to edit anything." msgstr "Ez daukazu ezer aldatzeko baimenik." msgid "Recent actions" -msgstr "" +msgstr "Azken ekintzak" msgid "My actions" -msgstr "" +msgstr "Nire ekintzak" msgid "None available" msgstr "Ez dago ezer" @@ -480,8 +481,8 @@ msgid "" "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Zerbait gaizki dago zure datu-basearekin. Ziurtatu datu-baseko taulak sortu " -"direla eta erabiltzaile egokiak irakurtzeko baimena duela." +"Zerbait gaizki dago zure datu-basearen instalazioan. Ziurtatu datu-baseko " +"taulak sortu direla eta dagokion erabiltzaileak irakurtzeko baimena duela." #, python-format msgid "" @@ -604,6 +605,9 @@ 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 "" +"Zure pasahitza ezartzeko jarraibideak bidali dizkizugu email bidez, sartu " +"duzun helbide elektronikoa kontu bati lotuta badago. Laster jaso beharko " +"zenituzke." msgid "" "If you don't receive an email, please make sure you've entered the address " @@ -618,7 +622,7 @@ msgid "" "user account at %(site_name)s." msgstr "" "Mezu hau %(site_name)s webgunean pasahitza berrezartzea eskatu duzulako jaso " -"duzu" +"duzu." msgid "Please go to the following page and choose a new password:" msgstr "Zoaz hurrengo orrira eta aukeratu pasahitz berria:" diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo index 26b18703cb4a..5b73e05d110e 100644 Binary files a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po index 052ecc14b0f7..aff6a2c836d0 100644 --- a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po @@ -2,6 +2,7 @@ # # Translators: # Aitzol Naberan , 2011 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 # julen , 2012-2013 msgid "" @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 15:20+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -20,7 +21,7 @@ msgstr "" #, javascript-format msgid "Available %s" -msgstr "%s Erabilgarri" +msgstr "%s erabilgarri" #, javascript-format msgid "" @@ -53,7 +54,7 @@ msgstr "Kendu" #, javascript-format msgid "Chosen %s" -msgstr "%s Aukeratuak" +msgstr "%s aukeratuak" #, javascript-format msgid "" @@ -101,20 +102,20 @@ msgstr "" #, 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] "" +msgstr[0] "Oharra: zerbitzariaren denborarekiko ordu %s aurrerago zaude" +msgstr[1] "Oharra: zerbitzariaren denborarekiko %s ordu aurrerago zaude" #, 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] "" +msgstr[0] "Oharra: zerbitzariaren denborarekiko ordu %s atzerago zaude. " +msgstr[1] "Oharra: zerbitzariaren denborarekiko %s ordu atzerago zaude. " msgid "Now" msgstr "Orain" msgid "Choose a Time" -msgstr "" +msgstr "Aukeratu ordu bat" msgid "Choose a time" msgstr "Aukeratu ordu bat" @@ -129,7 +130,7 @@ msgid "Noon" msgstr "Eguerdia" msgid "6 p.m." -msgstr "" +msgstr "6 p.m." msgid "Cancel" msgstr "Atzera" @@ -138,7 +139,7 @@ msgid "Today" msgstr "Gaur" msgid "Choose a Date" -msgstr "" +msgstr "Aukeratu data bat" msgid "Yesterday" msgstr "Atzo" @@ -147,68 +148,68 @@ msgid "Tomorrow" msgstr "Bihar" msgid "January" -msgstr "" +msgstr "Urtarrila" msgid "February" -msgstr "" +msgstr "Otsaila" msgid "March" -msgstr "" +msgstr "Martxoa" msgid "April" -msgstr "" +msgstr "Apirila" msgid "May" -msgstr "" +msgstr "Maiatza" msgid "June" -msgstr "" +msgstr "Ekaina" msgid "July" -msgstr "" +msgstr "Uztaila" msgid "August" -msgstr "" +msgstr "Abuztua" msgid "September" -msgstr "" +msgstr "Iraila" msgid "October" -msgstr "" +msgstr "Urria" msgid "November" -msgstr "" +msgstr "Azaroa" msgid "December" -msgstr "" +msgstr "Abendua" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "I" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "A" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "A" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "A" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "O" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "O" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "L" msgid "Show" msgstr "Erakutsi" diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo index 25dbb3498df1..336f1492ad6a 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 0982f0a45af6..63f7b12a00dd 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 +# Aarni Koskela, 2015,2017 # Antti Kaihola , 2011 # Jannis Leidel , 2011 # Klaus Dahlén , 2012 @@ -9,9 +9,9 @@ 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 11:56+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -66,10 +66,10 @@ msgid "This year" msgstr "Tänä vuonna" msgid "No date" -msgstr "" +msgstr "Ei päivämäärää" msgid "Has date" -msgstr "" +msgstr "On päivämäärä" #, python-format msgid "" @@ -135,7 +135,7 @@ msgstr "Lokimerkintätietue" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Lisätty {name} \"{object}\"." msgid "Added." msgstr "Lisätty." @@ -145,15 +145,15 @@ msgstr "ja" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "Muutettu {fields} {name}-kohteelle \"{object}\"." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Muutettu {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Poistettu {name} \"{object}\"." msgid "No fields changed." msgstr "Ei muutoksia kenttiin." @@ -170,32 +170,32 @@ msgstr "" #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgstr "{name} \"{obj}\" on lisätty. Voit muokata sitä uudelleen alla." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." -msgstr "" +msgstr "{name} \"{obj}\" on lisätty. Voit lisätä toisen {name} alla." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "{name} \"{obj}\" on lisätty." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +msgstr "{name} \"{obj}\" on muokattu. Voit muokata sitä edelleen alla." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." -msgstr "" +msgstr "{name} \"{obj}\" on muokattu. Voit lisätä toisen alla." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "{name} \"{obj}\" on muokattu." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -212,8 +212,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" on poistettu." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s perusavaimella %(key)r ei ole olemassa." +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" @@ -466,10 +466,10 @@ msgid "You don't have permission to edit anything." msgstr "Sinulla ei ole oikeutta muokata mitään." msgid "Recent actions" -msgstr "" +msgstr "Viimeisimmät tapahtumat" msgid "My actions" -msgstr "" +msgstr "Omat tapahtumat" msgid "None available" msgstr "Ei yhtään" diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo index e68cede0d6a0..e26fe4802e92 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 764e877a5308..b5fd29f3cb7d 100644 --- a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015 +# Aarni Koskela, 2015,2017 # Antti Kaihola , 2011 # Jannis Leidel , 2011 msgid "" @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-06 21:20+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -150,68 +150,68 @@ msgid "Tomorrow" msgstr "Huomenna" msgid "January" -msgstr "" +msgstr "tammikuu" msgid "February" -msgstr "" +msgstr "helmikuu" msgid "March" -msgstr "" +msgstr "maaliskuu" msgid "April" -msgstr "" +msgstr "huhtikuu" msgid "May" -msgstr "" +msgstr "toukokuu" msgid "June" -msgstr "" +msgstr "kesäkuu" msgid "July" -msgstr "" +msgstr "heinäkuu" msgid "August" -msgstr "" +msgstr "elokuu" msgid "September" -msgstr "" +msgstr "syyskuu" msgid "October" -msgstr "" +msgstr "lokakuu" msgid "November" -msgstr "" +msgstr "marraskuu" msgid "December" -msgstr "" +msgstr "joulukuu" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "Su" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "Ma" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "Ti" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "Ke" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "To" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "Pe" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "La" msgid "Show" msgstr "Näytä" diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo index db79af91dd8c..e423047ffe5d 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 b752694beecf..386d7b2bd837 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2013-2016 +# Claude Paroz , 2013-2017 # Claude Paroz , 2011,2013 # 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: 2016-05-21 16:32+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 14:44+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -119,22 +119,22 @@ msgstr "entrées d'historique" #, python-format msgid "Added \"%(object)s\"." -msgstr "%(object)s ajouté(e)s." +msgstr "Ajout de « %(object)s »." #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "%(object)s modifié(e)s - %(changes)s" +msgstr "Modification de « %(object)s » - %(changes)s" #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "%(object)s supprimé(e)s" +msgstr "Suppression de « %(object)s »." msgid "LogEntry Object" msgstr "Objet de journal" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "{name} « {object} » ajouté." +msgstr "Ajout de {name} « {object} »." msgid "Added." msgstr "Ajout." @@ -144,15 +144,15 @@ msgstr "et" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{fields} modifié(s) pour l'objet {name} « {object} »." +msgstr "Modification de {fields} pour l'objet {name} « {object} »." #, python-brace-format msgid "Changed {fields}." -msgstr "{fields} modifié(s)." +msgstr "Modification de {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "{name} « {object} » supprimé." +msgstr "Suppression de {name} « {object} »." msgid "No fields changed." msgstr "Aucun champ modifié." @@ -219,8 +219,10 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "L'objet %(name)s « %(obj)s » a été supprimé avec succès." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "L'objet %(name)s avec la clef primaire %(key)r n'existe pas." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" +"%(name)s avec l'identifiant « %(key)s » n'existe pas. Peut-être a-t-il été " +"supprimé ?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gd/LC_MESSAGES/django.mo index fce0d02955c8..5689ef68bf3e 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 9fcf0d6485b3..3ee02ff36d62 100644 --- a/django/contrib/admin/locale/gd/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/gd/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# GunChleoc, 2015-2016 +# GunChleoc, 2015-2017 # GunChleoc, 2015 # GunChleoc, 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: 2016-05-21 10:24+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 11:01+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" @@ -219,8 +219,10 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Chaidh %(name)s “%(obj)s” a sguabadh às gu soirbheachail." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Chan eil oibseact %(name)s air a bheil prìomh-iuchair %(key)r ann." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" +"Chan eil %(name)s leis an ID \"%(key)s\" ann. 'S dòcha gun deach a sguabadh " +"às?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo index 604d336be00a..830a661b96b7 100644 Binary files a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po index 4b7a9b8bad0d..d84aa72322c3 100644 --- a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # fasouto , 2011-2012 # fonso , 2011,2013 +# fasouto , 2017 # Jannis Leidel , 2011 # Leandro Regueiro , 2013 # Oscar Carballal , 2011-2012 @@ -11,9 +12,9 @@ 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-28 16:25+0000\n" +"Last-Translator: fasouto \n" "Language-Team: Galician (http://www.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -68,10 +69,10 @@ msgid "This year" msgstr "Este ano" msgid "No date" -msgstr "" +msgstr "Sen data" msgid "Has date" -msgstr "" +msgstr "Ten data" #, python-format msgid "" @@ -95,7 +96,7 @@ msgid "action time" msgstr "hora da acción" msgid "user" -msgstr "" +msgstr "usuario" msgid "content type" msgstr "" @@ -140,7 +141,7 @@ msgid "Added {name} \"{object}\"." msgstr "" msgid "Added." -msgstr "" +msgstr "Engadido" msgid "and" msgstr "e" @@ -212,8 +213,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "O obxecto %(name)s con primary key %(key)r non existe." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -272,7 +273,7 @@ msgstr "Iniciar sesión" #, python-format msgid "%(app)s administration" -msgstr "" +msgstr "administración de %(app)s " msgid "Page not found" msgstr "Páxina non atopada" @@ -343,7 +344,7 @@ msgid "Welcome," msgstr "Benvido," msgid "View site" -msgstr "" +msgstr "Ver sitio" msgid "Documentation" msgstr "Documentación" @@ -466,10 +467,10 @@ msgid "You don't have permission to edit anything." msgstr "Non ten permiso para editar nada." msgid "Recent actions" -msgstr "" +msgstr "Accións recentes" msgid "My actions" -msgstr "" +msgstr "As miñas accións" msgid "None available" msgstr "Ningunha dispoñíbel" diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo index 4c6980a42cc3..28760c08deae 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 cf53a0d514c4..773081c1a9c2 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/he/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # Translators: # Alex Gaynor , 2011 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2015 +# Meir Kriheli , 2011-2015,2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-01 14:34+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" @@ -64,10 +64,10 @@ msgid "This year" msgstr "השנה" msgid "No date" -msgstr "" +msgstr "ללא תאריך" msgid "Has date" -msgstr "" +msgstr "עם תאריך" #, python-format msgid "" @@ -133,7 +133,7 @@ msgstr "אובייקט LogEntry" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "בוצעה הוספת {name} \"{object}\"." msgid "Added." msgstr "נוסף." @@ -143,15 +143,15 @@ msgstr "ו" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "בוצע שינוי {fields} עבור {name} \"{object}\"." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr " {fields} שונו." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "בוצעה מחיקת {name} \"{object}\"." msgid "No fields changed." msgstr "אף שדה לא השתנה." @@ -167,32 +167,32 @@ msgstr "" #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה. ניתן לערוך שוב מתחת." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." -msgstr "" +msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה. ניתן להוסיף עוד {name} מתחת.." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "הוספת {name} \"{obj}\" בוצעה בהצלחה." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +msgstr "עדכון {name} \"{obj}\" " #, python-brace-format msgid "" "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 "" +msgstr "שינוי {name} \"{obj}\" בוצע בהצלחה." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -207,8 +207,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים." +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" @@ -458,10 +458,10 @@ msgid "You don't have permission to edit anything." msgstr "אין לך הרשאות לעריכה." msgid "Recent actions" -msgstr "" +msgstr "פעולות אחרונות" msgid "My actions" -msgstr "" +msgstr "הפעולות שלי" msgid "None available" msgstr "לא נמצאו" diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo index 4611b961a39e..31dab0aec9ad 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 176a070f2d7e..df72cfdadd81 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po @@ -3,14 +3,14 @@ # Translators: # Alex Gaynor , 2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2012,2014-2015 +# Meir Kriheli , 2011-2012,2014-2015,2017 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: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-04-01 14:55+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" @@ -20,7 +20,7 @@ msgstr "" #, javascript-format msgid "Available %s" -msgstr "%s זמינות" +msgstr "אפשרויות %s זמינות" #, javascript-format msgid "" @@ -146,68 +146,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/hr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo index 6f7248994054..0591b05d20b5 100644 Binary files a/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po index 5c322eac1286..b35df6de4195 100644 --- a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po @@ -3,16 +3,17 @@ # Translators: # aljosa , 2011,2013 # Bojan Mihelač , 2012 +# Filip Cuk , 2016 # Jannis Leidel , 2011 -# Mislav Cimperšak , 2013,2015 +# Mislav Cimperšak , 2013,2015-2016 # Ylodi , 2015 # Ylodi , 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: 2016-05-21 09:09+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:14+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Croatian (http://www.transifex.com/django/django/language/" "hr/)\n" @@ -69,10 +70,10 @@ msgid "This year" msgstr "Ova godina" msgid "No date" -msgstr "" +msgstr "Nema datuma" msgid "Has date" -msgstr "" +msgstr "Ima datum" #, python-format msgid "" @@ -215,8 +216,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" uspješno izbrisan." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Unos %(name)s sa primarnim ključem %(key)r ne postoji." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -470,10 +471,10 @@ msgid "You don't have permission to edit anything." msgstr "Nemate privilegije za promjenu podataka." msgid "Recent actions" -msgstr "" +msgstr "Nedavne promjene" msgid "My actions" -msgstr "" +msgstr "Moje promjene" msgid "None available" msgstr "Nije dostupno" diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo index ddf673706263..a6dc5d7b9d28 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 7044813f8472..aa4f5981ad95 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 +# Michael Wolf , 2016-2017 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: 2016-06-12 16:37+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:21+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -210,8 +210,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" je so wuspěšnje zhašał." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Objekt %(name)s z primarnym klučom %(key)r njeeksistuje." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s z ID \" %(key)s\" njeeksistuje. Je so snano zhašało?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo index eb9c49b21fe9..35736f7723df 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 9059c454e245..29bfa58fcc96 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # Ádám Krizsány , 2015 # András Veres-Szentkirályi, 2016 # Jannis Leidel , 2011 +# János Péter Ronkay , 2017 # János Péter Ronkay , 2014 # Kristóf Gruber <>, 2012 # slink , 2011 @@ -12,9 +13,9 @@ 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: 2016-07-19 07:39+0000\n" -"Last-Translator: András Veres-Szentkirályi\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 00:43+0000\n" +"Last-Translator: János Péter Ronkay \n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -217,8 +218,9 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "\"%(obj)s\" %(name)s sikeresen törölve." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s objektum %(key)r elsődleges kulccsal nem létezik." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" +"Nem létezik %(name)s ezzel az azonosítóval: \"%(key)s\". Netán törölve lett?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo index f2bf53a0ca40..ed6e0a72a67a 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 958bcdfee82a..07bbae4db10c 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-07-19 07:42+0000\n" -"Last-Translator: András Veres-Szentkirályi\n" +"PO-Revision-Date: 2017-03-22 00:43+0000\n" +"Last-Translator: János Péter Ronkay \n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo index e877e4b39e8f..97547d87f996 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 83d39c696384..b8b9fd84ccbb 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.po @@ -2,19 +2,19 @@ # # Translators: # Claude Paroz , 2014 -# Fery Setiawan , 2015-2016 +# Fery Setiawan , 2015-2017 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi (OonID) , 2016 # rodin , 2011-2013 -# rodin , 2013-2015 +# rodin , 2013-2016 # Sutrisno Efendi , 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: 2016-08-24 04:56+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-05 13:15+0000\n" "Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" @@ -174,8 +174,8 @@ msgstr "" msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." msgstr "" -"{name} \"{obj}\" telah berhasil ditambahkan. Anda dapat menyuntingnya " -"kembali dibawah." +"{name} \"{obj}\" telah berhasil ditambahkan. Anda dapat mengeditnya kembali " +"di bawah." #, python-brace-format msgid "" @@ -183,7 +183,7 @@ msgid "" "below." msgstr "" "{name} \"{obj}\" telah berhasil ditambahkan. Anda dapat menambahkan {name} " -"lain dibawah." +"lain di bawah." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." @@ -193,20 +193,20 @@ msgstr "{name} \"{obj}\" telah berhasil ditambahkan." msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." msgstr "" -" {name} \"{obj}\" telah berhasil dirubah. Anda dapat menyuntingnya kembali " -"dibawah." +" {name} \"{obj}\" telah berhasil diubah. Anda dapat mengeditnya kembali di " +"bawah." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" -"{name} \"{obj}\" telah berhasil dirubah. Anda dapat menambahkan {name} lain " -"dibawah." +"{name} \"{obj}\" telah berhasil diubah. Anda dapat menambahkan {name} lain " +"di bawah." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" telah berhasil dirubah." +msgstr "{name} \"{obj}\" telah berhasil diubah." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -222,8 +222,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" berhasil dihapus." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Objek %(name)s dengan kunci utama %(key)r tidak ada." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s dengan ID \"%(key)s\" tidak ada. Mungkin itu telah dihapus?" #, python-format msgid "Add %s" @@ -474,7 +474,7 @@ msgid "You don't have permission to edit anything." msgstr "Anda tidak memiliki izin untuk mengubah apapun." msgid "Recent actions" -msgstr "Tindakah terbaru" +msgstr "Tindakan terbaru" msgid "My actions" msgstr "Tindakan saya" @@ -498,8 +498,8 @@ 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 "" -"Anda dikenali sebagai %(username)s, tapi tidak diperbolehkan untuk mengakses " -"halaman ini. Anda ingin mencoba mengakses menggunakan akun yang lain?" +"Anda diautentikasi sebagai %(username)s, tapi tidak diperbolehkan untuk " +"mengakses halaman ini. Ingin mencoba mengakses menggunakan akun yang lain?" msgid "Forgotten your password or username?" msgstr "Lupa nama pengguna atau sandi?" @@ -527,7 +527,7 @@ msgid "Save" msgstr "Simpan" msgid "Popup closing..." -msgstr "Menutup popup..." +msgstr "Menutup jendela sembulan..." #, python-format msgid "Change selected %(model)s" @@ -618,8 +618,8 @@ 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 "" -"Kami mengirimi anda instruksi untuk pengubahan kata sandi, jika ada akun " -"dengan alamat email yang sesuai. Anda seharusnya menerimanya sesaat lagi." +"Kami mengirimi Anda petunjuk untuk mengubah kata sandi. Jika ada akun dengan " +"alamat email yang sesuai. Anda seharusnya menerimanya sesaat lagi." msgid "" "If you don't receive an email, please make sure you've entered the address " diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo index 0bf816907ad1..8ee49dcf0f89 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 ac18cd79c23e..8773b424213b 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po @@ -4,14 +4,14 @@ # Fery Setiawan , 2015-2016 # Jannis Leidel , 2011 # rodin , 2011-2012 -# rodin , 2014 +# rodin , 2014,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: 2016-08-25 02:21+0000\n" -"Last-Translator: Fery Setiawan \n" +"PO-Revision-Date: 2016-11-01 13:44+0000\n" +"Last-Translator: rodin \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -130,7 +130,7 @@ msgid "Noon" msgstr "Siang" msgid "6 p.m." -msgstr "6 p.m" +msgstr "18.00" msgid "Cancel" msgstr "Batal" @@ -185,27 +185,27 @@ msgstr "Desember" msgctxt "one letter Sunday" msgid "S" -msgstr "S" +msgstr "M" msgctxt "one letter Monday" msgid "M" -msgstr "M" +msgstr "S" msgctxt "one letter Tuesday" msgid "T" -msgstr "T" +msgstr "S" msgctxt "one letter Wednesday" msgid "W" -msgstr "W" +msgstr "R" msgctxt "one letter Thursday" msgid "T" -msgstr "T" +msgstr "K" msgctxt "one letter Friday" msgid "F" -msgstr "F" +msgstr "J" msgctxt "one letter Saturday" msgid "S" diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo index d16b87406470..bc9876ecd87b 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 b2d3c00de34d..7c09732be17d 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/is/LC_MESSAGES/django.po @@ -4,13 +4,14 @@ # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 # Kári Tristan Helgason , 2013 +# Thordur Sigurdsson , 2016-2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-03 15:12+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -35,7 +36,7 @@ msgid "Delete selected %(verbose_name_plural)s" msgstr "Eyða völdum %(verbose_name_plural)s" msgid "Administration" -msgstr "" +msgstr "Vefstjórn" msgid "All" msgstr "Allt" @@ -65,10 +66,10 @@ msgid "This year" msgstr "Þetta ár" msgid "No date" -msgstr "" +msgstr "Engin dagsetning" msgid "Has date" -msgstr "" +msgstr "Hefur dagsetningu" #, python-format msgid "" @@ -92,10 +93,10 @@ msgid "action time" msgstr "tími aðgerðar" msgid "user" -msgstr "" +msgstr "notandi" msgid "content type" -msgstr "" +msgstr "efnistag" msgid "object id" msgstr "kenni hlutar" @@ -119,40 +120,40 @@ msgstr "kladdafærslur" #, python-format msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" bætt við." +msgstr "„%(object)s“ bætt við." #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Breytti \"%(object)s\" - %(changes)s" +msgstr "Breytti „%(object)s“ - %(changes)s" #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "Eyddi \"%(object)s.\"" +msgstr "Eyddi „%(object)s.“" msgid "LogEntry Object" msgstr "LogEntry hlutur" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Bætti við {name} „{object}“." msgid "Added." -msgstr "" +msgstr "Bætti við." msgid "and" msgstr "og" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "Breytti {fields} fyrir {name} „{object}“." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Breytti {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Eyddi {name} „{object}“." msgid "No fields changed." msgstr "Engum reitum breytt." @@ -163,36 +164,40 @@ msgstr "Ekkert" msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" +"Haltu inni „Control“, eða „Command“ á Mac til þess að velja fleira en eitt." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." msgstr "" +"{name} „{obj}“ hefur verið bætt við. Þú getur breytt því aftur að neðan." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"{name} „{obj}“ hefur verið breytt. Þú getur bætt við öðru {name} að neðan." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "{name} „{obj}“ var bætt við." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +msgstr "{name} „{obj}“ hefur verið breytt. Þú getur breytt því aftur að neðan." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" +"{name} \"{obj}\" hefur verið breytt. Þú getur bætt við öðru {name} að neðan." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "{name} „{obj}“ hefur verið breytt." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -209,8 +214,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s „%(obj)s“ var eytt." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s hlutur með lykilinn %(key)r er ekki til." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s með ID \"%(key)s\" er ekki til. Var því mögulega eytt?" #, python-format msgid "Add %s" @@ -254,6 +259,8 @@ msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Að eyða %(class_name)s %(instance)s þyrfti að eyða eftirfarandi tengdum " +"hlutum: %(related_objects)s" msgid "Django site admin" msgstr "Django vefstjóri" @@ -269,7 +276,7 @@ msgstr "Skrá inn" #, python-format msgid "%(app)s administration" -msgstr "" +msgstr "%(app)s vefstjórn" msgid "Page not found" msgstr "Síða fannst ekki" @@ -293,6 +300,8 @@ 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 "" +"Villa kom upp. Hún hefur verið tilkynnt til vefstjóra með tölvupósti og ætti " +"að lagast fljótlega. Þökkum þolinmæðina." msgid "Run the selected action" msgstr "Keyra valda aðgerð" @@ -324,10 +333,10 @@ msgid "Change password" msgstr "Breyta lykilorði" msgid "Please correct the error below." -msgstr "Vinsamlegast leiðréttu villurnar hér að neðan:" +msgstr "Vinsamlegast leiðréttu villurnar hér að neðan." msgid "Please correct the errors below." -msgstr "" +msgstr "Vinsamlegast leiðréttu villurnar hér að neðan." #, python-format msgid "Enter a new password for the user %(username)s." @@ -337,7 +346,7 @@ msgid "Welcome," msgstr "Velkomin(n)," msgid "View site" -msgstr "" +msgstr "Skoða vef" msgid "Documentation" msgstr "Skjölun" @@ -385,7 +394,7 @@ msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"Að eyða %(object_name)s ' %(escaped_object)s ' þyrfti að eyða eftirfarandi " +"Að eyða %(object_name)s „%(escaped_object)s“ þyrfti að eyða eftirfarandi " "tengdum hlutum:" #, python-format @@ -397,13 +406,13 @@ msgstr "" "eftirfarandi verður eytt:" msgid "Objects" -msgstr "" +msgstr "Hlutir" msgid "Yes, I'm sure" msgstr "Já ég er viss." msgid "No, take me back" -msgstr "" +msgstr "Nei, fara til baka" msgid "Delete multiple objects" msgstr "Eyða mörgum hlutum." @@ -444,11 +453,11 @@ msgid " By %(filter_title)s " msgstr " Eftir %(filter_title)s " msgid "Summary" -msgstr "" +msgstr "Samantekt" #, python-format msgid "Models in the %(name)s application" -msgstr "" +msgstr "Módel í appinu %(name)s" msgid "Add" msgstr "Bæta við" @@ -457,10 +466,10 @@ msgid "You don't have permission to edit anything." msgstr "Þú hefur ekki réttindi til að breyta neinu" msgid "Recent actions" -msgstr "" +msgstr "Nýlegar aðgerðir" msgid "My actions" -msgstr "" +msgstr "Mínar aðgerðir" msgid "None available" msgstr "Engin fáanleg" @@ -473,7 +482,7 @@ msgid "" "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Eitthvað er að gagnagrunnsuppsetningu. Gakktu úr skuggum um að allar töflur " +"Eitthvað er að gagnagrunnsuppsetningu. Gakktu úr skugga um að allar töflur " "séu til staðar og að notandinn hafi aðgang að grunninum." #, python-format @@ -481,6 +490,8 @@ 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 "" +"Þú ert skráður inn sem %(username)s, en ert ekki með réttindi að þessari " +"síðu. Viltu skrá þig inn sem annar notandi?" msgid "Forgotten your password or username?" msgstr "Gleymt notandanafn eða lykilorð?" @@ -508,19 +519,19 @@ msgid "Save" msgstr "Vista" msgid "Popup closing..." -msgstr "" +msgstr "Sprettigluggi lokast..." #, python-format msgid "Change selected %(model)s" -msgstr "" +msgstr "Breyta völdu %(model)s" #, python-format msgid "Add another %(model)s" -msgstr "" +msgstr "Bæta við %(model)s" #, python-format msgid "Delete selected %(model)s" -msgstr "" +msgstr "Eyða völdu %(model)s" msgid "Search" msgstr "Leita" @@ -600,17 +611,25 @@ 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 "" +"Við höfum sent þér tölvupóst með leiðbeiningum til að endurstilla lykilorðið " +"þitt, sé aðgangur til með netfanginu sem þú slóst inn. Þú ættir að fá " +"leiðbeiningarnar fljótlega. " 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 "" +"Ef þú færð ekki tölvupóstinn, gakktu úr skugga um að netfangið sem þú slóst " +"inn sé það sama og þú notaðir til að stofna aðganginn og að það hafi ekki " +"lent í spamsíu." #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" +"Þú ert að fá þennan tölvupóst því þú baðst um endurstillingu á lykilorði " +"fyrir aðganginn þinn á %(site_name)s." msgid "Please go to the following page and choose a new password:" msgstr "Vinsamlegast farðu á eftirfarandi síðu og veldu nýtt lykilorð:" @@ -629,9 +648,11 @@ msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"Hefurðu gleymt lykilorðinu þínu? Sláðu inn netfangið þitt hér að neðan og " +"við sendum þér tölvupóst með leiðbeiningum til að setja nýtt lykilorð. " msgid "Email address:" -msgstr "" +msgstr "Netfang:" msgid "Reset my password" msgstr "Endursstilla lykilorðið mitt" @@ -657,7 +678,7 @@ msgid "Lookup" msgstr "Fletta upp" msgid "Currently:" -msgstr "" +msgstr "Eins og er:" msgid "Change:" -msgstr "" +msgstr "Breyta:" diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo index a20f3e27475b..be6b79cb2411 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 4960bd3daaab..0caf06854ad4 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po @@ -4,13 +4,14 @@ # gudbergur , 2012 # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016-2017 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: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-04-05 03:24+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -101,20 +102,20 @@ msgstr "" #, 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] "" +msgstr[0] "Athugaðu að þú ert %s klukkustund á undan tíma vefþjóns." +msgstr[1] "Athugaðu að þú ert %s klukkustundum á undan tíma vefþjóns." #, 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] "" +msgstr[0] "Athugaðu að þú ert %s klukkustund á eftir tíma vefþjóns." +msgstr[1] "Athugaðu að þú ert %s klukkustundum á eftir tíma vefþjóns." msgid "Now" msgstr "Núna" msgid "Choose a Time" -msgstr "" +msgstr "Veldu tíma" msgid "Choose a time" msgstr "Veldu tíma" @@ -129,7 +130,7 @@ msgid "Noon" msgstr "Hádegi" msgid "6 p.m." -msgstr "" +msgstr "6 e.h." msgid "Cancel" msgstr "Hætta við" @@ -138,7 +139,7 @@ msgid "Today" msgstr "Í dag" msgid "Choose a Date" -msgstr "" +msgstr "Veldu dagsetningu" msgid "Yesterday" msgstr "Í gær" @@ -147,68 +148,68 @@ msgid "Tomorrow" msgstr "Á morgun" msgid "January" -msgstr "" +msgstr "Janúar" msgid "February" -msgstr "" +msgstr "Febrúar" msgid "March" -msgstr "" +msgstr "Mars" msgid "April" -msgstr "" +msgstr "Apríl" msgid "May" -msgstr "" +msgstr "Maí" msgid "June" -msgstr "" +msgstr "Júní" msgid "July" -msgstr "" +msgstr "Júlí" msgid "August" -msgstr "" +msgstr "Ágúst" msgid "September" -msgstr "" +msgstr "September" msgid "October" -msgstr "" +msgstr "Október" msgid "November" -msgstr "" +msgstr "Nóvember" msgid "December" -msgstr "" +msgstr "Desember" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "S" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "M" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "Þ" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "M" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "F" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "F" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "L" msgid "Show" msgstr "Sýna" diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo index 5251920844e8..6c7d5c0a321e 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 3a94c42c581a..1fc26bfcc4c1 100644 --- a/django/contrib/admin/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/it/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# bbstuntman , 2017 # Denis Darii , 2011 # Flavio Curella , 2013 # Jannis Leidel , 2011 @@ -14,8 +15,8 @@ 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: 2016-06-18 09:39+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-19 07:20+0000\n" "Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" @@ -224,8 +225,9 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" cancellato correttamente." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste." +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?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo index 5a108106ce9e..b4339b9e3644 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 c38fd0f4ea91..261c52923fc8 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2016 # Jannis Leidel , 2011 -# Shinya Okano , 2012-2016 +# Shinya Okano , 2012-2017 # Tetsuya Morimoto , 2011 # 上田慶祐 , 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: 2016-05-26 16:20+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-25 09:38+0000\n" "Last-Translator: Shinya Okano \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" @@ -211,8 +212,9 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" を削除しました。" #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "主キーが %(key)r である %(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" diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo index 150d81a1ed6b..65f1d0b9b7ec 100644 Binary files a/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/django.po b/django/contrib/admin/locale/kk/LC_MESSAGES/django.po index 5f7d9c5d938e..99d45a849bdd 100644 --- a/django/contrib/admin/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/kk/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Baurzhan Muftakhidinov , 2015 +# Leo Trubach , 2017 # Nurlan Rakhimzhanov , 2011 # yun_man_ger , 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: 2016-05-21 09:09+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:14+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" @@ -64,10 +65,10 @@ msgid "This year" msgstr "Осы жыл" msgid "No date" -msgstr "" +msgstr "Күні жоқ" msgid "Has date" -msgstr "" +msgstr "Күні бар" #, python-format msgid "" @@ -205,8 +206,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" сәтті өшірілді." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Бірінші кілті %(key)r бар %(name)s объекті жоқ." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo index 311a2ce07a56..27d5c87c602a 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 e5fe7d44ced5..2301d8081328 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po @@ -6,15 +6,16 @@ # Ian Y. Choi , 2015 # Jaehong Kim , 2011 # Jannis Leidel , 2011 -# Jeong Seongtae , 2014,2016 +# Le Tartuffe , 2014,2016 +# Seacbyul Lee , 2017 # Taesik Yoon , 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: 2016-09-16 06:13+0000\n" -"Last-Translator: Jiyoon, Ha \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-20 03:47+0000\n" +"Last-Translator: Seacbyul Lee \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" @@ -220,8 +221,10 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\"이/가 삭제되었습니다." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Primary key %(key)r에 대한 오브젝트 %(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" @@ -462,7 +465,7 @@ msgstr "개요" #, python-format msgid "Models in the %(name)s application" -msgstr "%(name)s 애플리케이션의 " +msgstr "%(name)s 애플리케이션의 모델" msgid "Add" msgstr "추가" @@ -471,10 +474,10 @@ msgid "You don't have permission to edit anything." msgstr "수정할 권한이 없습니다." msgid "Recent actions" -msgstr "최근 액션들" +msgstr "최근 활동" msgid "My actions" -msgstr "내 액션들" +msgstr "나의 활동" msgid "None available" msgstr "이용할 수 없습니다." @@ -495,11 +498,11 @@ 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 "사용자 이름이나 비밀번호를 분실하였습니까?" +msgstr "아이디 또는 비밀번호를 분실하였습니까?" msgid "Date/time" msgstr "날짜/시간" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po index 90b632828286..0fd45d1f02c5 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # Hoseok Lee , 2016 # Jaehong Kim , 2011 # Jannis Leidel , 2011 -# Jeong Seongtae , 2014 +# Le Tartuffe , 2014 # minsung kang, 2015 msgid "" msgstr "" diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo index ca8428212e58..82f897253df1 100644 Binary files a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po index 3c866116a666..e313454a5d4c 100644 --- a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Jannis Leidel , 2011 # lauris , 2011 -# Matas Dailyda , 2015-2016 +# Matas Dailyda , 2015-2017 # Nikolajus Krauklis , 2013 # Simonas Kazlauskas , 2012-2013 # sirex , 2011 @@ -11,8 +11,8 @@ 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: 2016-05-23 12:04+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-30 14:04+0000\n" "Last-Translator: Matas Dailyda \n" "Language-Team: Lithuanian (http://www.transifex.com/django/django/language/" "lt/)\n" @@ -218,8 +218,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Įrašas %(name)s su pirminiu raktu %(key)r neegzistuoja." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s su ID \"%(key)s\" neegzistuoja. Gal tai buvo ištrinta?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo index c409be7c78ff..da0a766b35f1 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 91d0f54336dc..c612ed5c0cbe 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po @@ -3,12 +3,14 @@ # Translators: # edgars , 2011 # Jannis Leidel , 2011 +# Māris Nartišs , 2016 +# peterisb , 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: 2016-05-21 09:09+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:14+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -25,7 +27,7 @@ msgstr "Veiksmīgi izdzēsti %(count)d %(items)s." #, python-format msgid "Cannot delete %(name)s" -msgstr "" +msgstr "Nevar izdzēst %(name)s" msgid "Are you sure?" msgstr "Vai esat pārliecināts?" @@ -35,7 +37,7 @@ msgid "Delete selected %(verbose_name_plural)s" msgstr "Izdzēst izvēlēto %(verbose_name_plural)s" msgid "Administration" -msgstr "" +msgstr "Administrācija" msgid "All" msgstr "Visi" @@ -65,16 +67,18 @@ msgid "This year" msgstr "Šogad" msgid "No date" -msgstr "" +msgstr "Nav datums" msgid "Has date" -msgstr "" +msgstr "Ir datums" #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"Lūdzu ievadi korektu %(username)s un paroli personāla kontam. Ņem vērā, ka " +"abi ievades lauki ir reģistr jūtīgi." msgid "Action:" msgstr "Darbība:" @@ -90,10 +94,10 @@ msgid "action time" msgstr "darbības laiks" msgid "user" -msgstr "" +msgstr "lietotājs" msgid "content type" -msgstr "" +msgstr "satura tips" msgid "object id" msgstr "objekta id" @@ -117,25 +121,25 @@ msgstr "žurnāla ieraksti" #, python-format msgid "Added \"%(object)s\"." -msgstr "" +msgstr "Pievienots \"%(object)s\"." #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "" +msgstr "Mainīts \"%(object)s\" - %(changes)s" #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "" +msgstr "Dzēsts \"%(object)s.\"" msgid "LogEntry Object" msgstr "" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Pievienots {name} \"{object}\"." msgid "Added." -msgstr "" +msgstr "Pievienots." msgid "and" msgstr "un" @@ -146,11 +150,11 @@ msgstr "" #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Mainīts {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Dzēsts {name} \"{object}\"." msgid "No fields changed." msgstr "Lauki nav izmainīti" @@ -161,26 +165,33 @@ msgstr "nekas" msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" +"Turi nospiestu \"Control\" taustiņu vai \"Command\" uz Mac datora, lai " +"izvēlētos vairāk par vienu." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." msgstr "" +"{name} \"{obj}\" tika veiksmīgi pievienots. Zemāk var turpināt veikt " +"izmaiņas." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"{name} \"{obj}\" tika veiksmīgi pievienots. Zemāk var pievienot vēl citu " +"{name}." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "{name} \"{obj}\" tika veiksmīgi pievienots." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." msgstr "" +"{name} \"{obj}\" tika veiksmīgi mainīts. Zemāk var turpināt veikt izmaiņas." #, python-brace-format msgid "" @@ -190,7 +201,7 @@ msgstr "" #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "{name} \"{obj}\" tika veiksmīgi mainīts." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -205,8 +216,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" sekmīgi izdzēsts." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -267,7 +278,7 @@ msgstr "Pieslēgties" #, python-format msgid "%(app)s administration" -msgstr "" +msgstr "%(app)s administrācija" msgid "Page not found" msgstr "Lapa nav atrasta" @@ -316,7 +327,7 @@ msgstr "" "lietotāja uzstādījumus." msgid "Enter a username and password." -msgstr "" +msgstr "Ievadi lietotājvārdu un paroli." msgid "Change password" msgstr "Paroles maiņa" @@ -325,7 +336,7 @@ msgid "Please correct the error below." msgstr "Lūdzu, izlabojiet kļūdas zemāk." msgid "Please correct the errors below." -msgstr "" +msgstr "Lūdzu labo kļūdas zemāk." #, python-format msgid "Enter a new password for the user %(username)s." @@ -335,7 +346,7 @@ msgid "Welcome," msgstr "Sveicināti," msgid "View site" -msgstr "" +msgstr "Apskatīt lapu" msgid "Documentation" msgstr "Dokumentācija" @@ -357,14 +368,14 @@ msgid "Filter" msgstr "Filtrs" msgid "Remove from sorting" -msgstr "" +msgstr "Izņemt no kārtošanas" #, python-format msgid "Sorting priority: %(priority_number)s" -msgstr "" +msgstr "Kārtošanas prioritāte: %(priority_number)s" msgid "Toggle sorting" -msgstr "" +msgstr "Pārslēgt kārtošanu" msgid "Delete" msgstr "Dzēst" @@ -393,13 +404,13 @@ msgstr "" "\"? Tiks dzēsti arī sekojoši saistītie objekti:" msgid "Objects" -msgstr "" +msgstr "Objekti" msgid "Yes, I'm sure" msgstr "Jā, esmu pārliecināts" msgid "No, take me back" -msgstr "" +msgstr "Nē, ved mani atpakaļ" msgid "Delete multiple objects" msgstr "Dzēst vairākus objektus" @@ -416,12 +427,16 @@ msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" +"Izvēlēto %(objects_name)s objektu dzēšanai ir nepieciešams izdzēst sekojošus " +"aizsargātus saistītos objektus:" #, 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 "" +"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 "Change" msgstr "Izmainīt" @@ -434,7 +449,7 @@ msgid " By %(filter_title)s " msgstr " Pēc %(filter_title)s " msgid "Summary" -msgstr "" +msgstr "Kopsavilkums" #, python-format msgid "Models in the %(name)s application" @@ -447,10 +462,10 @@ msgid "You don't have permission to edit anything." msgstr "Jums nav tiesības neko labot." msgid "Recent actions" -msgstr "" +msgstr "Nesenās darbības" msgid "My actions" -msgstr "" +msgstr "Manas darbības" msgid "None available" msgstr "Nav pieejams" @@ -473,7 +488,7 @@ msgid "" msgstr "" msgid "Forgotten your password or username?" -msgstr "" +msgstr "Aizmirsi paroli vai lietotājvārdu?" msgid "Date/time" msgstr "Datums/laiks" @@ -498,19 +513,19 @@ msgid "Save" msgstr "Saglabāt" msgid "Popup closing..." -msgstr "" +msgstr "Logs aizveras..." #, python-format msgid "Change selected %(model)s" -msgstr "" +msgstr "Mainīt izvēlēto %(model)s" #, python-format msgid "Add another %(model)s" -msgstr "" +msgstr "Pievienot citu %(model)s" #, python-format msgid "Delete selected %(model)s" -msgstr "" +msgstr "Dzēst izvēlēto %(model)s" msgid "Search" msgstr "Meklēt" @@ -518,9 +533,9 @@ msgstr "Meklēt" #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(counter)s rezultāti" +msgstr[1] "%(counter)s rezultāts" +msgstr[2] "%(counter)s rezultāti" #, python-format msgid "%(full_result_count)s total" @@ -619,9 +634,11 @@ msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"Aizmirsāt savu paroli? Ievadiet savu e-pasta adresi un jums tiks nosūtīta " +"informācija par jaunas paroles iestatīšanu." msgid "Email address:" -msgstr "" +msgstr "E-pasta adrese:" msgid "Reset my password" msgstr "Paroles pārstatīšana" @@ -647,7 +664,7 @@ msgid "Lookup" msgstr "Pārlūkot" msgid "Currently:" -msgstr "" +msgstr "Valūta:" msgid "Change:" -msgstr "" +msgstr "Izmaiņa:" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo index 339949e7707e..07cf6569ca26 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 63026820e847..577602d20846 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 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: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-13 09:26+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -27,10 +28,14 @@ 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 "" +"Šis ir saraksts ar pieejamajiem %s. Tev ir jāizvēlas atbilstošās vērtības " +"atzīmējot izvēlēs zemāk esošajā sarakstā un pēc tam spiežot pogu \"Izvēlēties" +"\", lai pārvietotu starp izvēļu sarakstiem." #, javascript-format msgid "Type into this box to filter down the list of available %s." msgstr "" +"Raksti šajā logā, lai filtrētu zemāk esošo sarakstu ar pieejamajiem %s." msgid "Filter" msgstr "Filtrs" @@ -40,10 +45,10 @@ msgstr "Izvēlēties visu" #, javascript-format msgid "Click to choose all %s at once." -msgstr "" +msgstr "Izvēlies, lai pievienotu visas %s izvēles vienā reizē." msgid "Choose" -msgstr "" +msgstr "Izvēlies" msgid "Remove" msgstr "Izņemt" @@ -57,13 +62,16 @@ 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 "" +"Šis ir saraksts ar izvēlētajiem %s. Tev ir jāizvēlas atbilstošās vērtības " +"atzīmējot izvēlēs zemāk esošajā sarakstā un pēc tam spiežot pogu \"Izņemt\", " +"lai izņemtu no izvēlēto ierakstu saraksta." msgid "Remove all" -msgstr "" +msgstr "Izņemt visu" #, javascript-format msgid "Click to remove all chosen %s at once." -msgstr "" +msgstr "Izvēlies, lai izņemtu visas %s izvēles vienā reizē." msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" @@ -97,22 +105,22 @@ msgstr "" #, 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] "" -msgstr[2] "" +msgstr[0] "Piezīme: Tavs laiks ir %s stundas pirms servera laika." +msgstr[1] "Piezīme: Tavs laiks ir %s stundu pirms servera laika." +msgstr[2] "Piezīme: Tavs laiks ir %s stundas pirms servera laika." #, 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] "" -msgstr[2] "" +msgstr[0] "Piezīme: Tavs laiks ir %s stundas pēc servera laika." +msgstr[1] "Piezīme: Tavs laiks ir %s stundu pēc servera laika." +msgstr[2] "Piezīme: Tavs laiks ir %s stundas pēc servera laika." msgid "Now" msgstr "Tagad" msgid "Choose a Time" -msgstr "" +msgstr "Izvēlies laiku" msgid "Choose a time" msgstr "Izvēlieties laiku" @@ -127,7 +135,7 @@ msgid "Noon" msgstr "Pusdienas laiks" msgid "6 p.m." -msgstr "" +msgstr "6:00" msgid "Cancel" msgstr "Atcelt" @@ -136,7 +144,7 @@ msgid "Today" msgstr "Šodien" msgid "Choose a Date" -msgstr "" +msgstr "Izvēlies datumu" msgid "Yesterday" msgstr "Vakar" @@ -145,68 +153,68 @@ msgid "Tomorrow" msgstr "Rīt" msgid "January" -msgstr "" +msgstr "janvāris" msgid "February" -msgstr "" +msgstr "februāris" msgid "March" -msgstr "" +msgstr "marts" msgid "April" -msgstr "" +msgstr "aprīlis" msgid "May" -msgstr "" +msgstr "maijs" msgid "June" -msgstr "" +msgstr "jūnijs" msgid "July" -msgstr "" +msgstr "jūlijs" msgid "August" -msgstr "" +msgstr "augusts" msgid "September" -msgstr "" +msgstr "septembris" msgid "October" -msgstr "" +msgstr "oktobris" msgid "November" -msgstr "" +msgstr "novembris" msgid "December" -msgstr "" +msgstr "decembris" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "Sv" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "P" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "O" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "T" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "C" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "Pk" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "S" msgid "Show" msgstr "Parādīt" diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo index 46a67468ac4b..8734eee9ec38 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 fbc8d7af24e7..0fa30b16ccd0 100644 --- a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po @@ -3,15 +3,15 @@ # Translators: # dekomote , 2015 # Jannis Leidel , 2011 -# Vasil Vangelovski , 2016 +# Vasil Vangelovski , 2016-2017 # Vasil Vangelovski , 2013-2015 # Vasil Vangelovski , 2011-2013 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: 2016-06-15 11:14+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-05 09:11+0000\n" "Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" @@ -172,31 +172,39 @@ 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 added successfully. You may add another {name} " "below." msgstr "" +"Ставката {name} \"{obj}\" беше успешно додадена. Можете да додадете нов " +"{name} подолу." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "Ставката {name} \"{obj}\" беше успешно додадена." #, 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 changed successfully. You may add another {name} " "below." msgstr "" +"Ставката {name} \"{obj}\" беше успешно додадена. Можете да додадете нов " +"{name} подолу." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr " {name} \"{obj}\" беше успешно изменета." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -213,8 +221,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Ставаката %(name)s \"%(obj)s\" беше успешно избришана." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Објект %(name)s со примарен клуч %(key)r не постои." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s со клуч \"%(key)s\" не постои. Можеби е избришан?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo index 9b2441c366d1..e3ea2e9fc84e 100644 Binary files a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po index c4f0fcffed9d..a9a8d6626c64 100644 --- a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po @@ -5,15 +5,15 @@ # Jannis Leidel , 2011 # jargalan , 2011 # Zorig , 2016 -# Анхбаяр Анхаа , 2013-2015 -# Баясгалан Цэвлээ , 2011 +# Анхбаяр Анхаа , 2013-2016 +# Баясгалан Цэвлээ , 2011,2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-13 07:10+0000\n" +"Last-Translator: Баясгалан Цэвлээ \n" "Language-Team: Mongolian (http://www.transifex.com/django/django/language/" "mn/)\n" "MIME-Version: 1.0\n" @@ -68,10 +68,10 @@ msgid "This year" msgstr "Энэ жил" msgid "No date" -msgstr "" +msgstr "Огноогүй" msgid "Has date" -msgstr "" +msgstr "Огноотой" #, python-format msgid "" @@ -137,7 +137,7 @@ msgstr "Лог бүртгэлийн обект" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Нэмэгдсэн {name} \"{object}\"." msgid "Added." msgstr "Нэмэгдсэн." @@ -147,15 +147,15 @@ msgstr "ба" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "{name} \"{object}\"-ны {fields} өөрчилөгдсөн." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "Өөрчлөгдсөн {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "Устгасан {name} \"{object}\"." msgid "No fields changed." msgstr "Өөрчилсөн талбар алга байна." @@ -172,32 +172,36 @@ msgstr "" #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgstr "{name} \"{obj}\" амжилттай нэмэгдлээ. Та дахин засах боломжтой." #, 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 added successfully." -msgstr "" +msgstr " {name} \"{obj}\" амжилттай нэмэгдлээ." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +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 "" +msgstr "{name} \"{obj}\" амжилттай засагдлаа." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -213,8 +217,9 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr " %(name)s \"%(obj)s\" амжилттай устгагдлаа." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s обектийн үндсэн түлхүүр %(key)r олдохгүй байна." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" +"\"%(key)s\" дугаартай %(name)s байхгүй байна. Устсан байсан юм болов уу?" #, python-format msgid "Add %s" @@ -465,10 +470,10 @@ msgid "You don't have permission to edit anything." msgstr "Та ямар нэг зүйл засварлах зөвшөөрөлгүй байна." msgid "Recent actions" -msgstr "" +msgstr "Сүүлд хийсэн үйлдлүүд" msgid "My actions" -msgstr "" +msgstr "Миний үйлдлүүд" msgid "None available" msgstr "Үйлдэл алга" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo index c7d9e6e120dd..65b3a96029c4 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 7881667f56a8..673284ffc26d 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po @@ -2,20 +2,23 @@ # # Translators: # Bas Peschier , 2013 +# Claude Paroz , 2017 +# Evelijn Saaltink , 2016 # Harro van der Klauw , 2012 # Ilja Maas , 2015 # Jannis Leidel , 2011 # Jeffrey Gelens , 2011-2012 # dokterbob , 2015 -# Sander Steffann , 2014-2015 +# Sander Steffann , 2014-2015 # Tino de Bruijn , 2011 +# Tonnes , 2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-05-02 10:02+0000\n" +"Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,10 +72,10 @@ msgid "This year" msgstr "Dit jaar" msgid "No date" -msgstr "" +msgstr "Geen datum" msgid "Has date" -msgstr "" +msgstr "Heeft datum" #, python-format msgid "" @@ -113,32 +116,32 @@ msgid "action flag" msgstr "actievlag" msgid "change message" -msgstr "wijzig bericht" +msgstr "wijzigingsbericht" msgid "log entry" -msgstr "logregistratie" +msgstr "logboekvermelding" msgid "log entries" -msgstr "logregistraties" +msgstr "logboekvermeldingen" #, python-format msgid "Added \"%(object)s\"." -msgstr "Toegevoegd \"%(object)s\"." +msgstr "'%(object)s' toegevoegd." #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Gewijzigd \"%(object)s\" - %(changes)s" +msgstr "'%(object)s' gewijzigd - %(changes)s" #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "Verwijderd \"%(object)s.\"" +msgstr "'%(object)s' verwijderd." msgid "LogEntry Object" -msgstr "LogEntry Object" +msgstr "LogEntry-object" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "{name} \"{object}\" toegevoegd." msgid "Added." msgstr "Toegevoegd." @@ -148,15 +151,15 @@ msgstr "en" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "{fields} voor {name} \"{object}\" gewijzigd." #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "{fields} gewijzigd." #, python-brace-format msgid "Deleted {name} \"{object}\"." -msgstr "" +msgstr "{name} \"{object}\" verwijderd." msgid "No fields changed." msgstr "Geen velden gewijzigd." @@ -167,64 +170,72 @@ msgstr "Geen" msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"Houdt \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te " +"Houd 'Control', of 'Command' op een Mac, ingedrukt om meerdere items te " "selecteren." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." msgstr "" +"De {name} '{obj}' is met succes toegevoegd. U kunt deze hieronder nogmaals " +"bewerken." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"De {name} '{obj}' is met succes toegevoegd. U kunt hieronder nog een {name} " +"toevoegen." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "De {name} \"{obj}\" is succesvol toegevoegd." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." msgstr "" +"De {name} '{obj}' is met succes gewijzigd. U kunt deze hieronder nogmaals " +"bewerken." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" +"De {name} '{obj}' is met succes gewijzigd. U kunt hieronder nog een {name} " +"toevoegen." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "De {name} \"{obj}\" is succesvol gewijzigd." msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -"Er moeten items worden geselecteerd om acties op uit te voeren. Geen items " -"zijn veranderd." +"Er moeten items worden geselecteerd om acties op uit te voeren. Er zijn geen " +"items gewijzigd." msgid "No action selected." msgstr "Geen actie geselecteerd." #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "\"%(obj)s\" van type %(name)s is verwijderd." +msgstr "De %(name)s '%(obj)s' is met succes verwijderd." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s met ID '%(key)s' bestaat niet. Misschien is deze verwijderd?" #, python-format msgid "Add %s" -msgstr "Toevoegen %s" +msgstr "%s toevoegen" #, python-format msgid "Change %s" -msgstr "Wijzig %s" +msgstr "%s wijzigen" msgid "Database error" msgstr "Databasefout" @@ -232,8 +243,8 @@ msgstr "Databasefout" #, 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 is succesvol gewijzigd." -msgstr[1] "%(count)s %(name)s zijn succesvol gewijzigd." +msgstr[0] "%(count)s %(name)s is met succes gewijzigd." +msgstr[1] "%(count)s %(name)s zijn met succes gewijzigd." #, python-format msgid "%(total_count)s selected" @@ -264,26 +275,26 @@ msgstr "" "de volgende beschermde gerelateerde objecten: %(related_objects)s" msgid "Django site admin" -msgstr "Django sitebeheer" +msgstr "Django-websitebeheer" msgid "Django administration" -msgstr "Djangobeheer" +msgstr "Django-beheer" msgid "Site administration" -msgstr "Sitebeheer" +msgstr "Websitebeheer" msgid "Log in" -msgstr "Inloggen" +msgstr "Aanmelden" #, python-format msgid "%(app)s administration" -msgstr "%(app)s beheer" +msgstr "%(app)s-beheer" msgid "Page not found" msgstr "Pagina niet gevonden" msgid "We're sorry, but the requested page could not be found." -msgstr "Onze excuses, maar de gevraagde pagina bestaat niet." +msgstr "Het spijt ons, maar de opgevraagde pagina kon niet worden gevonden." msgid "Home" msgstr "Voorpagina" @@ -301,25 +312,25 @@ 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 "" -"Er heeft zich een fout voorgedaan. De fout is via email gemeld aan de " -"website administrators en zou snel verholpen moeten zijn. Bedankt voor uw " +"Er heeft zich een fout voorgedaan. Dit is via e-mail bij de " +"websitebeheerders gemeld en zou snel verholpen moeten zijn. Bedankt voor uw " "geduld." msgid "Run the selected action" -msgstr "Voer de geselecteerde actie uit" +msgstr "De geselecteerde actie uitvoeren" msgid "Go" -msgstr "Voer Uit" +msgstr "Uitvoeren" msgid "Click here to select the objects across all pages" msgstr "Klik hier om alle objecten op alle pagina's te selecteren" #, python-format msgid "Select all %(total_count)s %(module_name)s" -msgstr "Selecteer alle %(total_count)s %(module_name)s" +msgstr "Alle %(total_count)s %(module_name)s selecteren" msgid "Clear selection" -msgstr "Leeg selectie" +msgstr "Selectie wissen" msgid "" "First, enter a username and password. Then, you'll be able to edit more user " @@ -343,13 +354,13 @@ msgstr "Herstel de fouten hieronder." #, python-format msgid "Enter a new password for the user %(username)s." msgstr "" -"Geef een nieuw wachtwoord voor gebruiker %(username)s." +"Voer een nieuw wachtwoord in voor de gebruiker %(username)s." msgid "Welcome," msgstr "Welkom," msgid "View site" -msgstr "Bekijk site" +msgstr "Website bekijken" msgid "Documentation" msgstr "Documentatie" @@ -365,17 +376,17 @@ msgid "History" msgstr "Geschiedenis" msgid "View on site" -msgstr "Toon op site" +msgstr "Weergeven op website" msgid "Filter" msgstr "Filter" msgid "Remove from sorting" -msgstr "Verwijder uit de sortering" +msgstr "Verwijderen uit sortering" #, python-format msgid "Sorting priority: %(priority_number)s" -msgstr "Sorteer prioriteit: %(priority_number)s" +msgstr "Sorteerprioriteit: %(priority_number)s" msgid "Toggle sorting" msgstr "Sortering aan/uit" @@ -390,8 +401,8 @@ msgid "" "following types of objects:" msgstr "" "Het verwijderen van %(object_name)s '%(escaped_object)s' zal ook " -"gerelateerde objecten verwijderen. Echter u heeft geen rechten om de " -"volgende typen objecten te verwijderen:" +"gerelateerde objecten verwijderen. U hebt echter geen rechten om de volgende " +"typen objecten te verwijderen:" #, python-format msgid "" @@ -406,8 +417,8 @@ 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 "" -"Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? " -"Alle volgende objecten worden verwijderd:" +"Weet u zeker dat u %(object_name)s '%(escaped_object)s' wilt verwijderen? " +"Alle volgende gerelateerde objecten worden verwijderd:" msgid "Objects" msgstr "Objecten" @@ -416,10 +427,10 @@ msgid "Yes, I'm sure" msgstr "Ja, ik weet het zeker" msgid "No, take me back" -msgstr "Nee, ga terug" +msgstr "Nee, teruggaan" msgid "Delete multiple objects" -msgstr "Verwijder meerdere objecten" +msgstr "Meerdere objecten verwijderen" #, python-format msgid "" @@ -471,10 +482,10 @@ msgid "You don't have permission to edit anything." msgstr "U heeft geen rechten om iets te wijzigen." msgid "Recent actions" -msgstr "" +msgstr "Recente acties" msgid "My actions" -msgstr "" +msgstr "Mijn acties" msgid "None available" msgstr "Geen beschikbaar" @@ -496,7 +507,7 @@ msgid "" "page. Would you like to login to a different account?" msgstr "" "U bent geverifieerd als %(username)s, maar niet bevoegd om deze pagina te " -"bekijken. Wilt u inloggen met een ander account?" +"bekijken. Wilt u zich aanmelden bij een andere account?" msgid "Forgotten your password or username?" msgstr "Wachtwoord of gebruikersnaam vergeten?" @@ -524,22 +535,22 @@ msgid "Save" msgstr "Opslaan" msgid "Popup closing..." -msgstr "Popup wordt gesloten..." +msgstr "Pop-up wordt gesloten..." #, python-format msgid "Change selected %(model)s" -msgstr "Wijzig geselecteerde %(model)s" +msgstr "Geselecteerde %(model)s wijzigen" #, python-format msgid "Add another %(model)s" -msgstr "Voeg nog een %(model)s toe" +msgstr "Nog een %(model)s toevoegen" #, python-format msgid "Delete selected %(model)s" -msgstr "Verwijder geselecteerde %(model)s" +msgstr "Geselecteerde %(model)s verwijderen" msgid "Search" -msgstr "Zoek" +msgstr "Zoeken" #, python-format msgid "%(counter)s result" @@ -564,7 +575,7 @@ msgid "Thanks for spending some quality time with the Web site today." msgstr "Bedankt voor de aanwezigheid op de site vandaag." msgid "Log in again" -msgstr "Log opnieuw in" +msgstr "Opnieuw aanmelden" msgid "Password change" msgstr "Wachtwoordwijziging" @@ -580,13 +591,13 @@ msgstr "" "invoeren, zodat we kunnen controleren of er geen typefouten zijn gemaakt." msgid "Change my password" -msgstr "Wijzig mijn wachtwoord" +msgstr "Mijn wachtwoord wijzigen" msgid "Password reset" msgstr "Wachtwoord hersteld" msgid "Your password has been set. You may go ahead and log in now." -msgstr "Uw wachtwoord is ingesteld. U kunt nu verder gaan en inloggen." +msgstr "Uw wachtwoord is ingesteld. U kunt nu verdergaan en zich aanmelden." msgid "Password reset confirmation" msgstr "Bevestiging wachtwoord herstellen" @@ -615,9 +626,9 @@ 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 "" -"We hebben u instructies toegestuurd om uw wachtwoord in te stellen, als er " -"een account bestond met het door u opgegeven emailadres. U zou deze binnen " -"korte tijd moeten ontvangen." +"We hebben u instructies gestuurd voor het instellen van uw wachtwoord, als " +"er een account bestaat met het door u ingevoerde e-mailadres. U zou deze " +"straks moeten ontvangen." msgid "" "If you don't receive an email, please make sure you've entered the address " @@ -641,24 +652,24 @@ msgid "Your username, in case you've forgotten:" msgstr "Uw gebruikersnaam, mocht u deze vergeten zijn:" msgid "Thanks for using our site!" -msgstr "Bedankt voor het gebruik van onze site!" +msgstr "Bedankt voor het gebruik van onze website!" #, python-format msgid "The %(site_name)s team" -msgstr "Het %(site_name)s team" +msgstr "Het %(site_name)s-team" msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -"Wachtwoord vergeten? Vul uw emailadres hieronder in, en we zullen " -"instructies voor het opnieuw instellen van uw wachtwoord mailen." +"Wachtwoord vergeten? Vul hieronder uw e-mailadres in, en we sturen " +"instructies voor het instellen van een nieuw wachtwoord." msgid "Email address:" -msgstr "Emailadres:" +msgstr "E-mailadres:" msgid "Reset my password" -msgstr "Herstel mijn wachtwoord" +msgstr "Mijn wachtwoord opnieuw instellen" msgid "All dates" msgstr "Alle data" @@ -684,4 +695,4 @@ msgid "Currently:" msgstr "Huidig:" msgid "Change:" -msgstr "Wijzig:" +msgstr "Wijzigen:" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo index 3dfa3a65b15e..86b183002f8b 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 4fd01bf93484..1f007c93c60d 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po @@ -2,6 +2,7 @@ # # Translators: # Bouke Haarsma , 2013 +# Evelijn Saaltink , 2016 # Harro van der Klauw , 2012 # Ilja Maas , 2015 # Jannis Leidel , 2011 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-12 17:32+0000\n" +"Last-Translator: Evelijn Saaltink \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,68 +155,68 @@ msgid "Tomorrow" msgstr "Morgen" msgid "January" -msgstr "" +msgstr "januari" msgid "February" -msgstr "" +msgstr "februari" msgid "March" -msgstr "" +msgstr "maart" msgid "April" -msgstr "" +msgstr "april" msgid "May" -msgstr "" +msgstr "mei" msgid "June" -msgstr "" +msgstr "juni" msgid "July" -msgstr "" +msgstr "juli" msgid "August" -msgstr "" +msgstr "augustus" msgid "September" -msgstr "" +msgstr "september" msgid "October" -msgstr "" +msgstr "oktober" msgid "November" -msgstr "" +msgstr "november" msgid "December" -msgstr "" +msgstr "december" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "S" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "M" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "T" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "W" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "T" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "F" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "S" msgid "Show" msgstr "Tonen" diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo index a3fe3bd83897..13180e92044b 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 c2e19810d799..48de4ef05179 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po @@ -8,29 +8,31 @@ # Karol , 2012 # konryd , 2011 # konryd , 2011 -# m_aciek , 2016 +# m_aciek , 2016-2017 # m_aciek , 2015 # Ola Sitarska , 2013 # Ola Sitarska , 2013 # Roman Barczyński , 2014 +# Tomasz Kajtoch , 2017 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: 2016-08-14 22:58+0000\n" -"Last-Translator: m_aciek \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-22 12:02+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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 "Successfully deleted %(count)d %(items)s." -msgstr "Usunięto %(count)d %(items)s." +msgstr "Pomyślnie usunięto %(count)d %(items)s." #, python-format msgid "Cannot delete %(name)s" @@ -132,42 +134,42 @@ msgstr "Dodano „%(object)s”." #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "Zmieniono „%(object)s” – %(changes)s " +msgstr "Zmieniono „%(object)s” - %(changes)s " #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Usunięto „%(object)s”." msgid "LogEntry Object" -msgstr "Obiekt typu LogEntry" +msgstr "Obiekt LogEntry" #, python-brace-format msgid "Added {name} \"{object}\"." msgstr "Dodano {name} „{object}”." msgid "Added." -msgstr "Dodany." +msgstr "Dodano." msgid "and" msgstr "i" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "Zmieniono {fields} w {name} „{object}”." +msgstr "Zmodyfikowano {fields} w {name} „{object}”." #, python-brace-format msgid "Changed {fields}." -msgstr "Zmieniono {fields}." +msgstr "Zmodyfikowano {fields}." #, python-brace-format msgid "Deleted {name} \"{object}\"." msgstr "Usunięto {name} „{object}”." msgid "No fields changed." -msgstr "Żadne pole nie zmienione." +msgstr "Żadne pole nie zostało zmienione." msgid "None" -msgstr "brak" +msgstr "Brak" msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." @@ -225,8 +227,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s „%(obj)s” usunięty pomyślnie." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s z ID „%(key)s” nie istnieje. Może został usunięty?" #, python-format msgid "Add %s" @@ -245,6 +247,7 @@ 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[2] "%(count)s %(name)s zostało pomyślnie zmienionych." +msgstr[3] "%(count)s %(name)s zostało pomyślnie zmienionych." #, python-format msgid "%(total_count)s selected" @@ -252,6 +255,7 @@ msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s wybrany" msgstr[1] "%(total_count)s wybrane" msgstr[2] "%(total_count)s wybranych" +msgstr[3] "%(total_count)s wybranych" #, python-format msgid "0 of %(cnt)s selected" @@ -272,8 +276,8 @@ 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 spowoduje usunięcia następujących " -"chronionych obiektów pokrewnych: %(related_objects)s" +"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" msgstr "Administracja stroną Django" @@ -289,16 +293,16 @@ msgstr "Zaloguj się" #, python-format msgid "%(app)s administration" -msgstr "%(app)s – administracja" +msgstr "administracja %(app)s" msgid "Page not found" -msgstr "Strona nie znaleziona" +msgstr "Strona nie została znaleziona" msgid "We're sorry, but the requested page could not be found." -msgstr "Niestety, żądana strona nie została znaleziona." +msgstr "Przykro nam, ale żądana strona nie została znaleziona." msgid "Home" -msgstr "Początek" +msgstr "Strona główna" msgid "Server error" msgstr "Błąd serwera" @@ -313,9 +317,8 @@ 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 "" -"Niestety wystąpił błąd. Administratorzy strony zostali o nim powiadomieni " -"poprzez email i niebawem zaistniały problem powinien zostać rozwiązany. " -"Dziękujemy za wyrozumiałość." +"Niestety wystąpił błąd. Zostało to zgłoszone administratorom strony poprzez " +"email i niebawem powinno zostać naprawione. Dziękujemy za cierpliwość." msgid "Run the selected action" msgstr "Wykonaj wybraną akcję" @@ -389,7 +392,7 @@ msgid "Sorting priority: %(priority_number)s" msgstr "Priorytet sortowania: %(priority_number)s " msgid "Toggle sorting" -msgstr "Zmień sortowanie" +msgstr "Przełącz sortowanie" msgid "Delete" msgstr "Usuń" @@ -400,16 +403,16 @@ 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' 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 %(object_name)s '%(escaped_object)s' może wiązać 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:" #, python-format 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' wymaga skasowania " +"Usunięcie %(object_name)s '%(escaped_object)s' może wymagać skasowania " "następujących chronionych obiektów, które są z nim powiązane:" #, python-format @@ -418,7 +421,7 @@ msgid "" "All of the following related items will be deleted:" msgstr "" "Czy chcesz skasować %(object_name)s „%(escaped_object)s”? Następujące " -"zależne obiekty zostaną skasowane:" +"obiekty powiązane zostaną usunięte:" msgid "Objects" msgstr "Obiekty" @@ -479,7 +482,7 @@ msgid "Add" msgstr "Dodaj" msgid "You don't have permission to edit anything." -msgstr "Nie masz uprawnień by edytować cokolwiek." +msgstr "Nie masz uprawnień, by cokolwiek edytować." msgid "Recent actions" msgstr "Ostatnie działania" @@ -488,7 +491,7 @@ msgid "My actions" msgstr "Moje działania" msgid "None available" -msgstr "Brak" +msgstr "Brak dostępnych" msgid "Unknown content" msgstr "Zawartość nieznana" @@ -511,7 +514,7 @@ msgstr "" "dostępu do tej strony. Czy chciałbyś zalogować się na inne konto?" msgid "Forgotten your password or username?" -msgstr "Nie pamiętasz swojego hasła, bądź nazwy konta użytkownika?" +msgstr "Nie pamiętasz swojego hasła lub nazwy użytkownika?" msgid "Date/time" msgstr "Data/czas" @@ -526,8 +529,8 @@ msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Ten obiekt nie ma historii zmian. Najprawdopodobniej wpis ten nie został " -"dodany poprzez panel administracyjny." +"Ten obiekt nie ma historii zmian. Najprawdopodobniej nie został on dodany " +"poprzez panel administracyjny." msgid "Show all" msgstr "Pokaż wszystko" @@ -536,7 +539,7 @@ msgid "Save" msgstr "Zapisz" msgid "Popup closing..." -msgstr "Zamykanie okienka..." +msgstr "Zamykanie okna..." #, python-format msgid "Change selected %(model)s" @@ -559,22 +562,23 @@ msgid_plural "%(counter)s results" msgstr[0] "%(counter)s wynik" msgstr[1] "%(counter)s wyniki" msgstr[2] "%(counter)s wyników" +msgstr[3] "%(counter)s wyników" #, python-format msgid "%(full_result_count)s total" -msgstr "%(full_result_count)s trafień" +msgstr "%(full_result_count)s łącznie" msgid "Save as new" -msgstr "Zapisz jako nowe" +msgstr "Zapisz jako nowy" msgid "Save and add another" -msgstr "Zapisz i dodaj nowe" +msgstr "Zapisz i dodaj nowy" msgid "Save and continue editing" msgstr "Zapisz i kontynuuj edycję" msgid "Thanks for spending some quality time with the Web site today." -msgstr "Dziękujemy za odwiedzenie serwisu." +msgstr "Dziękujemy za spędzenie cennego czasu na stronie." msgid "Log in again" msgstr "Zaloguj się ponownie" @@ -588,7 +592,10 @@ msgstr "Twoje hasło zostało zmienione." 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 "Podaj swoje stare hasło i dwa razy nowe." +msgstr "" +"Podaj swoje stare hasło, ze względów bezpieczeństwa, a później wpisz " +"dwukrotnie Twoje nowe hasło, abyśmy mogli zweryfikować, że zostało wpisane " +"poprawnie." msgid "Change my password" msgstr "Zmień hasło" @@ -651,10 +658,10 @@ msgstr "" "poniżej:" msgid "Your username, in case you've forgotten:" -msgstr "Twoja nazwa użytkownika:" +msgstr "Twoja nazwa użytkownika, na wypadek, gdybyś zapomniał(a):" msgid "Thanks for using our site!" -msgstr "Dziękujemy za skorzystanie naszej strony." +msgstr "Dziękujemy za korzystanie naszej strony." #, python-format msgid "The %(site_name)s team" diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo index aa482ce341a2..e75d6721cbf7 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 e55dc7c51f0e..8d0b27212e88 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po @@ -7,20 +7,22 @@ # konryd , 2011 # m_aciek , 2016 # Roman Barczyński , 2012 +# Tomasz Kajtoch , 2016-2017 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: 2016-08-09 13:22+0000\n" -"Last-Translator: m_aciek \n" +"PO-Revision-Date: 2017-04-22 11:32+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" #, javascript-format msgid "Available %s" @@ -31,12 +33,12 @@ 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 "" -"To jest lista dostępnych %s. Aby wybrać pozycje zaznacz je i kliknij " -"strzałkę „Wybierz” pomiędzy listami." +"To lista dostępnych %s. Aby wybrać pozycje, zaznacz je i kliknij strzałkę " +"„Wybierz” pomiędzy listami." #, javascript-format msgid "Type into this box to filter down the list of available %s." -msgstr "Pisz tutaj aby wyfiltrować listę dostępnych %s." +msgstr "Wpisz coś tutaj, aby wyfiltrować listę dostępnych %s." msgid "Filter" msgstr "Filtr" @@ -46,7 +48,7 @@ msgstr "Wybierz wszystkie" #, javascript-format msgid "Click to choose all %s at once." -msgstr "Kliknij aby wybrać wszystkie %s na raz." +msgstr "Kliknij, aby wybrać jednocześnie wszystkie %s." msgid "Choose" msgstr "Wybierz" @@ -63,27 +65,28 @@ 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 "" -"To jest lista wybranych %s. Aby usunąć zaznacz pozycje wybrane do usunięcia " -"i kliknij strzałkę „Usuń” pomiędzy listami." +"To lista wybranych %s. Aby usunąć, zaznacz pozycje wybrane do usunięcia i " +"kliknij strzałkę „Usuń” pomiędzy listami." msgid "Remove all" msgstr "Usuń wszystkie" #, javascript-format msgid "Click to remove all chosen %s at once." -msgstr "Kliknij aby usunąć wszystkie wybrane %s na raz." +msgstr "Kliknij, aby usunąć jednocześnie wszystkie wybrane %s." msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Zaznaczono %(sel)s z %(cnt)s" msgstr[1] "Zaznaczono %(sel)s z %(cnt)s" msgstr[2] "Zaznaczono %(sel)s z %(cnt)s" +msgstr[3] "Zaznaczono %(sel)s z %(cnt)s" msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -"Zmiany w niektórych polach nie zostały zachowane. Po wykonaniu akcji zmiany " +"Zmiany w niektórych polach nie zostały zachowane. Po wykonaniu akcji, zmiany " "te zostaną utracone." msgid "" @@ -91,7 +94,7 @@ msgid "" "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 " +"Wybrano akcję, lecz część zmian w polach nie została zachowana. Kliknij OK, " "aby zapisać. Aby wykonać akcję, należy ją ponownie uruchomić." msgid "" @@ -99,36 +102,46 @@ msgid "" "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -"Wybrano akcję, lecz nie dokonano żadnych zmian. Prawdopodobnie szukasz " -"przycisku „Wykonaj” (a nie „Zapisz”)" +"Wybrano akcję, lecz nie dokonano żadnych zmian w polach. Prawdopodobnie " +"szukasz przycisku „Wykonaj”, a nie „Zapisz”." #, 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] "" -"Uwaga: Czas lokalny jest przesunięty %s godzinę w stosunku do czasu serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godzinę do przodu w stosunku do " +"czasu serwera." msgstr[1] "" -"Uwaga: Czas lokalny jest przesunięty %s godziny w stosunku do czasu serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godziny do przodu w stosunku do " +"czasu serwera." msgstr[2] "" -"Uwaga: Czas lokalny jest przesunięty %s godzin w stosunku do czasu serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godzin do przodu w stosunku do " +"czasu serwera." +msgstr[3] "" +"Uwaga: Czas lokalny jest przesunięty o %s godzin do przodu w stosunku do " +"czasu serwera." #, javascript-format msgid "Note: You are %s hour behind server time." msgid_plural "Note: You are %s hours behind server time." msgstr[0] "" -"Uwaga: Czas lokalny jest przesunięty o %s godzinę w stosunku do czasu " -"serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godzinę do tyłu w stosunku do " +"czasu serwera." msgstr[1] "" -"Uwaga: Czas lokalny jest przesunięty o %s godziny w stosunku do czasu " -"serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godziny do tyłu w stosunku do " +"czasu serwera." msgstr[2] "" -"Uwaga: Czas lokalny jest przesunięty o %s godzin w stosunku do czasu serwera." +"Uwaga: Czas lokalny jest przesunięty o %s godzin do tyłu w stosunku do czasu " +"serwera." +msgstr[3] "" +"Uwaga: Czas lokalny jest przesunięty o %s godzin do tyłu w stosunku do czasu " +"serwera." msgid "Now" msgstr "Teraz" msgid "Choose a Time" -msgstr "Wybierz czas" +msgstr "Wybierz Czas" msgid "Choose a time" msgstr "Wybierz czas" @@ -152,7 +165,7 @@ msgid "Today" msgstr "Dzisiaj" msgid "Choose a Date" -msgstr "Wybierz datę" +msgstr "Wybierz Datę" msgid "Yesterday" msgstr "Wczoraj" @@ -161,68 +174,68 @@ msgid "Tomorrow" msgstr "Jutro" msgid "January" -msgstr "styczeń" +msgstr "Styczeń" msgid "February" -msgstr "luty" +msgstr "Luty" msgid "March" -msgstr "marzec" +msgstr "Marzec" msgid "April" -msgstr "kwiecień" +msgstr "Kwiecień" msgid "May" -msgstr "maj" +msgstr "Maj" msgid "June" -msgstr "czerwiec" +msgstr "Czerwiec" msgid "July" -msgstr "lipiec" +msgstr "Lipiec" msgid "August" -msgstr "sierpień" +msgstr "Sierpień" msgid "September" -msgstr "wrzesień" +msgstr "Wrzesień" msgid "October" -msgstr "październik" +msgstr "Październik" msgid "November" -msgstr "listopad" +msgstr "Listopad" msgid "December" -msgstr "grudzień" +msgstr "Grudzień" msgctxt "one letter Sunday" msgid "S" -msgstr "n" +msgstr "N" msgctxt "one letter Monday" msgid "M" -msgstr "pn" +msgstr "P" msgctxt "one letter Tuesday" msgid "T" -msgstr "w" +msgstr "W" msgctxt "one letter Wednesday" msgid "W" -msgstr "ś" +msgstr "Ś" msgctxt "one letter Thursday" msgid "T" -msgstr "c" +msgstr "C" msgctxt "one letter Friday" msgid "F" -msgstr "pt" +msgstr "P" msgctxt "one letter Saturday" msgid "S" -msgstr "s" +msgstr "S" msgid "Show" msgstr "Pokaż" diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo index 4590986e6c95..0251c59a84ea 100644 Binary files a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po index b1d87b959264..63134bc1e1e9 100644 --- a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po @@ -6,13 +6,14 @@ # Nuno Mariz , 2013,2015 # Paulo Köch , 2011 # Raúl Pedro Fernandes Santos, 2014 +# Rui Dinis Silva, 2017 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: 2016-05-21 09:09+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-10 16:58+0000\n" +"Last-Translator: Nuno Mariz \n" "Language-Team: Portuguese (http://www.transifex.com/django/django/language/" "pt/)\n" "MIME-Version: 1.0\n" @@ -67,10 +68,10 @@ msgid "This year" msgstr "Este ano" msgid "No date" -msgstr "" +msgstr "Sem data" msgid "Has date" -msgstr "" +msgstr "Tem data" #, python-format msgid "" @@ -136,7 +137,7 @@ msgstr "Objeto LogEntry" #, python-brace-format msgid "Added {name} \"{object}\"." -msgstr "" +msgstr "Foi adicionado {name} \"{object}\"." msgid "Added." msgstr "Adicionado." @@ -146,7 +147,7 @@ msgstr "e" #, python-brace-format msgid "Changed {fields} for {name} \"{object}\"." -msgstr "" +msgstr "Foram modificados os {fields} para {name} \"{object}\"." #, python-brace-format msgid "Changed {fields}." @@ -213,8 +214,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "O object %(name)s com a chave primária %(key)r não existe." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" 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 79cf2c26eae8..b90e83a21f55 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 99d6f9616288..7067e885ccb3 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po @@ -3,15 +3,17 @@ # Translators: # Allisson Azevedo , 2014 # bruno.devpod , 2014 -# Filipe Cifali , 2016 +# Filipe Cifali Stangler , 2016 # dudanogueira , 2012 # Elyézer Rezende , 2013 # Fábio C. Barrionuevo da Luz , 2015 # Francisco Petry Rauber , 2016 # Gladson , 2013 -# Guilherme Gondim, 2012-2013 +# Guilherme Ferreira , 2017 +# semente, 2012-2013 # Jannis Leidel , 2011 # Lucas Infante , 2015 +# Luiz Boaretto , 2017 # Marco Rougeth , 2015 # Raysa Dutra, 2016 # Sergio Garcia , 2015 @@ -19,9 +21,9 @@ 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: 2016-06-28 23:31+0000\n" -"Last-Translator: andrewsmedina \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-19 17:11+0000\n" +"Last-Translator: Guilherme Ferreira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -230,8 +232,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\": excluído com sucesso." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Objeto %(name)s com chave primária %(key)r não existe. " +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s com o ID \"%(key)s\" não existe. Talvez tenha sido excluído?" #, python-format msgid "Add %s" 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 81d0a652d037..225d3592da73 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # Allisson Azevedo , 2014 # andrewsmedina , 2016 # Eduardo Cereto Carvalho, 2011 -# Guilherme Gondim, 2012 +# semente, 2012 # Jannis Leidel , 2011 # Lucas Infante , 2015 # Renata Barbosa Almeida , 2016 diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo index 8c28226103a0..2754c48eade4 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 da461243a771..41e3d5016afe 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # Ivan Ivaschenko , 2013 # Denis Darii , 2011 # Dimmus , 2011 -# Eugene MechanisM , 2016 +# Eugene MechanisM , 2016-2017 # inoks , 2016 # Jannis Leidel , 2011 # Алексей Борискин , 2012-2015 @@ -12,8 +12,8 @@ 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: 2016-09-01 05:25+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-01 16:07+0000\n" "Last-Translator: Eugene MechanisM \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" @@ -223,8 +223,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" был успешно удален." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s с первичным ключом %(key)r не существует." +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" diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo index e85ef2407b9d..ae807d413e9c 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 ce2f3ea64bf8..e96cfba28f09 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po @@ -4,6 +4,7 @@ # Denis Darii , 2011 # Dimmus , 2011 # Eugene MechanisM , 2012 +# Eugene MechanisM , 2016 # Jannis Leidel , 2011 # Алексей Борискин , 2012,2014-2015 # Андрей Щуров , 2016 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-06-23 13:50+0000\n" -"Last-Translator: Андрей Щуров \n" +"PO-Revision-Date: 2016-11-06 00:08+0000\n" +"Last-Translator: Eugene MechanisM \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -202,7 +203,7 @@ msgstr "Декабрь" msgctxt "one letter Sunday" msgid "S" -msgstr "С" +msgstr "В" msgctxt "one letter Monday" msgid "M" @@ -214,19 +215,19 @@ 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/sl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo index fc6a8742fdac..906d5eb3cbc6 100644 Binary files a/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po index e533b608ae0e..8c49c54e0f8f 100644 --- a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Jannis Leidel , 2011 +# Primož Verdnik , 2017 # zejn , 2013,2016 # zejn , 2011-2013 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: 2016-09-27 19:24+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-02 08:35+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -216,8 +217,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Objekt %(name)s z glavnim ključem %(key)r ne obstaja." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "%(name)s s ključem \"%(key)s\" ne obstaja. Morda je bil izbrisan?" #, python-format msgid "Add %s" @@ -243,8 +244,8 @@ msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s izbran" msgstr[1] "%(total_count)s izbrana" -msgstr[2] "%(total_count)s izbrani" -msgstr[3] "%(total_count)s izbranih" +msgstr[2] "Vsi %(total_count)s izbrani" +msgstr[3] "Vseh %(total_count)s izbranih" #, python-format msgid "0 of %(cnt)s selected" @@ -470,7 +471,7 @@ msgid "Add" msgstr "Dodaj" msgid "You don't have permission to edit anything." -msgstr "Nimate dovoljenja za urejanje." +msgstr "Nimate dovoljenja za urejanje česarkoli." msgid "Recent actions" msgstr "Nedavna dejanja" diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo index cbe0330f4244..618fcf8ca172 100644 Binary files a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po index e785c69f52ea..cdd5371c9164 100644 --- a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-09-27 19:33+0000\n" -"Last-Translator: zejn \n" +"PO-Revision-Date: 2017-03-02 08:28+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo index 29fdf24a60d7..7381ec09b770 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 cae0316db823..095295394f5e 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po @@ -9,15 +9,15 @@ # Jonathan Lindén, 2015 # Jonathan Lindén, 2014 # Mattias Hansson , 2016 -# sorl , 2011 +# Mikko Hellsing , 2011 # Thomas Lundqvist , 2013,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: 2016-07-07 19:24+0000\n" -"Last-Translator: Mattias Hansson \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:14+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -175,32 +175,35 @@ msgstr "" #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" +msgstr "{name} \"{obj}\" lades till. Du kan redigera objektet igen nedanför." #, python-brace-format msgid "" "The {name} \"{obj}\" was added successfully. You may add another {name} " "below." msgstr "" +"{name} \"{obj}\" lades till. Du kan lägga till ytterligare {name} nedan." #, python-brace-format msgid "The {name} \"{obj}\" was added successfully." -msgstr "" +msgstr "{name} \"{obj}\" lades till." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" +msgstr "{name} \"{obj}\" ändrades. Du kan ändra det igen nedan." #, python-brace-format msgid "" "The {name} \"{obj}\" was changed successfully. You may add another {name} " "below." msgstr "" +"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"below." #, python-brace-format msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" +msgstr "{name} \"{obj}\" ändrades." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -216,8 +219,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" togs bort." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "" #, python-format msgid "Add %s" @@ -471,10 +474,10 @@ msgid "You don't have permission to edit anything." msgstr "Du har inte rättigheter att redigera något." msgid "Recent actions" -msgstr "" +msgstr "Senaste Händelser" msgid "My actions" -msgstr "" +msgstr "Mina händelser" msgid "None available" msgstr "Inga tillgängliga" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo index 777acbf8dc51..a5f5334c1406 100644 Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po index 5054c938236e..703fff218bac 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po @@ -4,7 +4,8 @@ # Andreas Pelme , 2012 # Jannis Leidel , 2011 # Jonathan Lindén, 2014 -# Mattias Jansson , 2011 +# Mattias Hansson , 2016 +# Mattias Benjaminsson , 2011 # Samuel Linde , 2011 # Thomas Lundqvist , 2016 msgid "" @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 10:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-22 19:08+0000\n" +"Last-Translator: Mattias Hansson \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -152,68 +153,68 @@ msgid "Tomorrow" msgstr "I morgon" msgid "January" -msgstr "" +msgstr "januari" msgid "February" -msgstr "" +msgstr "februari" msgid "March" -msgstr "" +msgstr "mars" msgid "April" -msgstr "" +msgstr "april" msgid "May" -msgstr "" +msgstr "maj" msgid "June" -msgstr "" +msgstr "juni" msgid "July" -msgstr "" +msgstr "juli" msgid "August" -msgstr "" +msgstr "augusti" msgid "September" -msgstr "" +msgstr "september" msgid "October" -msgstr "" +msgstr "oktober" msgid "November" -msgstr "" +msgstr "november" msgid "December" -msgstr "" +msgstr "december" msgctxt "one letter Sunday" msgid "S" -msgstr "" +msgstr "S" msgctxt "one letter Monday" msgid "M" -msgstr "" +msgstr "M" msgctxt "one letter Tuesday" msgid "T" -msgstr "" +msgstr "T" msgctxt "one letter Wednesday" msgid "W" -msgstr "" +msgstr "O" msgctxt "one letter Thursday" msgid "T" -msgstr "" +msgstr "T" msgctxt "one letter Friday" msgid "F" -msgstr "" +msgstr "F" msgctxt "one letter Saturday" msgid "S" -msgstr "" +msgstr "L" msgid "Show" msgstr "Visa" diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo index 28e4274a3092..8c8e45e406ea 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 096ff1657edf..53fd51430a70 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po @@ -1,9 +1,9 @@ # This file is distributed under the same license as the Django package. # # Translators: -# BouRock, 2015-2016 +# BouRock, 2015-2017 # BouRock, 2014-2015 -# Caner Başaran , 2013 +# Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2012 # Cihad GÜNDOĞDU , 2014 # Cihan Okyay , 2014 @@ -14,8 +14,8 @@ 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: 2016-05-21 09:41+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 17:42+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -224,8 +224,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" başarılı olarak silindi." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(key)r birincil anahtarı olan %(name)s nesnesi mevcut değil." +msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgstr "\"%(key)s\" Kimliği ile %(name)s mevcut değil. Belki silinmiş midir?" #, python-format msgid "Add %s" diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo index 9ad9b1d8ea45..3727170af1ab 100644 Binary files a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po index 4cec81a66ca0..0db11656bd14 100644 --- a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po @@ -4,8 +4,8 @@ # Oleksandr Chernihov , 2014 # Andriy Sokolovskiy , 2015 # Boryslav Larin , 2011 -# Denis Podlesniy , 2016 -# Igor Melnyk, 2014 +# Денис Подлесный , 2016 +# Igor Melnyk, 2014,2017 # Jannis Leidel , 2011 # Kirill Gagarski , 2015 # Max V. Stotsky , 2014 @@ -17,9 +17,9 @@ 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: 2016-07-07 22:38+0000\n" -"Last-Translator: Denis Podlesniy \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-22 13:46+0000\n" +"Last-Translator: Igor Melnyk\n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -224,8 +224,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" був видалений успішно." #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s об'єкт з первинним ключем %(key)r не існує." +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" diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo index aa987520efee..6c69f621dcf7 100644 Binary files a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po index 0b2cd24dc541..329fed389e87 100644 --- a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po @@ -3,9 +3,9 @@ # Translators: # Oleksandr Chernihov , 2014 # Boryslav Larin , 2011 -# Denis Podlesniy , 2016 +# Денис Подлесный , 2016 # Jannis Leidel , 2011 -# Panasoft , 2016 +# panasoft , 2016 # Sergey Lysach , 2011-2012 msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2016-07-07 22:59+0000\n" -"Last-Translator: Denis Podlesniy \n" +"Last-Translator: Денис Подлесный \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" 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 0b3a613e371d..56be2e0a7e78 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 fcac6abf7af0..86b1f78a1245 100644 --- a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # Jannis Leidel , 2011 # Kevin Sze , 2012 # Lele Long , 2011,2015 -# Liping Wang , 2016 +# Liping Wang , 2016-2017 # mozillazg , 2016 # Ronald White , 2013-2014 # Sean Lee , 2013 @@ -19,8 +19,8 @@ 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: 2016-09-20 02:14+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-14 10:21+0000\n" "Last-Translator: Liping Wang \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" @@ -216,8 +216,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "具有主键 %(key)r 的对象 %(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" diff --git a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo index 739d6d24d00c..b43a206c2a41 100644 Binary files a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po index 0aad78d690dc..7f12a2759b39 100644 --- a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,15 +7,15 @@ # mail6543210 , 2013-2014 # ming hsien tzang , 2011 # tcc , 2011 -# Tzu-ping Chung , 2016 +# Tzu-ping Chung , 2016-2017 # Yeh-Yung , 2013 # Yeh-Yung , 2012 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: 2016-08-19 07:27+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 16:34+0000\n" "Last-Translator: Tzu-ping Chung \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" "language/zh_TW/)\n" @@ -211,8 +211,8 @@ msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 已成功刪除。" #, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "主鍵 %(key)r 的 %(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" diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index aef1e2c24e8a..a479cb200860 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -3,6 +3,7 @@ import copy import json import operator +import re from collections import OrderedDict from functools import partial, reduce, update_wrapper @@ -360,7 +361,7 @@ def lookup_allowed(self, lookup, value): # It is allowed to filter on values that would be found from local # model anyways. For example, if you filter on employee__department__id, # then the id value would be found already from employee__department_id. - if not prev_field or (prev_field.concrete and + if not prev_field or (prev_field.is_relation and field not in prev_field.get_path_info()[-1].target_fields): relation_parts.append(part) if not getattr(field, 'get_path_info', None): @@ -1510,6 +1511,27 @@ def add_view(self, request, form_url='', extra_context=None): def change_view(self, request, object_id, form_url='', extra_context=None): return self.changeform_view(request, object_id, form_url, extra_context) + def _get_edited_object_pks(self, request, prefix): + """Return POST data values of list_editable primary keys.""" + pk_pattern = re.compile(r'{}-\d+-{}$'.format(prefix, self.model._meta.pk.name)) + return [value for key, value in request.POST.items() if pk_pattern.match(key)] + + def _get_list_editable_queryset(self, request, prefix): + """ + Based on POST data, return a queryset of the objects that were edited + via list_editable. + """ + object_pks = self._get_edited_object_pks(request, prefix) + queryset = self.get_queryset(request) + validate = queryset.model._meta.pk.to_python + try: + for pk in object_pks: + validate(pk) + except ValidationError: + # Disable the optimization if the POST data was tampered with. + return queryset + return queryset.filter(pk__in=object_pks) + @csrf_protect_m def changelist_view(self, request, extra_context=None): """ @@ -1601,7 +1623,8 @@ def changelist_view(self, request, extra_context=None): # Handle POSTed bulk-edit data. if request.method == 'POST' and cl.list_editable and '_save' in request.POST: FormSet = self.get_changelist_formset(request) - formset = cl.formset = FormSet(request.POST, request.FILES, queryset=self.get_queryset(request)) + modified_objects = self._get_list_editable_queryset(request, FormSet.get_default_prefix()) + formset = cl.formset = FormSet(request.POST, request.FILES, queryset=modified_objects) if formset.is_valid(): changecount = 0 for form in formset.forms: diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 466b36bceccc..b2a40c49b20f 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -738,7 +738,7 @@ a.deletelink:focus, a.deletelink:hover { .object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink { background-repeat: no-repeat; - background-position: 93% center; + background-position: right 7px center; padding-right: 26px; } diff --git a/django/contrib/admin/static/admin/js/SelectBox.js b/django/contrib/admin/static/admin/js/SelectBox.js index 1a14959bcada..2073f03dd819 100644 --- a/django/contrib/admin/static/admin/js/SelectBox.js +++ b/django/contrib/admin/static/admin/js/SelectBox.js @@ -19,7 +19,7 @@ var box = document.getElementById(id); var node; $(box).empty(); // clear all options - var new_options = box.outerHTML.slice(0, -9); // grab just the opening tag + var new_options = box.outerHTML.slice(0, -9); // grab just the opening tag var cache = SelectBox.cache[id]; for (var i = 0, j = cache.length; i < j; i++) { node = cache[i]; @@ -48,7 +48,7 @@ token = tokens[k]; if (node_text.indexOf(token) === -1) { node.displayed = 0; - break; // Once the first token isn't found we're done + 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 7041701f271b..0901bb54bbd3 100644 --- a/django/contrib/admin/static/admin/js/actions.js +++ b/django/contrib/admin/static/admin/js/actions.js @@ -8,59 +8,59 @@ var actionCheckboxes = $(this); var list_editable_changed = false; var 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 { + $(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(); - } - $(actionCheckboxes).prop("checked", checked) - .parent().parent().toggleClass(options.selectedClass, checked); - }, - updateCounter = function() { - var sel = $(actionCheckboxes).filter(":checked").length; - // data-actions-icnt is defined in the generated HTML - // and contains the total amount of objects in the queryset - var 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() { - var value; - if (sel === actionCheckboxes.length) { - value = true; + $(options.acrossInput).val(0); + $(options.actionContainer).removeClass(options.selectedClass); + }, + checker = function(checked) { + if (checked) { showQuestion(); } else { - value = false; - clearAcross(); + reset(); } - return value; - }); - }; + $(actionCheckboxes).prop("checked", checked) + .parent().parent().toggleClass(options.selectedClass, checked); + }, + updateCounter = function() { + var sel = $(actionCheckboxes).filter(":checked").length; + // data-actions-icnt is defined in the generated HTML + // and contains the total amount of objects in the queryset + var 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() { + var 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 diff --git a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js index ce865936543c..38d578b8ec7a 100644 --- a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js @@ -11,10 +11,10 @@ dismissClockFunc: [], dismissCalendarFunc: [], calendarDivName1: 'calendarbox', // name of calendar
that gets toggled - calendarDivName2: 'calendarin', // name of
that contains calendar - calendarLinkName: 'calendarlink',// name of the link that is used to toggle - clockDivName: 'clockbox', // name of clock
that gets toggled - clockLinkName: 'clocklink', // name of the link that is used to toggle + calendarDivName2: 'calendarin', // name of
that contains calendar + calendarLinkName: 'calendarlink', // name of the link that is used to toggle + clockDivName: 'clockbox', // name of clock
that gets toggled + clockLinkName: 'clocklink', // name of the link that is used to toggle shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch timezoneOffset: 0, diff --git a/django/contrib/admin/static/admin/js/core.js b/django/contrib/admin/static/admin/js/core.js index edccdc0217dc..2e0ad6b84cae 100644 --- a/django/contrib/admin/static/admin/js/core.js +++ b/django/contrib/admin/static/admin/js/core.js @@ -191,9 +191,9 @@ function findPosY(obj) { return result; }; -// ---------------------------------------------------------------------------- -// String object extensions -// ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // String object extensions + // ---------------------------------------------------------------------------- String.prototype.pad_left = function(pad_length, pad_string) { var new_string = this; for (var i = 0; new_string.length < pad_length; i++) { @@ -209,18 +209,18 @@ function findPosY(obj) { var day, month, year; while (i < split_format.length) { switch (split_format[i]) { - case "%d": - day = date[i]; - break; - case "%m": - month = date[i] - 1; - break; - case "%Y": - year = date[i]; - break; - case "%y": - year = date[i]; - break; + case "%d": + day = date[i]; + break; + case "%m": + month = date[i] - 1; + break; + case "%Y": + year = date[i]; + break; + case "%y": + year = date[i]; + break; } ++i; } diff --git a/django/contrib/admin/static/admin/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js index 4e9bb77e9c45..669fb02423ce 100644 --- a/django/contrib/admin/static/admin/js/inlines.js +++ b/django/contrib/admin/static/admin/js/inlines.js @@ -63,8 +63,8 @@ var template = $("#" + options.prefix + "-empty"); var row = template.clone(true); row.removeClass(options.emptyCssClass) - .addClass(options.formCssClass) - .attr("id", options.prefix + "-" + nextIndex); + .addClass(options.formCssClass) + .attr("id", options.prefix + "-" + nextIndex); if (row.is("tr")) { // If the forms are laid out in table rows, insert // the remove button into the last table cell: @@ -131,16 +131,16 @@ /* Setup plugin defaults */ $.fn.formset.defaults = { - prefix: "form", // The form prefix for your django formset - addText: "add another", // Text for the add link - deleteText: "remove", // Text for the delete link - addCssClass: "add-row", // CSS class applied to the add link - deleteCssClass: "delete-row", // CSS class applied to the delete link - emptyCssClass: "empty-row", // CSS class applied to the empty row - formCssClass: "dynamic-form", // CSS class applied to each form in a formset - added: null, // Function called each time a new form is added - removed: null, // Function called each time a form is deleted - addButton: null // Existing add button to use + prefix: "form", // The form prefix for your django formset + addText: "add another", // Text for the add link + deleteText: "remove", // Text for the delete link + addCssClass: "add-row", // CSS class applied to the add link + deleteCssClass: "delete-row", // CSS class applied to the delete link + emptyCssClass: "empty-row", // CSS class applied to the empty row + formCssClass: "dynamic-form", // CSS class applied to each form in a formset + added: null, // Function called each time a new form is added + removed: null, // Function called each time a form is deleted + addButton: null // Existing add button to use }; @@ -149,8 +149,8 @@ var $rows = $(this); var alternatingRows = function(row) { $($rows.selector).not(".add-row").removeClass("row1 row2") - .filter(":even").addClass("row1").end() - .filter(":odd").addClass("row2"); + .filter(":even").addClass("row1").end() + .filter(":odd").addClass("row2"); }; var reinitDateTimeShortCuts = function() { diff --git a/django/contrib/admin/static/admin/js/urlify.js b/django/contrib/admin/static/admin/js/urlify.js index 9dcbc82d13a7..7003565b0fb2 100644 --- a/django/contrib/admin/static/admin/js/urlify.js +++ b/django/contrib/admin/static/admin/js/urlify.js @@ -119,7 +119,7 @@ var Downcoder = { 'Initialize': function() { - if (Downcoder.map) { // already made + if (Downcoder.map) { // already made return; } Downcoder.map = {}; @@ -168,12 +168,12 @@ // characters, whitespace, and dash; remove other characters. s = XRegExp.replace(s, XRegExp('[^-_\\p{L}\\p{N}\\s]', 'g'), ''); } else { - s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars + s = s.replace(/[^-\w\s]/g, ''); // remove unneeded chars } - s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces - s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens - s = s.toLowerCase(); // convert to lowercase - return s.substring(0, num_chars); // trim to first num_chars chars + s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces + s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens + s = s.toLowerCase(); // convert to lowercase + return s.substring(0, num_chars); // trim to first num_chars chars } window.URLify = URLify; })(); 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 327b8ad16a9d..71491fca451d 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 is_initial %}

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

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

{% endif %} + +{% endif %}
+{{ widget.input_text }}:{% endif %} +{% if widget.is_initial %}

{% endif %} diff --git a/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html b/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html index b6a443695327..b84ab14cca65 100644 --- a/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html +++ b/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html @@ -1,24 +1,24 @@ {% load i18n static %}
- {% include widget.template_name %} + {{ rendered_widget }} {% block links %} {% spaceless %} {% if can_change_related %} - {% trans 'Change' %} {% endif %} {% if can_add_related %} - {% trans 'Add' %} {% endif %} {% if can_delete_related %} - {% trans 'Delete' %} diff --git a/django/contrib/admin/templates/admin/widgets/url.html b/django/contrib/admin/templates/admin/widgets/url.html index 554a9343feaf..629a740664c9 100644 --- a/django/contrib/admin/templates/admin/widgets/url.html +++ b/django/contrib/admin/templates/admin/widgets/url.html @@ -1 +1 @@ -{% if widget.value %}

{{ current_label }} {{ widget.value }}
{{ change_label }} {% endif %}{% include "django/forms/widgets/input.html" %}{% if widget.value %}

{% endif %} +{% if url_valid %}

{{ current_label }} {{ widget.value }}
{{ change_label }} {% endif %}{% include "django/forms/widgets/input.html" %}{% if url_valid %}

{% endif %} diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 1e13d13d31b0..d6b0c28b08b5 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -36,6 +36,8 @@ def lookup_needs_distinct(opts, lookup_path): lookup_fields = lookup_fields[:-1] # Now go through the fields (following all relations) and look for an m2m for field_name in lookup_fields: + if field_name == 'pk': + field_name = opts.pk.name field = opts.get_field(field_name) if hasattr(field, 'get_path_info'): # This field is a relation, update opts to follow the relation diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index 5960f82d9114..209e0289e3cb 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -6,6 +6,8 @@ import copy from django import forms +from django.core.exceptions import ValidationError +from django.core.validators import URLValidator from django.db.models.deletion import CASCADE from django.urls import reverse from django.urls.exceptions import NoReverseMatch @@ -34,7 +36,7 @@ def __init__(self, verbose_name, is_stacked, attrs=None, choices=()): self.is_stacked = is_stacked super(FilteredSelectMultiple, self).__init__(attrs, choices) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(FilteredSelectMultiple, self).get_context(name, value, attrs) context['widget']['attrs']['class'] = 'selectfilter' if self.is_stacked: @@ -132,7 +134,7 @@ def __init__(self, rel, admin_site, attrs=None, using=None): self.db = using super(ForeignKeyRawIdWidget, self).__init__(attrs) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ForeignKeyRawIdWidget, self).get_context(name, value, attrs) rel_to = self.rel.model if rel_to in self.admin_site._registry: @@ -147,9 +149,7 @@ def get_context(self, name, value, attrs=None): params = self.url_parameters() if params: - related_url += '?' + '&'.join( - '%s=%s' % (k, v) for k, v in params.items(), - ) + related_url += '?' + '&'.join('%s=%s' % (k, v) for k, v in params.items()) context['related_url'] = mark_safe(related_url) context['link_title'] = _('Lookup') # The JavaScript code looks for this class. @@ -174,7 +174,7 @@ def label_and_url_for_value(self, value): key = self.rel.get_related_field().name try: obj = self.rel.model._default_manager.using(self.db).get(**{key: value}) - except (ValueError, self.rel.model.DoesNotExist): + except (ValueError, self.rel.model.DoesNotExist, ValidationError): return '', '' try: @@ -199,7 +199,7 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): """ template_name = 'admin/widgets/many_to_many_raw_id.html' - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ManyToManyRawIdWidget, self).get_context(name, value, attrs) if self.rel.model in self.admin_site._registry: # The related object is registered with the same AdminSite @@ -268,19 +268,21 @@ def get_related_url(self, info, action, *args): return reverse("admin:%s_%s_%s" % (info + (action,)), current_app=self.admin_site.name, args=args) - def get_context(self, name, value, attrs=None): - with self.widget.override_choices(self.choices): - context = self.widget.get_context(name, value, attrs) - + def get_context(self, name, value, attrs): from django.contrib.admin.views.main import IS_POPUP_VAR, TO_FIELD_VAR rel_opts = self.rel.model._meta info = (rel_opts.app_label, rel_opts.model_name) + self.widget.choices = self.choices url_params = '&'.join("%s=%s" % param for param in [ (TO_FIELD_VAR, self.rel.get_related_field().name), (IS_POPUP_VAR, 1), ]) - context['url_params'] = url_params - context['model'] = rel_opts.verbose_name + context = { + 'rendered_widget': self.widget.render(name, value, attrs), + 'name': name, + 'url_params': url_params, + 'model': rel_opts.verbose_name, + } if self.can_change_related: change_related_template_url = self.get_related_url(info, 'change', '__fk__') context.update( @@ -304,6 +306,9 @@ def get_context(self, name, value, attrs=None): def value_from_datadict(self, data, files, name): return self.widget.value_from_datadict(data, files, name) + def value_omitted_from_data(self, data, files, name): + return self.widget.value_omitted_from_data(data, files, name) + def id_for_label(self, id_): return self.widget.id_for_label(id_) @@ -335,23 +340,26 @@ def __init__(self, attrs=None): class AdminURLFieldWidget(forms.URLInput): template_name = 'admin/widgets/url.html' - def __init__(self, attrs=None): + def __init__(self, attrs=None, validator_class=URLValidator): final_attrs = {'class': 'vURLField'} if attrs is not None: final_attrs.update(attrs) super(AdminURLFieldWidget, self).__init__(attrs=final_attrs) + self.validator = validator_class() def get_context(self, name, value, attrs): + try: + self.validator(value if value else '') + url_valid = True + except ValidationError: + url_valid = False context = super(AdminURLFieldWidget, self).get_context(name, value, attrs) context['current_label'] = _('Currently:') context['change_label'] = _('Change:') - context['widget']['href'] = smart_urlquote(context['widget']['value']) + context['widget']['href'] = smart_urlquote(context['widget']['value']) if value else '' + context['url_valid'] = url_valid return context - def format_value(self, value): - value = super(AdminURLFieldWidget, self).format_value(value) - return force_text(value) - class AdminIntegerFieldWidget(forms.NumberInput): class_name = 'vIntegerField' diff --git a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo index 9b3665fbdca4..0d6bbdf55dbc 100644 Binary files a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po index 1058eaa0d213..712422757cbb 100644 --- a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # abraham.martin , 2014 -# Antoni Aloy , 2014 +# Antoni Aloy , 2014,2017 # Carles Barrobés , 2012 # Jannis Leidel , 2011 # Roger Pons , 2015 @@ -10,9 +10,9 @@ 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:29+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ msgid "Arguments" msgstr "Arguments" msgid "Back to Model documentation" -msgstr "" +msgstr "Tornar a la documentació del Model" msgid "Model documentation" msgstr "Documentació del model" @@ -218,7 +218,7 @@ msgid "Templates:" msgstr "Plantilles:" msgid "Back to View documentation" -msgstr "" +msgstr "Tornar a la documentació de les Vistes" msgid "View documentation" msgstr "Veure documentació" @@ -246,13 +246,6 @@ msgstr "" "Funció de la vista: %(full_name)s . Nom: %(url_name)s .\n" -msgid "Boolean (Either True or False)" -msgstr "Booleà (Cert o Fals)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Camp del tipus: %(field_type)s" - msgid "tag:" msgstr "etiqueta:" diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index 444d7b2c9408..d4cd33bed68e 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: 2016-05-17 23:12+0200\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -301,17 +301,8 @@ msgid "" "code>.\n" msgstr "" -#: contrib/admindocs/tests/test_fields.py:32 -msgid "Boolean (Either True or False)" -msgstr "" - -#: contrib/admindocs/tests/test_fields.py:42 -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "" - -#: contrib/admindocs/views.py:75 contrib/admindocs/views.py:77 -#: contrib/admindocs/views.py:79 +#: contrib/admindocs/views.py:78 contrib/admindocs/views.py:80 +#: contrib/admindocs/views.py:82 msgid "tag:" msgstr "" diff --git a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo index 9e0a6f19db83..d454f181905b 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 95914cf9f99e..5bc4afa4a1dd 100644 --- a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # Antoni Aloy , 2012-2013 # Claude Paroz , 2014 +# Eduardo , 2017 # Ernesto Avilés Vázquez , 2015 # Herty Nava , 2013 # Jannis Leidel , 2011 @@ -13,9 +14,9 @@ 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 11:52+0000\n" +"Last-Translator: Eduardo \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -146,7 +147,7 @@ msgid "Arguments" msgstr "Argumentos" msgid "Back to Model documentation" -msgstr "" +msgstr "Volver a la documentación del modelo" msgid "Model documentation" msgstr "Documentación del modelo" @@ -221,7 +222,7 @@ msgid "Templates:" msgstr "Plantillas:" msgid "Back to View documentation" -msgstr "" +msgstr "Volver a la documentación de la vista" msgid "View documentation" msgstr "Ver la documentación" @@ -249,13 +250,6 @@ msgstr "" "Visualizar funcion: %(full_name)s. Nombre: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Booleano (Verdadero o Falso)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Campo de tipo: %(field_type)s" - msgid "tag:" msgstr "etiqueta:" diff --git a/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.mo index a6355e5b76d8..9c5ef24003c3 100644 Binary files a/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.po index ffe8f7214507..20b38f71e515 100644 --- a/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/es_VE/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Hotellook, 2014 # Leonardo J. Caballero G. , 2016 +# Yoel Acevedo, 2017 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-10 14:59+0000\n" +"Last-Translator: Yoel Acevedo\n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -141,7 +142,7 @@ msgid "Arguments" msgstr "Argumentos" msgid "Back to Model documentation" -msgstr "" +msgstr "Volver a la documentación de Modelos" msgid "Model documentation" msgstr "Documentación del Modelo" @@ -216,7 +217,7 @@ msgid "Templates:" msgstr "Plantillas:" msgid "Back to View documentation" -msgstr "" +msgstr "Volver a la documentación de Vistas" msgid "View documentation" msgstr "Documentación de la vista" @@ -244,13 +245,6 @@ msgstr "" " Ver función: %(full_name)s. Nombre: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Booleano (Verdadero o Falso)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Tipo de campo: %(field_type)s" - msgid "tag:" msgstr "etiqueta:" diff --git a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo index 65d93eb871a5..2ac52f0fb262 100644 Binary files a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po index edffe024767e..8bc4b9de06c5 100644 --- a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Aitzol Naberan , 2011-2013 +# Eneko Illarramendi , 2017 # 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 14:29+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -113,7 +114,7 @@ msgid "Model: %(name)s" msgstr "Modeloa: %(name)s" msgid "Fields" -msgstr "" +msgstr "Eremuak" msgid "Field" msgstr "Eremua" @@ -234,13 +235,6 @@ msgid "" "code>.\n" msgstr "" -msgid "Boolean (Either True or False)" -msgstr "Boolearra (egia ala gezurra)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Eremuaren mota: %(field_type)s" - msgid "tag:" msgstr "etiketa:" @@ -252,7 +246,7 @@ msgstr "bista:" #, python-format msgid "App %(app_label)r not found" -msgstr "" +msgstr "%(app_label)r aplikazioa ez da aurkitu" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" diff --git a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo index 747cbadee990..a9852c15cf86 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 7056d81e28db..90384addda3e 100644 --- a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/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,2017 # Elias Luttinen , 2015 # 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-06 21:19+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -135,7 +135,7 @@ msgid "Arguments" msgstr "Argumentit" msgid "Back to Model documentation" -msgstr "" +msgstr "Takaisin mallidokumentaatioon" msgid "Model documentation" msgstr "Mallidokumentaatio" @@ -210,7 +210,7 @@ msgid "Templates:" msgstr "Mallineet:" msgid "Back to View documentation" -msgstr "" +msgstr "Takaisin näkymädokumentaatioon" msgid "View documentation" msgstr "Näkymädokumentaatio" @@ -237,13 +237,6 @@ msgstr "" "\n" "Näkymäfunktio: %(full_name)s. Nimi: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Kenttä tyyppiä: %(field_type)s" - msgid "tag:" msgstr "tagi:" diff --git a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo index 3646c3f7fc0b..03eff5a176da 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 7236ceca1878..0b02fa9e4e56 100644 --- a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# Meir Kriheli , 2012-2015 +# Meir Kriheli , 2012-2015,2017 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-01 14:43+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" @@ -129,7 +129,7 @@ msgid "Arguments" msgstr "פרמטרים" msgid "Back to Model documentation" -msgstr "" +msgstr "חזרה לתיעוד מודל" msgid "Model documentation" msgstr "תיעוד מודלים" @@ -204,7 +204,7 @@ msgid "Templates:" msgstr "תבניות:" msgid "Back to View documentation" -msgstr "" +msgstr "חזרה לתיעוד ה-View" msgid "View documentation" msgstr "תיעוד View" @@ -232,13 +232,6 @@ msgstr "" " פונקציית View: %(full_name)s. שם: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "בוליאני (אמת או שקר)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "שדה מסוג: %(field_type)s" - msgid "tag:" msgstr "תג:" diff --git a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo index 7c5d1fec90a8..65bb51842541 100644 Binary files a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po index a213f715d228..30ce596c5b1d 100644 --- a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # aljosa , 2012 +# Filip Cuk , 2016 # Jannis Leidel , 2011 # Mislav Cimperšak , 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: 2016-05-21 09:51+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Croatian (http://www.transifex.com/django/django/language/" "hr/)\n" @@ -21,7 +22,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" msgid "Administrative Documentation" -msgstr "" +msgstr "Administrativna dokumentacija" msgid "Home" msgstr "Početna" @@ -222,13 +223,6 @@ msgid "" "code>.\n" msgstr "" -msgid "Boolean (Either True or False)" -msgstr "Boolean (True ili False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Polje tipa: %(field_type)s" - msgid "tag:" msgstr "tag:" diff --git a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo index 469efc0942c7..69dd6a77686d 100644 Binary files a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po index b0eb543396bc..c86c460645e2 100644 --- a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po @@ -4,14 +4,14 @@ # Fery Setiawan , 2015-2016 # Jannis Leidel , 2011 # rodin , 2011-2012 -# rodin , 2013-2014 +# rodin , 2013-2014,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: 2016-08-23 04:54+0000\n" -"Last-Translator: Fery Setiawan \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -40,9 +40,9 @@ msgid "" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." msgstr "" -"Untuk memasang bookmarklet, tarik tautan ke alat batang penunjuk halaman " -"buku anda, atau klik-kanan tautan dan tambakan itu ke penunjuk halaman buku " -"anda. Sekarang anda dapat memilih bookmarklet dari tiap halaman di situs." +"Untuk memasang bookmarklet, tarik tautan ke bilah markah, atau klik kanan " +"tautan dan tambahkan ke markah Anda. Sekarang Anda dapat memilih bookmarklet " +"dari semua halaman di situs." msgid "Documentation for this page" msgstr "Dokumentasi untuk laman ini" @@ -133,16 +133,16 @@ msgid "Description" msgstr "Deskripsi" msgid "Methods with arguments" -msgstr "Cara dengan penjelasan" +msgstr "Metode dengan argumen" msgid "Method" -msgstr "Cara" +msgstr "Metode" msgid "Arguments" -msgstr "Penjelasan" +msgstr "Argumen" msgid "Back to Model documentation" -msgstr "Kembali ke Model Dokumentasi" +msgstr "Kembali ke Dokumentasi Model" msgid "Model documentation" msgstr "Dokumentasi model" @@ -217,7 +217,7 @@ msgid "Templates:" msgstr "Templat:" msgid "Back to View documentation" -msgstr "Kembali ke Tampilan dokumentasi" +msgstr "Kembali ke dokumentasi Tampilan" msgid "View documentation" msgstr "Dokumentasi view" @@ -245,13 +245,6 @@ msgstr "" " Fungsi view: %(full_name)s. Nama: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Boolean (nilai True atau False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Jenis bidang: %(field_type)s" - msgid "tag:" msgstr "tag:" diff --git a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo index 20d676508ea8..546f0330ef80 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 3d7258e05f00..7bed7ed1212b 100644 --- a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po @@ -2,12 +2,13 @@ # # Translators: # Jannis Leidel , 2011 +# Māris Nartišs , 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: 2016-05-21 09:51+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -19,7 +20,7 @@ msgstr "" "2);\n" msgid "Administrative Documentation" -msgstr "" +msgstr "Administrācijas dokumentācija" msgid "Home" msgstr "Sākums" @@ -55,7 +56,7 @@ msgid "List of all the template tags and their functions." msgstr "" msgid "Filters" -msgstr "" +msgstr "Filtri" msgid "" "Filters are actions which can be applied to variables in a template to alter " @@ -63,7 +64,7 @@ msgid "" msgstr "" msgid "Models" -msgstr "" +msgstr "Modeļi" msgid "" "Models are descriptions of all the objects in the system and their " @@ -72,7 +73,7 @@ msgid "" msgstr "" msgid "Views" -msgstr "" +msgstr "Skati" msgid "" "Each page on the public site is generated by a view. The view defines which " @@ -99,44 +100,44 @@ msgstr "" #, python-format msgid "Model: %(name)s" -msgstr "" +msgstr "Modelis: %(name)s" msgid "Fields" -msgstr "" +msgstr "Lauki" msgid "Field" -msgstr "" +msgstr "Lauks" msgid "Type" -msgstr "" +msgstr "Tips" msgid "Description" -msgstr "" +msgstr "Apraksts" msgid "Methods with arguments" -msgstr "" +msgstr "Metodes ar parametriem" msgid "Method" -msgstr "" +msgstr "Metode" msgid "Arguments" -msgstr "" +msgstr "Parametrs" msgid "Back to Model documentation" msgstr "" msgid "Model documentation" -msgstr "" +msgstr "Modeļu dokumentācija" msgid "Model groups" -msgstr "" +msgstr "Modeļu grupas" msgid "Templates" -msgstr "" +msgstr "Šabloni" #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Šablons: %(name)s" #, python-format msgid "Template: \"%(name)s\"" @@ -188,10 +189,10 @@ msgid "View: %(name)s" msgstr "" msgid "Context:" -msgstr "" +msgstr "Konteksts:" msgid "Templates:" -msgstr "" +msgstr "Šabloni:" msgid "Back to View documentation" msgstr "" @@ -219,13 +220,6 @@ msgid "" "code>.\n" msgstr "" -msgid "Boolean (Either True or False)" -msgstr "Boolean (True vai False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Lauks ar tipu: %(field_type)s" - msgid "tag:" msgstr "tags:" diff --git a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo index 3282a663105e..8af54326e091 100644 Binary files a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po index a6ec5cc6f4b6..c2352405048d 100644 --- a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Jannis Leidel , 2011 -# Vasil Vangelovski , 2016 +# Vasil Vangelovski , 2016-2017 # Vasil Vangelovski , 2013-2014 # Vasil Vangelovski , 2012 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: 2016-05-21 09:51+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-05 09:12+0000\n" +"Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgid "Arguments" msgstr "Аргументи" msgid "Back to Model documentation" -msgstr "" +msgstr "Назад до документација за модели." msgid "Model documentation" msgstr "Документација за модели" @@ -217,7 +217,7 @@ msgid "Templates:" msgstr "Шаблони:" msgid "Back to View documentation" -msgstr "" +msgstr "Назад до документација за погледи" msgid "View documentation" msgstr "Документација за поглед" @@ -245,13 +245,6 @@ msgstr "" " Погледска функција (вју функција): %(full_name)s. Име: " "%(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Логичка (или точно или неточно)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Поле од тип: %(field_type)s" - msgid "tag:" msgstr "таг:" diff --git a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo index 165889cebc64..ad9b26bd5dd6 100644 Binary files a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po index 80074b67173d..e5ba4bbb9d33 100644 --- a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Bouke Haarsma , 2013 +# Evelijn Saaltink , 2016 # Ilja Maas , 2015 # Jannis Leidel , 2011 # Jeffrey Gelens , 2012,2014 @@ -9,8 +10,8 @@ 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: 2016-05-21 09:51+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" @@ -138,7 +139,7 @@ msgid "Arguments" msgstr "Argumenten" msgid "Back to Model documentation" -msgstr "" +msgstr "Terug naar Model documentatie" msgid "Model documentation" msgstr "Model documentatie" @@ -212,7 +213,7 @@ msgid "Templates:" msgstr "Templates:" msgid "Back to View documentation" -msgstr "" +msgstr "Terug naar Bekijk documentatie" msgid "View documentation" msgstr "Bekijk documentatie" @@ -240,13 +241,6 @@ msgstr "" " View functie: %(full_name)s. Naam: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Boolean (True danwel False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Veld van type: %(field_type)s" - msgid "tag:" msgstr "tag:" diff --git a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo index 9fc2282c0cda..b2ce886f979a 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 5fe527ed59af..343e10f971da 100644 --- a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po @@ -9,26 +9,28 @@ # m_aciek , 2014 # p , 2014 # Mattia Procopio , 2014 +# Tomasz Kajtoch , 2017 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: 2016-08-09 13:28+0000\n" -"Last-Translator: m_aciek \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-22 12:15+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Administrative Documentation" -msgstr "Dokumentacja administratora" +msgstr "Dokumentacja administracyjna" msgid "Home" -msgstr "Początek" +msgstr "Strona główna" msgid "Documentation" msgstr "Dokumentacja" @@ -45,8 +47,9 @@ msgid "" "bookmarklet from any page in the site." msgstr "" "Aby zainstalować skryptozakładkę, przeciągnij jej link do paska zakładek lub " -"kliknij prawym przyciskiem na link i wybierz opcję zapisania do zakładek. Po " -"tym możesz użyć tak zapisanej zakładki na dowolnej podstronie tego serwisu." +"kliknij prawym przyciskiem na link i wybierz opcję zapisania do zakładek. Od " +"tego momentu możesz użyć tak zapisanej zakładki na dowolnej podstronie tego " +"serwisu." msgid "Documentation for this page" msgstr "Dokumentacja dla tej strony" @@ -62,7 +65,7 @@ msgid "Tags" msgstr "Tagi" msgid "List of all the template tags and their functions." -msgstr "Lista wszystkich tagów i ich funkcji w szablonie." +msgstr "Lista wszystkich templatetagów i ich funkcji." msgid "Filters" msgstr "Filtry" @@ -82,8 +85,8 @@ msgid "" "associated fields. Each model has a list of fields which can be accessed as " "template variables" msgstr "" -"Modele to opisy wszystkich obiektów w systemie i związanych z nimi dziedzin. " -"Każdy model ma listę pól, które mogą być dostępne w zmiennych szablonu" +"Modele to opisy wszystkich obiektów w systemie i związanych z nimi pól. " +"Każdy model ma listę pól, które mogą być dostępne jako zmienne szablonu" msgid "Views" msgstr "Widoki" @@ -137,13 +140,13 @@ msgid "Description" msgstr "Opis" msgid "Methods with arguments" -msgstr "Metody z parametrami" +msgstr "Metody z argumentami" msgid "Method" msgstr "Metoda" msgid "Arguments" -msgstr "Parametry" +msgstr "Argumenty" msgid "Back to Model documentation" msgstr "Powrót do dokumentacji modelu" @@ -227,17 +230,17 @@ msgid "View documentation" msgstr "Zobacz dokumentację" msgid "Jump to namespace" -msgstr "Przeskocz do nazwy" +msgstr "Przejdź do przestrzeni nazw" msgid "Empty namespace" -msgstr "Pusta nazwa" +msgstr "Pusta przestrzeń nazw" #, python-format msgid "Views by namespace %(name)s" -msgstr "Widoki po nazwie %(name)s" +msgstr "Widoki według przestrzeni nazw %(name)s" msgid "Views by empty namespace" -msgstr "Widoki po pustej nazwie" +msgstr "Widoki po pustej przestrzeni nazw" #, python-format msgid "" @@ -249,13 +252,6 @@ msgstr "" "Funkcja widoku: %(full_name)s. Nazwa: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Wartość logiczna (True, False - prawda lub fałsz)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Pole typu: %(field_type)s" - msgid "tag:" msgstr "tag:" @@ -267,7 +263,7 @@ msgstr "widok:" #, python-format msgid "App %(app_label)r not found" -msgstr "Aplikacja %(app_label)r nie została znaleziona" +msgstr "Nie znaleziono aplikacji %(app_label)r" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" diff --git a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo index 0371a3b2ce39..e22617eec22d 100644 Binary files a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po index a7911a3aadc1..c9ff38ee6629 100644 --- a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # Translators: # Bruno Miguel Custódio , 2012 # Jannis Leidel , 2011 -# Nuno Mariz , 2011-2013,2015 +# Nuno Mariz , 2011-2013,2015,2017 # Raúl Pedro Fernandes Santos, 2014 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: 2016-05-21 09:51+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Portuguese (http://www.transifex.com/django/django/language/" "pt/)\n" @@ -142,7 +142,7 @@ msgid "Arguments" msgstr "Argumentos" msgid "Back to Model documentation" -msgstr "" +msgstr "Voltar para a documentação dos Models" msgid "Model documentation" msgstr "Documentação dos Models" @@ -217,7 +217,7 @@ msgid "Templates:" msgstr "Templates:" msgid "Back to View documentation" -msgstr "" +msgstr "Voltar para a documentação das Views" msgid "View documentation" msgstr "Ver documentação" @@ -245,13 +245,6 @@ msgstr "" " Função de view: %(full_name)s. Nome: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Boolean (Pode ser True ou False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Campo do tipo: %(field_type)s" - msgid "tag:" msgstr "tag:" diff --git a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo index 983bcbaa7378..395f58b4431f 100644 Binary files a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po index 5a8ab06aeb3d..392062d669b1 100644 --- a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Jannis Leidel , 2011 +# Primož Verdnik , 2017 # zejn , 2013,2016 # zejn , 2012 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: 2016-09-27 19:34+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-02 08:38+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -40,9 +41,9 @@ msgid "" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." msgstr "" -"Aplete zaznamkov je mogoče namestiti z vleko\n" -"povezave v orodno vrstico z zaznamki, ali pa z desnim klikom na povezavo.\n" -"Zaznamek je mogoče izbrati s katerekoli strani tega spletnega mesta." +"Aplete zaznamkov je mogoče namestiti z vleko povezave v orodno vrstico z " +"zaznamki, ali pa z desnim klikom na povezavo. Zaznamek je mogoče izbrati s " +"katerekoli strani tega spletnega mesta." msgid "Documentation for this page" msgstr "Dokumentacija te strani" @@ -243,13 +244,6 @@ msgstr "" " Funkcija pogleda: %(full_name)s. Ime: %(url_name)s.\n" -msgid "Boolean (Either True or False)" -msgstr "Boolova vrednost (PRAV ali NAPAK)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Polje vrste: %(field_type)s" - msgid "tag:" msgstr "oznaka:" @@ -261,7 +255,7 @@ msgstr "pogled:" #, python-format msgid "App %(app_label)r not found" -msgstr "Applikacija %(app_label)r ni najdena" +msgstr "Applikacije %(app_label)r ni bilo mogoče najti" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" diff --git a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo index d219e4a7bb68..6cf5b0dbee7b 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 e120b47c9dbd..2f14c057c426 100644 --- a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po @@ -3,17 +3,18 @@ # Translators: # Oleksandr Chernihov , 2014 # Andriy Sokolovskiy , 2015 -# Denis Podlesniy , 2016 +# Денис Подлесный , 2016 # Jannis Leidel , 2011 +# Kirill Gagarski , 2016 # Max V. Stotsky , 2014 # Sergey Lysach , 2012 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: 2016-07-07 22:52+0000\n" -"Last-Translator: Denis Podlesniy \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:34+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -54,8 +55,8 @@ msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" -"Перекидає вас з будь-якої сторінки в документацію для функції, що " -"сгенерувала цю сторінку." +"Перекидає вас з будь-якої сторінки в документацію для відображення, що " +"сгенерувало цю сторінку." msgid "Tags" msgstr "Теги" @@ -93,9 +94,9 @@ msgid "" "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 "" @@ -234,10 +235,10 @@ msgstr "Порожня іменована зона" #, python-format msgid "Views by namespace %(name)s" -msgstr "" +msgstr "Відображення у просторі імен %(name)s" msgid "Views by empty namespace" -msgstr "" +msgstr "Відображення у глобальному просторі імен " #, python-format msgid "" @@ -245,13 +246,9 @@ msgid "" " View function: %(full_name)s. Name: %(url_name)s.\n" msgstr "" - -msgid "Boolean (Either True or False)" -msgstr "Булеве значення (True або False)" - -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "Тип поля: %(field_type)s" +"\n" +"Функція відображення: %(full_name)s. Им'я: %(url_name)s.\n" msgid "tag:" msgstr "тег:" diff --git a/django/contrib/admindocs/middleware.py b/django/contrib/admindocs/middleware.py index 4bdd4f45b5bb..63dcb5f076ec 100644 --- a/django/contrib/admindocs/middleware.py +++ b/django/contrib/admindocs/middleware.py @@ -2,6 +2,8 @@ from django.conf import settings from django.utils.deprecation import MiddlewareMixin +from .utils import get_view_name + class XViewMiddleware(MiddlewareMixin): """ @@ -24,5 +26,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 = http.HttpResponse() - response['X-View'] = "%s.%s" % (view_func.__module__, view_func.__name__) + response['X-View'] = get_view_name(view_func) return response diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py index b6a23c884949..7275e15707ce 100644 --- a/django/contrib/admindocs/utils.py +++ b/django/contrib/admindocs/utils.py @@ -5,6 +5,7 @@ from email.parser import HeaderParser from django.urls import reverse +from django.utils import six from django.utils.encoding import force_bytes from django.utils.safestring import mark_safe @@ -18,6 +19,16 @@ docutils_is_available = True +def get_view_name(view_func): + mod_name = view_func.__module__ + if six.PY3: + view_name = getattr(view_func, '__qualname__', view_func.__class__.__name__) + else: + # PY2 does not support __qualname__ + view_name = getattr(view_func, '__name__', view_func.__class__.__name__) + return mod_name + '.' + view_name + + def trim_docstring(docstring): """ Uniformly trim leading/trailing whitespace from docstrings. diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index 3488e9fb3aa0..12f5863228e8 100644 --- a/django/contrib/admindocs/views.py +++ b/django/contrib/admindocs/views.py @@ -15,7 +15,6 @@ from django.http import Http404 from django.template.engine import Engine from django.urls import get_mod_func, get_resolver, get_urlconf, reverse -from django.utils import six from django.utils.decorators import method_decorator from django.utils.inspect import ( func_accepts_kwargs, func_accepts_var_args, func_has_no_args, @@ -24,6 +23,8 @@ from django.utils.translation import ugettext as _ from django.views.generic import TemplateView +from .utils import get_view_name + # Exclude methods starting with these strings from documentation MODEL_METHODS_EXCLUDE = ('_', 'add_', 'delete', 'save', 'set_') @@ -129,23 +130,13 @@ def get_context_data(self, **kwargs): class ViewIndexView(BaseAdminDocsView): template_name = 'admin_doc/view_index.html' - @staticmethod - def _get_full_name(func): - mod_name = func.__module__ - if six.PY3: - return '%s.%s' % (mod_name, func.__qualname__) - else: - # PY2 does not support __qualname__ - func_name = getattr(func, '__name__', func.__class__.__name__) - return '%s.%s' % (mod_name, func_name) - def get_context_data(self, **kwargs): views = [] urlconf = import_module(settings.ROOT_URLCONF) view_functions = extract_views_from_urlpatterns(urlconf.urlpatterns) for (func, regex, namespace, name) in view_functions: views.append({ - 'full_name': self._get_full_name(func), + 'full_name': get_view_name(func), 'url': simplify_regex(regex), 'url_name': ':'.join((namespace or []) + (name and [name] or [])), 'namespace': ':'.join((namespace or [])), @@ -302,7 +293,6 @@ def get_context_data(self, **kwargs): }) else: arguments = get_func_full_args(func) - print_arguments = arguments # Join arguments with ', ' and in case of default value, # join it with '='. Use repr() so that strings will be # correctly displayed. @@ -437,7 +427,7 @@ def simplify_regex(pattern): pattern = replace_named_groups(pattern) pattern = replace_unnamed_groups(pattern) # clean up any outstanding regex-y characters. - pattern = pattern.replace('^', '').replace('$', '') + pattern = pattern.replace('^', '').replace('$', '').replace('?', '') if not pattern.startswith('/'): pattern = '/' + pattern return pattern diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index 04a7f7ddcb83..c617f1c2ca73 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -66,24 +66,8 @@ def authenticate(request=None, **credentials): If the given credentials are valid, return a User object. """ for backend, backend_path in _get_backends(return_tuples=True): - args = (request,) try: - inspect.getcallargs(backend.authenticate, request, **credentials) - except TypeError: - try: - inspect.getcallargs(backend.authenticate, **credentials) - except TypeError: - # This backend doesn't accept these credentials as arguments. Try the next one. - continue - else: - args = () - warnings.warn( - "Update authentication backend %s to accept a " - "positional `request` argument." % backend_path, - RemovedInDjango21Warning - ) - try: - user = backend.authenticate(*args, **credentials) + user = _authenticate_with_backend(backend, backend_path, request, credentials) except PermissionDenied: # This backend says to stop in our tracks - this user should not be allowed in at all. break @@ -97,6 +81,41 @@ def authenticate(request=None, **credentials): user_login_failed.send(sender=__name__, credentials=_clean_credentials(credentials), request=request) +def _authenticate_with_backend(backend, backend_path, request, credentials): + credentials = credentials.copy() # Prevent a mutation from propagating. + args = (request,) + # Does the backend accept a request argument? + try: + inspect.getcallargs(backend.authenticate, request, **credentials) + except TypeError: + args = () + credentials.pop('request', None) + # Does the backend accept a request keyword argument? + try: + inspect.getcallargs(backend.authenticate, request=request, **credentials) + except TypeError: + # Does the backend accept credentials without request? + try: + inspect.getcallargs(backend.authenticate, **credentials) + except TypeError: + # This backend doesn't accept these credentials as arguments. Try the next one. + return None + else: + warnings.warn( + "Update %s.authenticate() to accept a positional " + "`request` argument." % backend_path, + RemovedInDjango21Warning + ) + else: + credentials['request'] = request + warnings.warn( + "In %s.authenticate(), move the `request` keyword argument " + "to the first positional argument." % backend_path, + RemovedInDjango21Warning + ) + return backend.authenticate(*args, **credentials) + + def login(request, user, backend=None): """ Persist a user id and a backend in the request. This way a user doesn't diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 02250d83da6f..3741fdea7c34 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -16,12 +16,27 @@ from django.template import loader from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode +from django.utils.six import PY3 from django.utils.text import capfirst from django.utils.translation import ugettext, ugettext_lazy as _ UserModel = get_user_model() +def _unicode_ci_compare(s1, s2): + """ + Perform case-insensitive comparison of two identifiers, using the + recommended algorithm from Unicode Technical Report 36, section + 2.11.2(B)(2). + """ + normalized1 = unicodedata.normalize('NFKC', s1) + normalized2 = unicodedata.normalize('NFKC', s2) + if PY3: + return normalized1.casefold() == normalized2.casefold() + # lower() is the best alternative available on Python 2. + return normalized1.lower() == normalized2.lower() + + class ReadOnlyPasswordHashWidget(forms.Widget): template_name = 'auth/widgets/read_only_password_hash.html' @@ -249,11 +264,16 @@ def get_users(self, email): that prevent inactive users and users with unusable passwords from resetting their password. """ + email_field_name = UserModel.get_email_field_name() active_users = UserModel._default_manager.filter(**{ - '%s__iexact' % UserModel.get_email_field_name(): email, + '%s__iexact' % email_field_name: email, 'is_active': True, }) - return (u for u in active_users if u.has_usable_password()) + return ( + u for u in active_users + if u.has_usable_password() and + _unicode_ci_compare(email, getattr(u, email_field_name)) + ) def save(self, domain_override=None, subject_template_name='registration/password_reset_subject.txt', @@ -266,6 +286,7 @@ def save(self, domain_override=None, user. """ email = self.cleaned_data["email"] + email_field_name = UserModel.get_email_field_name() for user in self.get_users(email): if not domain_override: current_site = get_current_site(request) @@ -273,8 +294,9 @@ def save(self, domain_override=None, domain = current_site.domain else: site_name = domain = domain_override + user_email = getattr(user, email_field_name) context = { - 'email': email, + 'email': user_email, 'domain': domain, 'site_name': site_name, 'uid': urlsafe_base64_encode(force_bytes(user.pk)), @@ -286,7 +308,7 @@ def save(self, domain_override=None, context.update(extra_email_context) self.send_mail( subject_template_name, email_template_name, context, from_email, - email, html_email_template_name=html_email_template_name, + user_email, html_email_template_name=html_email_template_name, ) diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo index 25e42c5a253a..e7ee19bfdcb6 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 0c74ee144d59..cd42cc08f7fd 100644 --- a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Antoni Aloy , 2015 +# Antoni Aloy , 2015,2017 # Carles Barrobés , 2011-2012,2014-2015 # Jannis Leidel , 2011 # Roger Pons , 2015 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 08:38+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-14 07:30+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -119,19 +119,19 @@ msgid "hash" msgstr "hash" msgid "variety" -msgstr "" +msgstr "varietat" msgid "version" -msgstr "" +msgstr "versió" msgid "memory cost" -msgstr "" +msgstr "cost de memòria" msgid "time cost" -msgstr "" +msgstr "cost de temps" msgid "parallelism" -msgstr "" +msgstr "paralelisme" msgid "work factor" msgstr "factor de treball" @@ -187,7 +187,7 @@ msgid "username" msgstr "nom d'usuari" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" +msgstr "Obligatori. 150 o menys caràcters. Només lletres, dígits i @/./+/-/_." msgid "A user with that username already exists." msgstr "Ja existeix un usuari amb aquest nom." @@ -274,11 +274,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Introdueixi un nom d'usuari vàlid. Aquest valor pot contenir sols lletres, " +"números i els caràcters @/./+/-/_ " msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Introdueixi un nom d'usuari vàlid. Aquest valor pot contenir sols lletres, " +"números i els caràcters @/./+/-/_ " msgid "Logged out" msgstr "Sessió finalitzada" diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo index 712c35bbac33..4e9185b15636 100644 Binary files a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.po b/django/contrib/auth/locale/de/LC_MESSAGES/django.po index 736119f09e81..bb7fe2ea8337 100644 --- a/django/contrib/auth/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/de/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-07-26 11:38+0000\n" +"PO-Revision-Date: 2016-12-01 14:16+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n" "MIME-Version: 1.0\n" @@ -83,8 +83,8 @@ msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" -"Bitte einen gültigen %(username)s und ein Passwort eingeben. Beide Felder " -"berücksichtigen die Groß-/Kleinschreibung." +"Bitte %(username)s und Passwort eingeben. Beide Felder berücksichtigen die " +"Groß-/Kleinschreibung." msgid "This account is inactive." msgstr "Dieser Benutzer ist inaktiv." diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo index d0c160624086..e774d74d1978 100644 Binary files a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.po b/django/contrib/auth/locale/el/LC_MESSAGES/django.po index 5d6413b2cbf2..18a31be54e1a 100644 --- a/django/contrib/auth/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/el/LC_MESSAGES/django.po @@ -77,7 +77,7 @@ msgid "" msgstr "" "Τα ακατέργαστα συνθηματικά δεν αποθηκεύονται, οπότε δεν υπάρχει τρόπος να " "δείτε το συνθηματικό αυτού του χρήστη, αλλά μπορείτε να το αλλάξετε " -"χρησιμοποιόντας αυτή τη φόρμα." +"χρησιμοποιόντας αυτή τη φόρμα." #, python-format msgid "" diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo index 49f69c24e4d5..7307537d6fef 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 f43627e5f8d7..d9ba8ab8a53b 100644 --- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # albertoalcolea , 2014 -# Antoni Aloy , 2012-2013,2015-2016 +# Antoni Aloy , 2012-2013,2015-2017 # Ernesto Avilés Vázquez , 2015-2016 # guillem , 2012 # Igor Támara , 2015 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-08-03 15:40+0000\n" -"Last-Translator: Ernesto Avilés Vázquez \n" +"PO-Revision-Date: 2017-02-14 07:13+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -193,6 +193,8 @@ msgstr "nombre de usuario" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Requerido. 150 carácteres como máximo. Únicamente letras, dígitos y @/./+/-/" +"_ " msgid "A user with that username already exists." msgstr "Ya existe un usuario con este nombre." @@ -279,11 +281,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Introduza un nombre de usuario válido. Este valor puede contener únicamente " +"letras inglesas, números y los caracteres @/./+/-/_ " msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Introduza un nombre de usuario válido. Este valor puede contener únicamente " +"letras, números y los caracteres @/./+/-/_ " msgid "Logged out" msgstr "Sesión terminada" diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo index f400c068f93f..077ab6507ebb 100644 Binary files a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po index 4c46b2af9b33..582edd5fba49 100644 --- a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Abraham Estrada , 2011-2012 +# Abraham Estrada, 2011-2012 +# Juan Pablo Flores , 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: 2016-05-21 08:38+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-30 03:03+0000\n" +"Last-Translator: Juan Pablo Flores \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/" "language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -28,7 +29,7 @@ msgstr "Fechas importantes" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." msgid "Password changed successfully." msgstr "Cambio de contraseña exitoso" @@ -38,7 +39,7 @@ msgid "Change password: %s" msgstr "Cambiar contraseña: %s" msgid "Authentication and Authorization" -msgstr "" +msgstr "Autenticación y Autorización" msgid "password" msgstr "contraseña" @@ -47,10 +48,10 @@ msgid "last login" msgstr "último ingreso" msgid "No password set." -msgstr "" +msgstr "No se ha establecido ninguna contraseña." msgid "Invalid password format or unknown hashing algorithm." -msgstr "" +msgstr "Formato de contraseña no válido o algoritmo de hash desconocido." msgid "The two password fields didn't match." msgstr "Los dos campos de contraseñas no coinciden entre si." @@ -62,25 +63,31 @@ msgid "Password confirmation" msgstr "Confirmación de contraseña" msgid "Enter the same password as before, for verification." -msgstr "" +msgstr "Para verificar, introduzca la misma contraseña que introdujo antes." 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 "" +"Las contraseñas no se almacenan en texto plano, así que no hay manera de ver " +"la contraseña del usuario, pero se puede cambiar la contraseña mediante este formulario." #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" +"Por favor introduza %(username)s y contraseña correctos. Note que puede que " +"ambos campos sean estrictos en relación a diferencias entre mayúsculas y " +"minúsculas." msgid "This account is inactive." msgstr "Esta cuenta está inactiva." msgid "Email" -msgstr "" +msgstr "Correo Electrónico" msgid "New password" msgstr "Contraseña nueva" @@ -112,19 +119,19 @@ msgid "hash" msgstr "hash" msgid "variety" -msgstr "" +msgstr "variedad" msgid "version" -msgstr "" +msgstr "versión" msgid "memory cost" -msgstr "" +msgstr "costo en memoria" msgid "time cost" -msgstr "" +msgstr "costo en tiempo" msgid "parallelism" -msgstr "" +msgstr "Paralelismo" msgid "work factor" msgstr "factor trabajo" @@ -136,7 +143,7 @@ msgid "name" msgstr "nombre" msgid "content type" -msgstr "" +msgstr "tipo de contenido" msgid "codename" msgstr "nombre código" @@ -167,18 +174,22 @@ msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" +"Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los " +"permisos concedidos para cada uno de su grupo." msgid "user permissions" msgstr "permisos de usuario" msgid "Specific permissions for this user." -msgstr "" +msgstr "Permisos específicos para este usuario" msgid "username" msgstr "nombre de usuario" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Obligatorio. Longitud máxima 150 caracteres alfanuméricos. Letras, dígitos y " +"@/./+/-/_ únicamente." msgid "A user with that username already exists." msgstr "Ya existe un usuario con ese nombre." @@ -190,7 +201,7 @@ msgid "last name" msgstr "apellido" msgid "email address" -msgstr "" +msgstr "Dirección de correo electrónico" msgid "staff status" msgstr "es staff" @@ -225,32 +236,36 @@ msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." msgstr[0] "" +"La contraseña es muy corta. Debe contener al menos %(min_length)d caracter." msgstr[1] "" +"La contraseña es muy corta. Debe contener al menos %(min_length)d caracteres." #, 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] "" +"Tu contraseña es muy corta. Debe contener al menos %(min_length)d caracter." msgstr[1] "" +"Su contraseña es muy corta. Debe contener al menos %(min_length)d caracteres." #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "La contraseña es muy similar a %(verbose_name)s." msgid "Your password can't be too similar to your other personal information." -msgstr "" +msgstr "Su contraseña no puede ser similar a su otra información personal." msgid "This password is too common." -msgstr "" +msgstr "Esta contraseña es muy común." msgid "Your password can't be a commonly used password." -msgstr "" +msgstr "Su contraseña no puede ser una contraseña común." msgid "This password is entirely numeric." -msgstr "" +msgstr "Esta contraseña es totalmente numérica." msgid "Your password can't be entirely numeric." -msgstr "" +msgstr "Su contraseña no puede ser enteramente numérica." #, python-format msgid "Password reset on %(site_name)s" @@ -260,32 +275,36 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Ingrese un nombre de usuario válido. Este sólo puede contener letras en " +"inglés, números y caracteres @ /. / + / - / _." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Ingrese un nombre de usuario válido. Este puede contener sólo letras, " +"números y caracteres @ /. / + / - / _." msgid "Logged out" msgstr "Sesión cerrada" msgid "Password reset" -msgstr "" +msgstr "Restablecer contraseña" msgid "Password reset sent" -msgstr "" +msgstr "Restablecimiento de contraseña enviado" msgid "Enter new password" -msgstr "" +msgstr "Introduzca la nueva contraseña" msgid "Password reset unsuccessful" -msgstr "" +msgstr "Restablecimiento de contraseña no exitosa" msgid "Password reset complete" -msgstr "" +msgstr "Reinicialización de contraseña completada" msgid "Password change" -msgstr "" +msgstr "Cambio de contraseña" msgid "Password change successful" -msgstr "" +msgstr "Cambio de contraseña exitoso" diff --git a/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.mo index 0a04f4a549a0..dbc533d8f48f 100644 Binary files a/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.po index 3cf03225188c..3e8c9bd7c77a 100644 --- a/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es_VE/LC_MESSAGES/django.po @@ -1,14 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 # Leonardo J. Caballero G. , 2016 +# Yoel Acevedo, 2017 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: 2016-05-21 08:39+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-15 14:13+0000\n" +"Last-Translator: Eduardo \n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" "language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -115,19 +117,19 @@ msgid "hash" msgstr "función resumen" msgid "variety" -msgstr "" +msgstr "variedad" msgid "version" -msgstr "" +msgstr "versión" msgid "memory cost" -msgstr "" +msgstr "costo de memoria" msgid "time cost" -msgstr "" +msgstr "costo de tiempo" msgid "parallelism" -msgstr "" +msgstr "paralelismo" msgid "work factor" msgstr "factor trabajo" @@ -184,6 +186,7 @@ msgstr "nombre de usuario" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Requerido. 150 caracteres o menos. Letras, dígitos y @/./+/-/_ solamente. " msgid "A user with that username already exists." msgstr "Ya existe un usuario con este nombre." @@ -270,11 +273,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Introduzca un nombre de usuario válido. Este solo puede contener letras del " +"alfabeto en ingles, números y los caracteres @/./+/-/_" msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Introduzca un nombre de usuario válido. Este solo puede contener letras, " +"números y los caracteres @/./+/-/_" msgid "Logged out" msgstr "Sesión terminada" diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo index 7ba5805fec9f..7b8529f827c7 100644 Binary files a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po index 5784df940d15..bc4a16e1f3c3 100644 --- a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Aitzol Naberan , 2013 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 # julen , 2015 # Urtzi Odriozola , 2016 @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 08:38+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 15:07+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -84,7 +85,7 @@ msgid "This account is inactive." msgstr "Kontu hau az dago aktibo." msgid "Email" -msgstr "Eposta" +msgstr "Emaila" msgid "New password" msgstr "Pasahitz berria" @@ -105,7 +106,7 @@ msgid "algorithm" msgstr "algoritmoak" msgid "iterations" -msgstr "begiztak" +msgstr "iterazioak" msgid "salt" msgstr "salt" @@ -117,7 +118,7 @@ msgid "variety" msgstr "" msgid "version" -msgstr "" +msgstr "bertsioa" msgid "memory cost" msgstr "" @@ -138,7 +139,7 @@ msgid "name" msgstr "izena" msgid "content type" -msgstr "" +msgstr "eduki mota" msgid "codename" msgstr "kode izena" @@ -192,7 +193,7 @@ msgid "last name" msgstr "abizena" msgid "email address" -msgstr "e-mail helbidea" +msgstr "helbide elektronikoa" msgid "staff status" msgstr "Arduradun egoera" @@ -229,7 +230,10 @@ msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." msgstr[0] "" +"Pasahitz hau laburregia da. Gutxienez karaktere %(min_length)d izan behar du." msgstr[1] "" +"Pasahitz hau laburregia da. Gutxienez %(min_length)d karaktere izan behar " +"ditu." #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -245,7 +249,7 @@ msgid "Your password can't be too similar to your other personal information." msgstr "" msgid "This password is too common." -msgstr "" +msgstr "Pasahitz hau arruntegia da." msgid "Your password can't be a commonly used password." msgstr "" @@ -264,11 +268,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Idatzi baleko erabiltzaile izen bat. Eremu honetan hizki, zenbaki eta @/./" +"+/-/_ karaktereak bakarrik erabili daitezke." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Idatzi baleko erabiltzaile izen bat. Eremu honetan hizki, zenbaki eta @/./" +"+/-/_ karaktereak bakarrik erabili daitezke." msgid "Logged out" msgstr "Sesiotik kanpo" diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo index 96c8c125900f..92d93b9050a5 100644 Binary files a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po index 867e436e3eab..9afb0943a40f 100644 --- a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/auth/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,2017 # Antti Kaihola , 2011 # Jannis Leidel , 2011 # Klaus Dahlén , 2012 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 08:39+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-02-06 21:20+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -118,19 +118,19 @@ msgid "hash" msgstr "tiiviste" msgid "variety" -msgstr "" +msgstr "variaatio" msgid "version" -msgstr "" +msgstr "versio" msgid "memory cost" -msgstr "" +msgstr "muistihinta" msgid "time cost" -msgstr "" +msgstr "aikahinta" msgid "parallelism" -msgstr "" +msgstr "rinnakkaisuus" msgid "work factor" msgstr "työmäärä" @@ -186,6 +186,8 @@ msgstr "käyttäjätunnus" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Vaaditaan. Enintään 150 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat " +"sallittuja." msgid "A user with that username already exists." msgstr "Käyttäjätunnus on jo rekisteröity." @@ -271,11 +273,14 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Syötä kelvollinen käyttäjänimi (vain englannin kirjaimet, numerot ja merkit " +"@/./+/-/_)." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Syötä kelvollinen käyttäjänimi (vain kirjaimet, numerot ja merkit @/./+/-/_)." msgid "Logged out" msgstr "Kirjautunut ulos" diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo index 11dfad9ef3eb..01f974f31082 100644 Binary files a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.po b/django/contrib/auth/locale/he/LC_MESSAGES/django.po index b6251a32f284..68f7a9258a58 100644 --- a/django/contrib/auth/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/he/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # Translators: # Alex Gaynor , 2011-2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2012-2015 +# Meir Kriheli , 2012-2015,2017 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: 2016-05-21 08:39+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-04-01 14:48+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" @@ -115,19 +115,19 @@ msgid "hash" msgstr "גיבוב" 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 "work factor" @@ -181,7 +181,7 @@ 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 "משתמש עם שם משתמש זה קיים כבר" @@ -263,11 +263,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 "יצאת מהמערכת" diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo index e31bc0964bed..9e3047ba334a 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 3cb395d9895b..94f3eb719343 100644 --- a/django/contrib/auth/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/id/LC_MESSAGES/django.po @@ -3,16 +3,16 @@ # Translators: # Fery Setiawan , 2015-2016 # Jannis Leidel , 2011 -# oon arfiandwi , 2016 +# oon arfiandwi (OonID) , 2016 # rodin , 2011,2013 -# rodin , 2013-2015 +# rodin , 2013-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: 2016-08-24 05:00+0000\n" -"Last-Translator: Fery Setiawan \n" +"PO-Revision-Date: 2016-11-01 14:54+0000\n" +"Last-Translator: rodin \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "Tanggal penting" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s objek dengan primary key %(key)r tidak ditemukan." +msgstr "Objek %(name)s dengan primary key %(key)r tidak ditemukan." msgid "Password changed successfully." msgstr "Sandi berhasil diubah." @@ -73,8 +73,8 @@ msgid "" "password, but you can change the password using this form." msgstr "" -"Sandi mentah tidak disimpan, jadi tidak ada jalan untuk melihat sandi " -"pengguna ini, tetapi anda dapat merubah sandi menggunakan formulir ini. " #, python-format @@ -143,7 +143,7 @@ msgid "name" msgstr "nama" msgid "content type" -msgstr "jenis isijenis isi" +msgstr "jenis isi" msgid "codename" msgstr "namasandi" @@ -187,8 +187,7 @@ msgid "username" msgstr "nama pengguna" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" -"Dibutuhkan. 150 karakter atau sedikit. Hanya huruf, angka dan @/./+/-/_." +msgstr "Wajib. 150 karakter atau sedikit. Hanya huruf, angka, dan @/./+/-/_." msgid "A user with that username already exists." msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada." @@ -236,31 +235,31 @@ msgid_plural "" "characters." msgstr[0] "" "Kata sandi terlalu singkat. Kata sandi harus memuat setidaknya " -"%(min_length)d huruf." +"%(min_length)d karakter." #, 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] "Kata sandi anda harus memuat setidaknya %(min_length)d huruf." +msgstr[0] "Kata sandi Anda harus memuat setidaknya %(min_length)d karakter." #, python-format 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 personal lainnya" +msgstr "Kata sandi tidak boleh terlalu mirip dengan informasi pribadi lainnya." 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 ana tidak dapat kata sandi yang umum digunakan." +msgstr "Kata sandi Anda tidak boleh kata sandi yang umum digunakan." msgid "This password is entirely numeric." -msgstr "Kata sandi ini seluruhnya numerik/" +msgstr "Kata sandi ini seluruhnya terdiri dari angka." msgid "Your password can't be entirely numeric." -msgstr "Kata sandi anda tidak dapat seluruhnya numerik." +msgstr "Kata sandi Anda tidak dapat seluruhnya numerik." #, python-format msgid "Password reset on %(site_name)s" @@ -270,15 +269,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" -"Masukkan nama pengguna sah. Nilai ini mungkin mengandung hanya huruf " -"Enggris, angka dan karakter @/./+/-/_." +"Masukkan nama pengguna valid. Nilai ini mungkin mengandung hanya karakter " +"dalam bahasa Inggris, angka dan karakter @/./+/-/_." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" -"Masukkan nama pengguna sah. Nilai ini hanya boleh mengandung huruf, angka " -"dan karakter @/./+/-/_." +"Masukkan nama pengguna valid. Nilai ini hanya boleh mengandung karakter, " +"angka, dan karakter @/./+/-/_." msgid "Logged out" msgstr "Keluar" @@ -287,7 +286,7 @@ msgid "Password reset" msgstr "Setel ulang sandi" msgid "Password reset sent" -msgstr "Reset kata sandi terkirim" +msgstr "Penyetelan ulang kata sandi telah dikirim" msgid "Enter new password" msgstr "Masukkan sandi baru" diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo index 5572f1e6bcfd..9f5961d74b4b 100644 Binary files a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.po b/django/contrib/auth/locale/is/LC_MESSAGES/django.po index a9013c9b735d..1141202d5521 100644 --- a/django/contrib/auth/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/is/LC_MESSAGES/django.po @@ -4,13 +4,14 @@ # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 # Logi Ragnarsson , 2012 +# Thordur Sigurdsson , 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: 2016-05-21 08:38+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-08 00:36+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -30,7 +31,7 @@ msgstr "Mikilvægar dagsetningar" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "%(name)s hlutur með lykilinn %(key)r er ekki til." msgid "Password changed successfully." msgstr "Breyting á lykilorði tókst." @@ -40,7 +41,7 @@ msgid "Change password: %s" msgstr "Breyta lykilorði: %s" msgid "Authentication and Authorization" -msgstr "" +msgstr "Auðkenning og réttindi" msgid "password" msgstr "lykilorð" @@ -49,10 +50,10 @@ msgid "last login" msgstr "síðasta innskráning" msgid "No password set." -msgstr "" +msgstr "Ekkert lykilorð skráð." msgid "Invalid password format or unknown hashing algorithm." -msgstr "" +msgstr "Ógilt snið á lykilorði eða óþekkt hökkunaralgrím." msgid "The two password fields didn't match." msgstr "Lykilorðin tvö pössuðu ekki saman." @@ -64,25 +65,30 @@ msgid "Password confirmation" msgstr "Staðfesting lykilorðs" msgid "Enter the same password as before, for verification." -msgstr "" +msgstr "Settu inn sama lykilorð og áður til staðfestingar." 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 "" +"Lykilorð eru aðeins geymd dulkóðuð, svo ekki er hægt að sjá lykilorð þessa " +"notanda, en þú getur breytt lykilorðinu með þessu " +"eyðublaði ." #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" +"Vinsamlegast sláðu inn rétt %(username)s og lykilorð. Takið eftir að í báðum " +"reitum skipta há- og lágstafir máli." msgid "This account is inactive." msgstr "Þessi reikningur er óvirkur." msgid "Email" -msgstr "" +msgstr "Netfang" msgid "New password" msgstr "Nýtt lykilorð" @@ -115,16 +121,16 @@ msgid "variety" msgstr "" msgid "version" -msgstr "" +msgstr "útgáfa" msgid "memory cost" -msgstr "" +msgstr "minnisnotkun" msgid "time cost" -msgstr "" +msgstr "tímalengd" msgid "parallelism" -msgstr "" +msgstr "samhliða vinnsla" msgid "work factor" msgstr "vinnustuðull" @@ -136,7 +142,7 @@ msgid "name" msgstr "nafn" msgid "content type" -msgstr "" +msgstr "efnistag" msgid "codename" msgstr "vinnuheiti" @@ -167,18 +173,22 @@ msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" +"Hópar sem þessi notandi tilheyrir. Notandi fær allan aðgangsrétt sem fylgir " +"hverjum hóp sem hann/hún er skráð(ur) í." msgid "user permissions" msgstr "réttindi" msgid "Specific permissions for this user." -msgstr "" +msgstr "Sértæk réttindi fyrir þennan notanda." msgid "username" msgstr "notandanafn" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Nauðsynlegt að fylla út. 150 stafir eða færri. Bókstafir (ekki broddstafir), " +"tölustafir og @/./+/-/_ aðeins leyft." msgid "A user with that username already exists." msgstr "Notandi með þetta notendanafn er nú þegar til." @@ -190,7 +200,7 @@ msgid "last name" msgstr "eftirnafn" msgid "email address" -msgstr "" +msgstr "netfang" msgid "staff status" msgstr "staða starfsmanns" @@ -206,7 +216,7 @@ msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -"Til marks um að notandinn sé virku. Taktu hakið úr þessum möguleika til að " +"Til marks um að notandinn sé virkur. Taktu hakið úr þessum möguleika til að " "eyða aðgangi." msgid "date joined" @@ -226,32 +236,34 @@ msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." msgstr[0] "" +"Þetta lykilorð er of stutt. Það verður að vera minnst %(min_length)d stafur." msgstr[1] "" +"Þetta lykilorð er of stutt. Það verður að vera minnst %(min_length)d stafir." #, 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] "" +msgstr[0] "Lykilorðið verður að vera minnst %(min_length)d stafur." +msgstr[1] "Lykilorðið verður að vera minnst %(min_length)d stafir." #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "Lykilorðið er of líkt %(verbose_name)s." msgid "Your password can't be too similar to your other personal information." -msgstr "" +msgstr "Lykilorðið má ekki vera of líkt þínum persónuupplýsingum." msgid "This password is too common." -msgstr "" +msgstr "Þetta lykilorð er of algengt." msgid "Your password can't be a commonly used password." -msgstr "" +msgstr "Lykilorðið má ekki vera algengt lykilorð." msgid "This password is entirely numeric." -msgstr "" +msgstr "Þetta lykilorð er eingöngu tölustafir." msgid "Your password can't be entirely numeric." -msgstr "" +msgstr "Lykilorðið má ekki vera eingöngu tölustafir." #, python-format msgid "Password reset on %(site_name)s" @@ -261,32 +273,36 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Sláðu inn gilt notandanafn. Þessi reitur má aðeins innihalda bókstafi (ekki " +"broddstafi), tölustafi og @/./+/-/_ táknin" msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Sláðu inn gilt notandanafn. Þessi reitur má aðeins innihalda bókstafi, " +"tölustafi og @/./+/-/_ táknin" msgid "Logged out" msgstr "Útskráð(ur)" msgid "Password reset" -msgstr "" +msgstr "Lykilorð endursett" msgid "Password reset sent" -msgstr "" +msgstr "Endurstilling lykilorðs send" msgid "Enter new password" -msgstr "" +msgstr "Sláðu inn nýtt lykilorð" msgid "Password reset unsuccessful" -msgstr "" +msgstr "Endurstilling á lykilorði mistókst" msgid "Password reset complete" -msgstr "" +msgstr "Endurstilling lykilorðs tókst" msgid "Password change" -msgstr "" +msgstr "Breyta lykilorði" msgid "Password change successful" -msgstr "" +msgstr "Breyting á lykilorði tókst" diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo index 9a183157938d..eb840a20530c 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 9fd5ffc21aa8..4748e0ac627a 100644 --- a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po @@ -1,22 +1,24 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Bumsoo Kim , 2017 # Jiyoon, Ha , 2016 # DaHae Sung , 2016 # Ian Y. Choi , 2015 # Jannis Leidel , 2011 -# Jeong Seongtae , 2014,2016 +# Le Tartuffe , 2014,2016 # Jiyoon, Ha , 2016 # Chr0m3 , 2015 # minsung kang, 2015 +# seok woojing , 2016 # seungho, kim , 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: 2016-09-16 06:23+0000\n" -"Last-Translator: Jiyoon, Ha \n" +"PO-Revision-Date: 2017-04-08 13:12+0000\n" +"Last-Translator: Bumsoo Kim \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" @@ -77,8 +79,8 @@ msgid "" "\">this form." msgstr "" "비밀번호는 원문 그대로 저장되지 않으므로, 사용자의 비밀번호를 볼 수 있는 방법" -"은 없습니다. 하지만 이 양식을 사용하여 비밀번호를 " -"변경할 수 있습니다." +"은 없습니다. 하지만 이 양식을 사용하여 비밀번호" +"를 변경할 수 있습니다." #, python-format msgid "" @@ -214,8 +216,8 @@ msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -"사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다.계정을 삭제하는 대신 " -"이것을 선택 해제하세요." +"이 사용자가 활성화되어 있는지를 나타냅니다. 계정을 삭제하는 대신 이것을 선택 " +"해제하세요." msgid "date joined" msgstr "등록일" diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo index ee35b9746fe3..c712f0182700 100644 Binary files a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po index 06c98f8280a5..11100586e54c 100644 --- a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 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: 2016-05-21 08:38+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-13 09:29+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgstr "Svarīgi datumi" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē." msgid "Password changed successfully." msgstr "Paroles nomainīta sekmīgi." @@ -39,7 +40,7 @@ msgid "Change password: %s" msgstr "Paroles maiņa: %s" msgid "Authentication and Authorization" -msgstr "" +msgstr "Autentifikācija un autorizācija" msgid "password" msgstr "parole" @@ -48,10 +49,10 @@ msgid "last login" msgstr "pēdējoreiz pieslēdzies" msgid "No password set." -msgstr "" +msgstr "Nav norādīta parole" msgid "Invalid password format or unknown hashing algorithm." -msgstr "" +msgstr "Nederīgs paroles formāts vai nezināms hash algoritms." msgid "The two password fields didn't match." msgstr "Paroles lauki nesakrita." @@ -63,25 +64,30 @@ msgid "Password confirmation" msgstr "Paroles apstiprinājums" msgid "Enter the same password as before, for verification." -msgstr "" +msgstr "Ievadi iepriekš norādīto paroli verifikācijai." 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 "" +"Neapstrādātas paroles sistēmā netiek glabātas, līdz ar to nav iespējams " +"redzēt lietotāja paroli, bet tu vari nomainīt paroli lietojot šo formu." #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" +"Lūdzu ievadi korektu %(username)s un paroli personāla kontam. Ņem vērā, ka " +"abi ievades lauki ir reģistr jūtīgi." msgid "This account is inactive." msgstr "Šis konts nav aktīvs." msgid "Email" -msgstr "" +msgstr "E-pasts" msgid "New password" msgstr "Jaunā parole" @@ -100,28 +106,28 @@ msgid "Password (again)" msgstr "Parole (vēlreiz)" msgid "algorithm" -msgstr "" +msgstr "algoritms" msgid "iterations" -msgstr "" +msgstr "iterācijas" msgid "salt" -msgstr "" +msgstr "salt" msgid "hash" -msgstr "" +msgstr "hash" msgid "variety" -msgstr "" +msgstr "dažādība" msgid "version" -msgstr "" +msgstr "versija" msgid "memory cost" -msgstr "" +msgstr "atmiņas izmaksas" msgid "time cost" -msgstr "" +msgstr "laika izmaksas" msgid "parallelism" msgstr "" @@ -130,13 +136,13 @@ msgid "work factor" msgstr "" msgid "checksum" -msgstr "" +msgstr "kontrolsumma" msgid "name" msgstr "nosaukums" msgid "content type" -msgstr "" +msgstr "satura tips" msgid "codename" msgstr "kods" @@ -165,18 +171,20 @@ msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" +"Grupas, kurām lietotājs pieder. Lietotājam būs visas tiesības, kuras ir " +"piešķirtas katrai grupai, kurā viņš pieder." msgid "user permissions" msgstr "lietotāja tiesības" msgid "Specific permissions for this user." -msgstr "" +msgstr "Lietotāja specifiskās tiesības." msgid "username" msgstr "lietotāja vārds" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" +msgstr "Obligāts. 150 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ ." msgid "A user with that username already exists." msgstr "Lietotājs ar šādu lietotāja vārdu jau eksistē." @@ -188,7 +196,7 @@ msgid "last name" msgstr "uzvārds" msgid "email address" -msgstr "" +msgstr "e-pasta adrese" msgid "staff status" msgstr "personāla statuss" @@ -222,69 +230,76 @@ msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." msgstr[0] "" +"Šī parole ir pārāk īsa. Tai ir jābūt vismaz %(min_length)d zīmes garai." msgstr[1] "" +"Šī parole ir pārāk īsa. Tai ir jābūt vismaz %(min_length)d zīmi garai.." msgstr[2] "" +"Šī parole ir pārāk īsa. Tai ir jābūt vismaz %(min_length)d zīmju garai." #, 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] "" -msgstr[2] "" +msgstr[0] "Parolei ir jābūt vismaz %(min_length)d zīmēm garai." +msgstr[1] "Parolei ir jābūt vismaz %(min_length)d zīmi garai." +msgstr[2] "Parolei ir jābūt vismaz %(min_length)d zīmēm garai." #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "Parole ir pārāk līdzīga %(verbose_name)s." msgid "Your password can't be too similar to your other personal information." -msgstr "" +msgstr "Tava parole nedrīkst būt pārāk līdzīga pārējiem personālajiem datiem." msgid "This password is too common." -msgstr "" +msgstr "Parole ir pārāk bieži lietota." msgid "Your password can't be a commonly used password." -msgstr "" +msgstr "Tava parole nedrīkst būt bieži lietota." msgid "This password is entirely numeric." -msgstr "" +msgstr "Parole sastāv tikai no cipariem." msgid "Your password can't be entirely numeric." -msgstr "" +msgstr "Parole nevar sastāvēt tikai no cipariem." #, python-format msgid "Password reset on %(site_name)s" -msgstr "" +msgstr "Paroles pārstatīšana %(site_name)s" msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Ievadi derīgu lietotāja vārdu. Šī vērtība var saturēt tikai Angļu burtus, " +"ciparus un @/./+/-/_ simbolus." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Ievadi derīgu lietotāja vārdu. Šī vērtība var saturēt tikai burtus, ciparus " +"un @/./+/-/_ simbolus." msgid "Logged out" msgstr "Atslēdzies" msgid "Password reset" -msgstr "" +msgstr "Paroles pārstādīšana" msgid "Password reset sent" -msgstr "" +msgstr "Paroles pārstatīšana nosūtīta" msgid "Enter new password" -msgstr "" +msgstr "Ievadiet jauno paroli" msgid "Password reset unsuccessful" -msgstr "" +msgstr "Paroles pārstatīšana nesekmīga" msgid "Password reset complete" -msgstr "" +msgstr "Paroles pārstatīšana pabeigta" msgid "Password change" -msgstr "" +msgstr "Paroles maiņa" msgid "Password change successful" -msgstr "" +msgstr "Paroles maiņa sekmīga" diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo index 6ffb802c3aa1..53ab2c391fa9 100644 Binary files a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po index bb4082e4a3cd..9bdf5040480a 100644 --- a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # dekomote , 2015 # Jannis Leidel , 2011 -# Vasil Vangelovski , 2016 +# Vasil Vangelovski , 2016-2017 # Vasil Vangelovski , 2013-2015 # Vasil Vangelovski , 2012 msgid "" @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-07-08 09:39+0000\n" +"PO-Revision-Date: 2017-04-05 09:16+0000\n" "Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" @@ -189,6 +189,7 @@ msgstr "корисничко име" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Задолжително. 150 или помалку знаци. Единствено букви, бројки и @/./+/-/_ ." msgid "A user with that username already exists." msgstr "Веќе постои корисник со тоа корисничко име." diff --git a/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo index 583cf0cbc66d..967b6f26d430 100644 Binary files a/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ne/LC_MESSAGES/django.po b/django/contrib/auth/locale/ne/LC_MESSAGES/django.po index fbf477339275..0cbd5d3e77a9 100644 --- a/django/contrib/auth/locale/ne/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ne/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-09-15 15:52+0000\n" +"PO-Revision-Date: 2016-12-03 04:45+0000\n" "Last-Translator: Sagar Chalise \n" "Language-Team: Nepali (http://www.transifex.com/django/django/language/ne/)\n" "MIME-Version: 1.0\n" @@ -109,7 +109,7 @@ msgid "hash" msgstr "ह्यास" msgid "variety" -msgstr "" +msgstr "विविध" msgid "version" msgstr "भर्जन" @@ -118,7 +118,7 @@ msgid "memory cost" msgstr "" msgid "time cost" -msgstr "" +msgstr "समय" msgid "parallelism" msgstr "" @@ -173,7 +173,7 @@ msgid "username" msgstr "प्रयोगकर्ता नाम" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" +msgstr "आवश्यक । बढिमा १५० वटा (अक्षर, अंक तथा '@/./+/-/_ ' मात्र)" msgid "A user with that username already exists." msgstr "त्यो प्रयोगकर्ता नाम भएका व्यक्ति पहिले नै छन् ।" @@ -217,8 +217,8 @@ msgid "" msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "पासवर्ड छोटो भयो । कम्तीमा %(min_length)d लम्बाई हुनु पर्दछ ।" +msgstr[1] "पासवर्ड छोटो भयो । कम्तीमा %(min_length)d लम्बाई हुनु पर्दछ ।" #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -228,7 +228,7 @@ msgstr[1] "" #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "%(verbose_name)s संग मिल्दो पासवर्ड भयो ।" msgid "Your password can't be too similar to your other personal information." msgstr "" @@ -240,10 +240,10 @@ msgid "Your password can't be a commonly used password." msgstr "" msgid "This password is entirely numeric." -msgstr "" +msgstr "यो पासवर्डमा अंक मात्र छ ।" msgid "Your password can't be entirely numeric." -msgstr "" +msgstr "पासवर्डमा अंक मात्र नराख्नु होस ।" #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo index 6b62f942cbd3..88cd2ae17951 100644 Binary files a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po index 6f5ccc5de4a7..4e9575e7a2ee 100644 --- a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # Bas Peschier , 2013 # Erik Romijn , 2013 # Erik Romijn , 2013 +# Evelijn Saaltink , 2016 # Harro van der Klauw , 2012 # Ilja Maas , 2015 # jaap3 , 2016 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 08:39+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-12 17:44+0000\n" +"Last-Translator: Evelijn Saaltink \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -125,19 +126,19 @@ msgid "hash" msgstr "hash" msgid "variety" -msgstr "" +msgstr "variatie" msgid "version" -msgstr "" +msgstr "versie" msgid "memory cost" -msgstr "" +msgstr "geheugenkosten" msgid "time cost" -msgstr "" +msgstr "tijdskosten" msgid "parallelism" -msgstr "" +msgstr "evenwijdigheid" msgid "work factor" msgstr "arbeidsfactor" @@ -194,6 +195,8 @@ msgstr "gebruikersnaam" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Vereist. 150 tekens of minder. Alleen letters, cijfers en @/,/+/-/_ tekens " +"zijn toegestaan." msgid "A user with that username already exists." msgstr "Een gebruiker met deze gebruikersnaam bestaat al." @@ -278,11 +281,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Geef een geldige gebruikersnaam op. Deze waarde mag alleen Engelse letters, " +"cijfers en de tekens @/./+/-/_ bevatten." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Geef een geldige gebruikersnaam op. Deze waarde mag alleen letters, cijfers " +"en de tekens @/./+/-/_ bevatten." msgid "Logged out" msgstr "Afmelden" diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo index f36bd7f2f443..fe79d8ddfc56 100644 Binary files a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po index a75066f22d95..8c03b15bd7d5 100644 --- a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po @@ -8,27 +8,29 @@ # m_aciek , 2014 # m_aciek , 2016 # m_aciek , 2014-2015 -# Michał Muszalski , 2016 +# muszalski , 2016 # p , 2014 # Mattia Procopio , 2014 # Roman Barczyński , 2012 +# Tomasz Kajtoch , 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: 2016-07-01 12:46+0000\n" -"Last-Translator: m_aciek \n" +"PO-Revision-Date: 2016-11-11 22:31+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Personal info" -msgstr "Dane osobowe" +msgstr "Informacje osobiste" msgid "Permissions" msgstr "Uprawnienia" @@ -38,7 +40,7 @@ msgstr "Ważne daty" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje." +msgstr "Obiekt %(name)s o kluczu podstawowym %(key)r nie istnieje." msgid "Password changed successfully." msgstr "Hasło zostało zmienione pomyślnie." @@ -54,7 +56,7 @@ msgid "password" msgstr "hasło" msgid "last login" -msgstr "ostatnio zalogowany" +msgstr "ostatnie logowanie" msgid "No password set." msgstr "Hasło nie zostało ustawione." @@ -65,7 +67,7 @@ msgstr "" "skrótu (hash)." msgid "The two password fields didn't match." -msgstr "Hasła się nie zgadzają." +msgstr "Hasła nie są zgodne." msgid "Password" msgstr "Hasło" @@ -82,7 +84,7 @@ msgid "" "\">this form." msgstr "" "Czyste hasła nie są zapisywane, więc nie ma możliwości, aby zobaczyć hasło " -"tego użytkownika, ale możesz zmienić hasło używając tego formularza." #, python-format @@ -90,8 +92,8 @@ msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" -"Wprowadź poprawną %(username)s oraz hasło. Uwaga: wielkość liter ma " -"znaczenie." +"Wprowadź poprawne wartości pól %(username)s oraz hasło. Uwaga: wielkość " +"liter ma znaczenie." msgid "This account is inactive." msgstr "To konto jest nieaktywne." @@ -169,7 +171,7 @@ msgid "groups" msgstr "grupy" msgid "superuser status" -msgstr "status administratora" +msgstr "status superużytkownika" msgid "" "Designates that this user has all permissions without explicitly assigning " @@ -226,7 +228,7 @@ msgstr "" "konto." msgid "date joined" -msgstr "data przyłączenia" +msgstr "data dołączenia" msgid "user" msgstr "użytkownik" @@ -247,6 +249,8 @@ msgstr[1] "" "To hasło jest za krótkie. Musi zawierać co najmniej %(min_length)d znaki." msgstr[2] "" "To hasło jest za krótkie. Musi zawierać co najmniej %(min_length)d znaków." +msgstr[3] "" +"To hasło jest za krótkie. Musi zawierać co najmniej %(min_length)d znaków." #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -254,6 +258,7 @@ msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "Twoje hasło musi zawierać co najmniej %(min_length)d znak." msgstr[1] "Twoje hasło musi zawierać co najmniej %(min_length)d znaki." msgstr[2] "Twoje hasło musi zawierać co najmniej %(min_length)d znaków." +msgstr[3] "Twoje hasło musi zawierać co najmniej %(min_length)d znaków." #, python-format msgid "The password is too similar to the %(verbose_name)s." @@ -309,7 +314,7 @@ msgid "Password reset unsuccessful" msgstr "Zresetowanie hasła nie powiodło się" msgid "Password reset complete" -msgstr "Procedura zresetowania hasła została zakonczona" +msgstr "Zresetowanie hasła powiodło się" msgid "Password change" msgstr "Zmiana hasła" diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo index 696ff7b0d7de..ab49d68be0b4 100644 Binary files a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po index 5eb713df54b0..b3acb9398544 100644 --- a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgid "" msgstr "" "Não são guardadas palavras-passe sem encriptação, portanto não é possível " "visualizar a password deste utilizador, mas poderá modificar a palavra-passe " -"através deste formulário." +"através deste formulário." #, python-format msgid "" diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo index c72c3b9c5863..e3047d9f5f07 100644 Binary files a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po index 1a4d2b42f743..83bfae5facd2 100644 --- a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # Jannis Leidel , 2011 # Jure Cuhalev , 2012 +# Primož Verdnik , 2017 # zejn , 2013,2016 # zejn , 2011-2013 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-09-27 19:32+0000\n" -"Last-Translator: zejn \n" +"PO-Revision-Date: 2017-03-02 08:21+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -66,7 +67,7 @@ msgid "Password confirmation" msgstr "Potrditev gesla" msgid "Enter the same password as before, for verification." -msgstr "Vnesite isto geslo kot prej, za preverjanje" +msgstr "Vnesite isto geslo kot prej, za preverjanje." msgid "" "Raw passwords are not stored, so there is no way to see this user's " @@ -74,7 +75,7 @@ msgid "" "\">this form." msgstr "" "Gesla se ne shranjujejo v berljivi obliki, zato gesla tega uporabnika ni " -"mogoče videti, lahko pa geslo spremenite s pomočjo tega obrazca." #, python-format @@ -166,7 +167,9 @@ msgstr "stanje skrbnika" msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "Uporabnik bo imel skrbniška dovoljenja." +msgstr "" +"Določi, da bo uporabnik imel vsa dovoljenja, ne da bi mu jih posebej " +"dodelili." msgid "" "The groups this user belongs to. A user will get all permissions granted to " diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo index 05636b139c5d..6bde9840c446 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 1f3024c9eb27..76a20fd8f4fd 100644 --- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po @@ -6,6 +6,7 @@ # Jannis Leidel , 2011 # Jonathan Lindén, 2015 # Jonathan Lindén, 2014 +# Mattias Hansson , 2016 # nip3o , 2014 # Samuel Linde , 2011 # Thomas Lundqvist , 2013,2016 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-05-21 08:39+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-22 19:24+0000\n" +"Last-Translator: Mattias Hansson \n" "Language-Team: Swedish (http://www.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -122,19 +123,19 @@ msgid "hash" msgstr "hash" msgid "variety" -msgstr "" +msgstr "variation" msgid "version" -msgstr "" +msgstr "version" msgid "memory cost" -msgstr "" +msgstr "minneskostnad" msgid "time cost" -msgstr "" +msgstr "tidskostnad" msgid "parallelism" -msgstr "" +msgstr "parallellism" msgid "work factor" msgstr "arbetsfaktor" @@ -191,6 +192,8 @@ msgstr "användarnamn" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Obligatoriskt. 150 tecken eller färre. Endast bokstäver, siffror och @/./+/-/" +"_." msgid "A user with that username already exists." msgstr "En användare med det användarnamnet finns redan." @@ -274,11 +277,15 @@ msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" +"Fyll i ett giltigt användarnamn. Detta värde får endast innehålla bokstäver " +"a-z, siffror och @/./+/-/_." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Fyll i ett giltigt användarnamn. Detta värde får endast innehålla bokstäver, " +"siffror och @/./+/-/_." msgid "Logged out" msgstr "Utloggad" 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 b2ddb582c8fc..08bd9dadfb9a 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 2c22c2b36b38..47c59180dd71 100644 --- a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # Jannis Leidel , 2011 # Kevin Sze , 2012 # Lele Long , 2011,2015 -# Liping Wang , 2016 +# Liping Wang , 2016-2017 # mozillazg , 2016 # pylemon , 2012-2013 # hizyn , 2016 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-09-20 02:01+0000\n" +"PO-Revision-Date: 2017-03-14 10:30+0000\n" "Last-Translator: Liping Wang \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" @@ -249,7 +249,7 @@ msgid "Your password can't be a commonly used password." msgstr "你的密码不能是大家都爱用的常见密码。" msgid "This password is entirely numeric." -msgstr "密码必须全部为数字。" +msgstr "这个密码全部是数字的。" msgid "Your password can't be entirely numeric." msgstr "你的密码不能全部为数字。" diff --git a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo index 386effc20c40..b8464b8f12f3 100644 Binary files a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po index 55f45f093c3e..0c9f1270c698 100644 --- a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Chen Chun-Chia , 2015 +# Claude Paroz , 2016 # ilay , 2012 # Jannis Leidel , 2011 # tcc , 2011 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-17 23:12+0200\n" -"PO-Revision-Date: 2016-08-30 09:12+0000\n" -"Last-Translator: Tzu-ping Chung \n" +"PO-Revision-Date: 2016-11-07 19:24+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -75,8 +76,8 @@ msgid "" "password, but you can change the password using this form." msgstr "" -"原始密碼並未儲存，因此無法存取此帳號的密碼，但你可以透過這個表單來變更密碼。" +"原始密碼並未儲存，因此無法存取此帳號的密碼，但你可以透過這個表單來變更密碼。" #, python-format msgid "" diff --git a/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html b/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html index b411298d746b..a2a12c6f108a 100644 --- a/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html +++ b/django/contrib/auth/templates/auth/widgets/read_only_password_hash.html @@ -1,3 +1,5 @@ + {% for entry in summary %} -{{ entry.label }}{% if entry.value %}: {{ entry.value }}{% endif %} +{{ entry.label }}{% if entry.value %}: {{ entry.value }}{% endif %} {% endfor %} +
diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py index be156286c654..aa3ca10dfb2f 100644 --- a/django/contrib/auth/views.py +++ b/django/contrib/auth/views.py @@ -90,7 +90,11 @@ def dispatch(self, request, *args, **kwargs): return super(LoginView, self).dispatch(request, *args, **kwargs) def get_success_url(self): - """Ensure the user-originating redirection URL is safe.""" + url = self.get_redirect_url() + return url or resolve_url(settings.LOGIN_REDIRECT_URL) + + def get_redirect_url(self): + """Return the user-originating redirect URL if it's safe.""" redirect_to = self.request.POST.get( self.redirect_field_name, self.request.GET.get(self.redirect_field_name, '') @@ -100,13 +104,16 @@ def get_success_url(self): allowed_hosts=self.get_success_url_allowed_hosts(), require_https=self.request.is_secure(), ) - if not url_is_safe: - return resolve_url(settings.LOGIN_REDIRECT_URL) - return redirect_to + return redirect_to if url_is_safe else '' def get_form_class(self): return self.authentication_form or self.form_class + def get_form_kwargs(self): + kwargs = super(LoginView, self).get_form_kwargs() + kwargs['request'] = self.request + return kwargs + def form_valid(self, form): """Security check complete. Log the user in.""" auth_login(self.request, form.get_user()) @@ -116,7 +123,7 @@ def get_context_data(self, **kwargs): context = super(LoginView, self).get_context_data(**kwargs) current_site = get_current_site(self.request) context.update({ - self.redirect_field_name: self.get_success_url(), + self.redirect_field_name: self.get_redirect_url(), 'site': current_site, 'site_name': current_site.name, }) @@ -126,12 +133,21 @@ def get_context_data(self, **kwargs): @deprecate_current_app -def login(request, *args, **kwargs): +def login(request, template_name='registration/login.html', + redirect_field_name=REDIRECT_FIELD_NAME, + authentication_form=AuthenticationForm, + extra_context=None, redirect_authenticated_user=False): warnings.warn( 'The login() view is superseded by the class-based LoginView().', RemovedInDjango21Warning, stacklevel=2 ) - return LoginView.as_view(**kwargs)(request, *args, **kwargs) + return LoginView.as_view( + template_name=template_name, + redirect_field_name=redirect_field_name, + form_class=authentication_form, + extra_context=extra_context, + redirect_authenticated_user=redirect_authenticated_user, + )(request) class LogoutView(SuccessURLAllowedHostsMixin, TemplateView): @@ -152,6 +168,10 @@ def dispatch(self, request, *args, **kwargs): return HttpResponseRedirect(next_page) return super(LogoutView, self).dispatch(request, *args, **kwargs) + def post(self, request, *args, **kwargs): + """Logout may be done via POST.""" + return self.get(request, *args, **kwargs) + def get_next_page(self): if self.next_page is not None: next_page = resolve_url(self.next_page) @@ -191,12 +211,20 @@ def get_context_data(self, **kwargs): @deprecate_current_app -def logout(request, *args, **kwargs): +def logout(request, next_page=None, + template_name='registration/logged_out.html', + redirect_field_name=REDIRECT_FIELD_NAME, + extra_context=None): warnings.warn( 'The logout() view is superseded by the class-based LogoutView().', RemovedInDjango21Warning, stacklevel=2 ) - return LogoutView.as_view(**kwargs)(request, *args, **kwargs) + return LogoutView.as_view( + next_page=next_page, + template_name=template_name, + redirect_field_name=redirect_field_name, + extra_context=extra_context, + )(request) _sentinel = object() @@ -437,6 +465,7 @@ class PasswordResetDoneView(PasswordContextMixin, TemplateView): class PasswordResetConfirmView(PasswordContextMixin, FormView): form_class = SetPasswordForm post_reset_login = False + post_reset_login_backend = None success_url = reverse_lazy('password_reset_complete') template_name = 'registration/password_reset_confirm.html' title = _('Enter new password') @@ -487,9 +516,9 @@ def get_form_kwargs(self): def form_valid(self, form): user = form.save() - if self.post_reset_login: - auth_login(self.request, user) del self.request.session[INTERNAL_RESET_SESSION_TOKEN] + if self.post_reset_login: + auth_login(self.request, user, self.post_reset_login_backend) return super(PasswordResetConfirmView, self).form_valid(form) def get_context_data(self, **kwargs): diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py index a273cf034798..11afe4df3389 100644 --- a/django/contrib/contenttypes/fields.py +++ b/django/contrib/contenttypes/fields.py @@ -230,9 +230,24 @@ def __get__(self, instance, cls=None): except AttributeError: rel_obj = None else: - if rel_obj and (ct_id != self.get_content_type(obj=rel_obj, using=instance._state.db).id or - rel_obj._meta.pk.to_python(pk_val) != rel_obj._get_pk_val()): - rel_obj = None + if rel_obj: + if ct_id != self.get_content_type(obj=rel_obj, using=instance._state.db).id: + rel_obj = None + else: + pk = rel_obj._meta.pk + # If the primary key is a remote field, use the referenced + # field's to_python(). + to_python_field = pk + # Out of an abundance of caution, avoid infinite loops. + seen = {to_python_field} + while to_python_field.remote_field: + to_python_field = to_python_field.target_field + if to_python_field in seen: + break + seen.add(to_python_field) + pk_to_python = to_python_field.to_python + if pk_to_python(pk_val) != rel_obj._get_pk_val(): + rel_obj = None if rel_obj is not None: return rel_obj @@ -368,7 +383,7 @@ def _get_path_info_with_parent(self): # generating a join to the parent model, then generating joins to the # child models. path = [] - opts = self.remote_field.model._meta + opts = self.remote_field.model._meta.concrete_model._meta parent_opts = opts.get_field(self.object_id_field_name).model._meta target = parent_opts.pk path.append(PathInfo(self.model._meta, parent_opts, (target,), self.remote_field, True, False)) diff --git a/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.mo index 32f6e8fd6f68..2bb73204b19e 100644 Binary files a/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.po index fd35644dcd42..a35402d94b89 100644 --- a/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/es_VE/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 +# Yoel Acevedo, 2017 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: 2014-10-05 20:12+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/" -"django/language/es_VE/)\n" +"PO-Revision-Date: 2017-02-16 14:03+0000\n" +"Last-Translator: Eduardo \n" +"Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" +"language/es_VE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,25 +19,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Content Types" -msgstr "" +msgstr "Tipos de contenido" msgid "python model class name" -msgstr "" +msgstr "nombre de la clase del modelo de python" msgid "content type" -msgstr "" +msgstr "tipo de contenido" msgid "content types" -msgstr "" +msgstr "tipos de contenido" #, python-format msgid "Content type %(ct_id)s object has no associated model" 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 "" +msgstr "El objeto de tipo de contenido %(ct_id)s objeto %(obj_id)s no existe" #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "" +msgstr "El objeto %(ct_name)s no tiene un método get_absolute_url()" diff --git a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo index 31e256206de1..2b1322a57b19 100644 Binary files a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po index 1ab2baa58cb7..a1152909a576 100644 --- a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Aitzol Naberan , 2012 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 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: 2014-10-05 20:10+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 12:42+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -18,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Content Types" -msgstr "" +msgstr "Eduki Motak" msgid "python model class name" msgstr "python model class izena" @@ -39,4 +40,4 @@ msgstr "%(ct_id)s eduki motako %(obj_id)s objekturik ez da existitzen" #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "%(ct_name)s objektuek ez dauketa get_absolute_url() metodorik" +msgstr "%(ct_name)s objektuek ez daukate get_absolute_url() metodorik" diff --git a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo index 51233560b7c7..526f621d1223 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 eca81e3eafba..9d8ddf7f2703 100644 --- a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po @@ -4,13 +4,14 @@ # Jannis Leidel , 2011 # M Asep Indrayana , 2015 # rodin , 2011-2012 +# rodin , 2016 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: 2015-12-15 22:45+0000\n" -"Last-Translator: M Asep Indrayana \n" +"PO-Revision-Date: 2016-11-01 13:48+0000\n" +"Last-Translator: rodin \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Content Types" -msgstr "Tipe Konten" +msgstr "Jenis Konten" msgid "python model class name" msgstr "nama kelas model python" diff --git a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo index d1aafe646d07..7905680d501b 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 a807c9e57908..443b7f26805b 100644 --- a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Hafsteinn Einarsson , 2012 # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-07 16:50+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" msgid "Content Types" -msgstr "" +msgstr "Efnistög" msgid "python model class name" msgstr "python eininga klasa nafn" diff --git a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo index d7dc815149b5..9629e446a678 100644 Binary files a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po index 2aec50752c35..1a6cc4023edb 100644 --- a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-13 07:25+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "2);\n" msgid "Content Types" -msgstr "" +msgstr "Satura tipi" msgid "python model class name" msgstr "python modeļa klases nosaukums" @@ -32,12 +33,12 @@ msgstr "satura tipi" #, python-format msgid "Content type %(ct_id)s object has no associated model" -msgstr "" +msgstr "Satura tipa %(ct_id)s objektam nav asociētā modeļa" #, python-format msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "" +msgstr "Satura tipa %(ct_id)s objekts %(obj_id)s neeksistē" #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "" +msgstr "%(ct_name)s objektam nav get_absolute_url() metode" diff --git a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo index 096db855b2b1..6724f262efd2 100644 Binary files a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po index 9bb76a742c92..7d4996ff17a2 100644 --- a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po @@ -4,26 +4,28 @@ # sidewinder , 2014 # angularcircle, 2012 # Jannis Leidel , 2011 +# Tomasz Kajtoch , 2016 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: 2015-10-12 19:05+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-11 17:52+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Content Types" -msgstr "Typy zawartości" +msgstr "Typy Zawartości" msgid "python model class name" -msgstr "nazwa pythonowa modelu klasy" +msgstr "Nazwa klasy modelu pythona" msgid "content type" msgstr "typ zawartości" @@ -41,4 +43,4 @@ msgstr "Obiekt %(obj_id)s typu zawartości %(ct_id)s nie istnieje" #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Obiekty %(ct_name)s nie posiadają metody o nazwie get_absolute_url()" +msgstr "Obiekty %(ct_name)s nie posiadają metody get_absolute_url()" diff --git a/django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py b/django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py index 2a3b23b0d05f..e1e00bb2e23e 100644 --- a/django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py +++ b/django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py @@ -52,7 +52,7 @@ def handle(self, **options): len(objs), obj_type._meta.label, )) - content_type_display = '\n'.join(ct_info) + content_type_display = '\n'.join(ct_info) self.stdout.write("""Some content types in your database are stale and can be deleted. Any objects that depend on these content types will also be deleted. The content types and dependent objects that would be deleted are: diff --git a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo index 574e9ea1abc1..973cf7bef10a 100644 Binary files a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po index c8fd55af451f..cd6fdd9e85fc 100644 --- a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # André Hagenbruch, 2012 -# Jannis Leidel , 2011,2013-2016 +# Jannis Leidel , 2011,2013-2017 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: 2016-07-26 11:56+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 10:44+0000\n" +"Last-Translator: Markus Holtermann \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,7 +29,7 @@ msgstr "Adresse (URL)" msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -"Beispiel: '/about/contact/'. Wichtig: Am Anfang und Ende muss ein / stehen." +"Beispiel: „/about/contact/“. Wichtig: Am Anfang und Ende muss ein / stehen." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " @@ -65,8 +65,8 @@ msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gesetzt ist, " -"wird standardmäßig 'flatpages/default.html' benutzt." +"Beispiel: „flatpages/contact_page.html“. Wenn dieses Feld nicht gesetzt ist, " +"wird standardmäßig „flatpages/default.html“ benutzt." msgid "registration required" msgstr "Registrierung erforderlich" diff --git a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo index 90baa0d4f280..cccbd1fe2569 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 02d473ac45a4..293a8f2ca156 100644 --- a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Baptiste Darthenay , 2011-2012 -# Baptiste Darthenay , 2014-2015 +# Baptiste Darthenay , 2014-2015,2017 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: 2015-11-20 13:36+0000\n" +"PO-Revision-Date: 2017-05-22 21:47+0000\n" "Last-Translator: Baptiste Darthenay \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" @@ -22,7 +22,7 @@ msgid "Advanced options" msgstr "Altnivelaj elektoj" msgid "Flat Pages" -msgstr "Plataj paĝoj" +msgstr "Simplaj paĝoj" msgid "URL" msgstr "URL" @@ -47,7 +47,7 @@ msgstr "La streka karaktero \"/\" ne ĉeestas en fino de ĉeno." #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr "Platpaĝo kun URL %(url)s jam ekzistas for la retejo %(site)s" +msgstr "Simpla paĝo kun URL %(url)s jam ekzistas por la retejo %(site)s" msgid "title" msgstr "titolo" @@ -59,14 +59,14 @@ msgid "enable comments" msgstr "ebligu rimarkoj" msgid "template name" -msgstr "nomo de ŝablono" +msgstr "ŝablono nomo" msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Ekzemplo: 'platpaĝoj/kontakto_paĝo.html'. Se ĉi tiu ne provizas, la sistemo " -"uzos 'platpaĝoj/defaŭlto.html'." +"Ekzemplo: 'flatpages/contact_page.html'. Se ĉi tiu ne provizas, la sistemo " +"uzos 'flatpages/default.html'." msgid "registration required" msgstr "registrado postulita" @@ -79,7 +79,7 @@ msgid "sites" msgstr "retejoj" msgid "flat page" -msgstr "plata paĝo" +msgstr "simpla paĝo" msgid "flat pages" -msgstr "plataj paĝoj" +msgstr "simplaj paĝoj" diff --git a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo index 0ebdc9f5fe73..0935518f3601 100644 Binary files a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po index 5d87685f9485..1bf267cd2cc9 100644 --- a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Aitzol Naberan , 2011-2012 +# Eneko Illarramendi , 2017 # Jannis Leidel , 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: 2015-10-10 09:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 14:06+0000\n" +"Last-Translator: Eneko Illarramendi \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,7 +22,7 @@ msgid "Advanced options" msgstr "Aukera aurreratuak" msgid "Flat Pages" -msgstr "" +msgstr "Flatpage-ak" msgid "URL" msgstr "URL" @@ -36,7 +37,7 @@ msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "" -"Eremu honetan soilik hizki, zenbaki, puntu, azpimarra, gidoi, / edo ~ egon " +"Eremu honetan soilik hizki, zenbaki, puntu, azpimarra, marra, / edo ~ egon " "daitezke." msgid "URL is missing a leading slash." @@ -65,7 +66,7 @@ msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Adibidez: 'flatpages/contact_page.html'. Hau ematen ez bada, sistemak " +"Adibidez: 'flatpages/contact_page.html'. Hau zehazten ez bada, sistemak " "'flatpages/default.html' erabiliko du." msgid "registration required" @@ -77,7 +78,7 @@ msgstr "" "orria." msgid "sites" -msgstr "" +msgstr "webguneak" msgid "flat page" msgstr "flat page" diff --git a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo index d6171b9886a6..354c4ed6c5a2 100644 Binary files a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po index 3b064cedb639..510d3c1d2d77 100644 --- a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016 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: 2015-10-10 09:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-07 17:22+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -22,7 +23,7 @@ msgid "Advanced options" msgstr "Ítarlegar stillingar" msgid "Flat Pages" -msgstr "" +msgstr "Flatskrár" msgid "URL" msgstr "Veffang" @@ -74,7 +75,7 @@ msgid "If this is checked, only logged-in users will be able to view the page." msgstr "Ef þetta er valið geta eingöngu innskráðir notendur séð síðuna." msgid "sites" -msgstr "" +msgstr "vefir" msgid "flat page" msgstr "flatskrá" diff --git a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo index 68ee7bad2b31..74b3919c97c2 100644 Binary files a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po index 6fc41587552d..a73c7f842018 100644 --- a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Leo Trubach , 2017 # yun_man_ger , 2011 # Zhazira , 2011 msgid "" @@ -8,8 +9,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2015-10-10 09:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-01-14 17:05+0000\n" +"Last-Translator: Leo Trubach \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgid "Advanced options" msgstr "Толық опциялар" msgid "Flat Pages" -msgstr "" +msgstr "Жай беттер" msgid "URL" msgstr "URL" @@ -39,14 +40,14 @@ msgstr "" "сызықшалардан, слэштерден немесе тильдалардан құралуы тиіс. " msgid "URL is missing a leading slash." -msgstr "" +msgstr "URLдың басында бөлшек белгісі жоқ" msgid "URL is missing a trailing slash." -msgstr "" +msgstr "URLдың аяғында бөлшек белгісі жоқ" #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr "" +msgstr "%(url)s url'ымен жайбет %(site)s сайтта бұрыннан бар" msgid "title" msgstr "атау" @@ -75,7 +76,7 @@ msgstr "" "Бұл белгіленген жағдайда, тек енген қолданушылар ғана бетті көре алады." msgid "sites" -msgstr "" +msgstr "сайттар" msgid "flat page" msgstr "Жай бет" diff --git a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo index 3d969d0f3704..e7fd2065f087 100644 Binary files a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po index eaed535b867c..9d7ff0dfdae9 100644 --- a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2015-10-10 09:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-13 07:03+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -22,7 +23,7 @@ msgid "Advanced options" msgstr "Papildus opcijas" msgid "Flat Pages" -msgstr "" +msgstr "Vienkāršās lapas" msgid "URL" msgstr "URL" @@ -37,16 +38,18 @@ msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "" +"Šai vērtība ir jāsatur tikai burtus, ciparus, punktus, pasvītrojumi, " +"domuzīmes, slīpsvītras vai tildes simboli." msgid "URL is missing a leading slash." -msgstr "" +msgstr "URL trūkst sākuma slīpsvītra." msgid "URL is missing a trailing slash." -msgstr "" +msgstr "URL trūkst beigu slīpsvītra." #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr "" +msgstr "Vienkāršā lapa ar url %(url)s jau eksistē vietnei %(site)s" msgid "title" msgstr "virsraksts" @@ -75,7 +78,7 @@ msgstr "" "Ja šis ir atzīmēts, tikai pieslēgušies lietotāji, varēs piekļūt šai lapu." msgid "sites" -msgstr "" +msgstr "vietnes" msgid "flat page" msgstr "vienkārša lapa" diff --git a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo index 2d1e4454f1e9..da6f2a4b85de 100644 Binary files a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po index 9d3db15d3f64..386da6dc3365 100644 --- a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po @@ -5,20 +5,22 @@ # angularcircle, 2012 # Jannis Leidel , 2011 # Janusz Harkot , 2015 +# Tomasz Kajtoch , 2016 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: 2016-01-31 14:22+0000\n" -"Last-Translator: Janusz Harkot \n" +"PO-Revision-Date: 2016-11-11 17:50+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Advanced options" msgstr "Opcje zaawansowane" @@ -32,26 +34,26 @@ msgstr "URL" msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -"Przykład: '/about/contact/'. Upewnij się że wpisałeś otwierający i " -"zamykający ukośnik." +"Przykład: '/about/contact/'. Upewnij się że wpisałeś początkowy i końcowy " +"ukośnik." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "" -"To pole może zawierać jedynie litery, cyfry, kropki, podkreślenia, myślniki " -"i ukośniki lub tyldy." +"To pole może zawierać jedynie litery, cyfry, kropki, podkreślenia, myślniki, " +"ukośniki i tyldy." msgid "URL is missing a leading slash." -msgstr "Na początku adresu URL brakuje ukośnika" +msgstr "W URL-u brakuje początkowego ukośnika." msgid "URL is missing a trailing slash." -msgstr "Na końcu adresu URL brakuje ukośnika" +msgstr "W URL-u brakuje końcowego ukośnika." #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" msgstr "" -"Strona statyczna o adresie %(url)s została już utworzona dla domeny %(site)s" +"Strona statyczna o adresie %(url)s została już utworzona dla strony %(site)s" msgid "title" msgstr "tytuł" diff --git a/django/contrib/gis/admin/widgets.py b/django/contrib/gis/admin/widgets.py index 014b3ad81891..2d20ea2132fe 100644 --- a/django/contrib/gis/admin/widgets.py +++ b/django/contrib/gis/admin/widgets.py @@ -15,7 +15,7 @@ class OpenLayersWidget(Textarea): """ Renders an OpenLayers map using the WKT of the geometry. """ - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): # Update the template parameters with any attributes passed in. if attrs: self.params.update(attrs) diff --git a/django/contrib/gis/db/backends/base/features.py b/django/contrib/gis/db/backends/base/features.py index 166495a6cc1d..e6b548a8a575 100644 --- a/django/contrib/gis/db/backends/base/features.py +++ b/django/contrib/gis/db/backends/base/features.py @@ -18,7 +18,7 @@ class BaseSpatialFeatures(object): # Does the backend support storing 3D geometries? supports_3d_storage = False # Reference implementation of 3D functions is: - # http://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions + # https://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions supports_3d_functions = False # Does the database support SRID transform operations? supports_transform = True diff --git a/django/contrib/gis/db/backends/mysql/base.py b/django/contrib/gis/db/backends/mysql/base.py index 9cf61e40d2fc..fccea5919df5 100644 --- a/django/contrib/gis/db/backends/mysql/base.py +++ b/django/contrib/gis/db/backends/mysql/base.py @@ -1,5 +1,6 @@ -from django.db.backends.mysql.base import \ - DatabaseWrapper as MySQLDatabaseWrapper +from django.db.backends.mysql.base import ( + DatabaseWrapper as MySQLDatabaseWrapper, +) from .features import DatabaseFeatures from .introspection import MySQLIntrospection diff --git a/django/contrib/gis/db/backends/mysql/features.py b/django/contrib/gis/db/backends/mysql/features.py index 05affeecb784..9d4f8982d55a 100644 --- a/django/contrib/gis/db/backends/mysql/features.py +++ b/django/contrib/gis/db/backends/mysql/features.py @@ -1,6 +1,7 @@ from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures -from django.db.backends.mysql.features import \ - DatabaseFeatures as MySQLDatabaseFeatures +from django.db.backends.mysql.features import ( + DatabaseFeatures as MySQLDatabaseFeatures, +) class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures): diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py index 7d8adbf1585e..a86370121dfa 100644 --- a/django/contrib/gis/db/backends/mysql/operations.py +++ b/django/contrib/gis/db/backends/mysql/operations.py @@ -1,6 +1,7 @@ from django.contrib.gis.db.backends.base.adapter import WKTAdapter -from django.contrib.gis.db.backends.base.operations import \ - BaseSpatialOperations +from django.contrib.gis.db.backends.base.operations import ( + BaseSpatialOperations, +) from django.contrib.gis.db.backends.utils import SpatialOperator from django.contrib.gis.db.models import GeometryField, aggregates from django.db.backends.mysql.operations import DatabaseOperations diff --git a/django/contrib/gis/db/backends/oracle/base.py b/django/contrib/gis/db/backends/oracle/base.py index a4f6684f6df0..0093ef83bba8 100644 --- a/django/contrib/gis/db/backends/oracle/base.py +++ b/django/contrib/gis/db/backends/oracle/base.py @@ -1,5 +1,6 @@ -from django.db.backends.oracle.base import \ - DatabaseWrapper as OracleDatabaseWrapper +from django.db.backends.oracle.base import ( + DatabaseWrapper as OracleDatabaseWrapper, +) from .features import DatabaseFeatures from .introspection import OracleIntrospection diff --git a/django/contrib/gis/db/backends/oracle/features.py b/django/contrib/gis/db/backends/oracle/features.py index 996fe8e54b50..ece45b262318 100644 --- a/django/contrib/gis/db/backends/oracle/features.py +++ b/django/contrib/gis/db/backends/oracle/features.py @@ -1,6 +1,7 @@ from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures -from django.db.backends.oracle.features import \ - DatabaseFeatures as OracleDatabaseFeatures +from django.db.backends.oracle.features import ( + DatabaseFeatures as OracleDatabaseFeatures, +) class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures): diff --git a/django/contrib/gis/db/backends/oracle/introspection.py b/django/contrib/gis/db/backends/oracle/introspection.py index 764ce7d24314..555853731d37 100644 --- a/django/contrib/gis/db/backends/oracle/introspection.py +++ b/django/contrib/gis/db/backends/oracle/introspection.py @@ -40,8 +40,8 @@ def get_geometry_type(self, table_name, geo_col): dim, srid = row if srid != 4326: field_params['srid'] = srid - # Length of object array ( SDO_DIM_ARRAY ) is number of dimensions. - dim = len(dim) + # Size of object array (SDO_DIM_ARRAY) is number of dimensions. + dim = dim.size() if dim != 2: field_params['dim'] = dim finally: diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index 013ffa74f697..758581a1aad1 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -9,8 +9,9 @@ """ import re -from django.contrib.gis.db.backends.base.operations import \ - BaseSpatialOperations +from django.contrib.gis.db.backends.base.operations import ( + BaseSpatialOperations, +) from django.contrib.gis.db.backends.oracle.adapter import OracleSpatialAdapter from django.contrib.gis.db.backends.utils import SpatialOperator from django.contrib.gis.db.models import aggregates diff --git a/django/contrib/gis/db/backends/postgis/base.py b/django/contrib/gis/db/backends/postgis/base.py index 203e3ba075eb..afcf8646800e 100644 --- a/django/contrib/gis/db/backends/postgis/base.py +++ b/django/contrib/gis/db/backends/postgis/base.py @@ -1,6 +1,7 @@ from django.db.backends.base.base import NO_DB_ALIAS -from django.db.backends.postgresql.base import \ - DatabaseWrapper as Psycopg2DatabaseWrapper +from django.db.backends.postgresql.base import ( + DatabaseWrapper as Psycopg2DatabaseWrapper, +) from .features import DatabaseFeatures from .introspection import PostGISIntrospection diff --git a/django/contrib/gis/db/backends/postgis/features.py b/django/contrib/gis/db/backends/postgis/features.py index 2d613efe6e65..60158ca5c30b 100644 --- a/django/contrib/gis/db/backends/postgis/features.py +++ b/django/contrib/gis/db/backends/postgis/features.py @@ -1,6 +1,7 @@ from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures -from django.db.backends.postgresql.features import \ - DatabaseFeatures as Psycopg2DatabaseFeatures +from django.db.backends.postgresql.features import ( + DatabaseFeatures as Psycopg2DatabaseFeatures, +) class DatabaseFeatures(BaseSpatialFeatures, Psycopg2DatabaseFeatures): diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index ae0821694a68..5cc90397685d 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -1,8 +1,9 @@ import re from django.conf import settings -from django.contrib.gis.db.backends.base.operations import \ - BaseSpatialOperations +from django.contrib.gis.db.backends.base.operations import ( + BaseSpatialOperations, +) from django.contrib.gis.db.backends.utils import SpatialOperator from django.contrib.gis.gdal import GDALRaster from django.contrib.gis.measure import Distance diff --git a/django/contrib/gis/db/backends/spatialite/features.py b/django/contrib/gis/db/backends/spatialite/features.py index 79517e8190f4..8a08b7fef141 100644 --- a/django/contrib/gis/db/backends/spatialite/features.py +++ b/django/contrib/gis/db/backends/spatialite/features.py @@ -1,6 +1,7 @@ from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures -from django.db.backends.sqlite3.features import \ - DatabaseFeatures as SQLiteDatabaseFeatures +from django.db.backends.sqlite3.features import ( + DatabaseFeatures as SQLiteDatabaseFeatures, +) from django.utils.functional import cached_property diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py index cc46b4b91fbd..31cf6242872c 100644 --- a/django/contrib/gis/db/backends/spatialite/operations.py +++ b/django/contrib/gis/db/backends/spatialite/operations.py @@ -1,13 +1,14 @@ """ SQL functions reference lists: -https://web.archive.org/web/20130407175746/http://www.gaia-gis.it/gaia-sins/spatialite-sql-4.0.0.html -http://www.gaia-gis.it/gaia-sins/spatialite-sql-4.2.1.html +https://web.archive.org/web/20130407175746/https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.0.0.html +https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.2.1.html """ import re import sys -from django.contrib.gis.db.backends.base.operations import \ - BaseSpatialOperations +from django.contrib.gis.db.backends.base.operations import ( + BaseSpatialOperations, +) from django.contrib.gis.db.backends.spatialite.adapter import SpatiaLiteAdapter from django.contrib.gis.db.backends.utils import SpatialOperator from django.contrib.gis.db.models import aggregates diff --git a/django/contrib/gis/db/models/aggregates.py b/django/contrib/gis/db/models/aggregates.py index 416481f9cac9..0e077550a2e1 100644 --- a/django/contrib/gis/db/models/aggregates.py +++ b/django/contrib/gis/db/models/aggregates.py @@ -1,4 +1,5 @@ from django.contrib.gis.db.models.fields import ExtentField +from django.db.models import Value from django.db.models.aggregates import Aggregate __all__ = ['Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union'] @@ -16,11 +17,14 @@ def as_sql(self, compiler, connection): return super(GeoAggregate, self).as_sql(compiler, connection) def as_oracle(self, compiler, connection): - if not hasattr(self, 'tolerance'): - self.tolerance = 0.05 - self.extra['tolerance'] = self.tolerance if not self.is_extent: - self.template = '%(function)s(SDOAGGRTYPE(%(expressions)s,%(tolerance)s))' + tolerance = self.extra.get('tolerance') or getattr(self, 'tolerance', 0.05) + clone = self.copy() + expressions = clone.get_source_expressions() + expressions.append(Value(tolerance)) + clone.set_source_expressions(expressions) + clone.template = '%(function)s(SDOAGGRTYPE(%(expressions)s))' + return clone.as_sql(compiler, connection) return self.as_sql(compiler, connection) def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False): diff --git a/django/contrib/gis/db/models/functions.py b/django/contrib/gis/db/models/functions.py index 8a4d54aac100..ef9e11818944 100644 --- a/django/contrib/gis/db/models/functions.py +++ b/django/contrib/gis/db/models/functions.py @@ -117,7 +117,11 @@ class OracleToleranceMixin(object): tolerance = 0.05 def as_oracle(self, compiler, connection): - tol = self.extra.get('tolerance', self.tolerance) + tol = self._handle_param( + self.extra.get('tolerance', self.tolerance), + 'tolerance', + NUMERIC_TYPES, + ) self.template = "%%(function)s(%%(expressions)s, %s)" % tol return super(OracleToleranceMixin, self).as_sql(compiler, connection) @@ -196,8 +200,9 @@ def as_oracle(self, compiler, connection, **extra_context): class AsKML(AsGML): def as_sqlite(self, compiler, connection): # No version parameter - self.source_expressions.pop(0) - return super(AsKML, self).as_sql(compiler, connection) + clone = self.copy() + clone.set_source_expressions(self.get_source_expressions()[1:]) + return clone.as_sql(compiler, connection) class AsSVG(GeoFunc): diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py index e331e1844db3..ea410d2e8a14 100644 --- a/django/contrib/gis/forms/widgets.py +++ b/django/contrib/gis/forms/widgets.py @@ -42,7 +42,8 @@ def deserialize(self, value): logger.error("Error creating geometry from value '%s' (%s)", value, err) return None - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): + context = super(BaseGeometryWidget, self).get_context(name, value, attrs) # If a string reaches here (via a validation error on another # field) then just reconstruct the Geometry. if value and isinstance(value, six.string_types): @@ -64,20 +65,22 @@ def get_context(self, name, value, attrs=None): if attrs is None: attrs = {} - context = self.build_attrs(self.attrs, dict( - name=name, - module='geodjango_%s' % name.replace('-', '_'), # JS-safe - serialized=self.serialize(value), - geom_type=gdal.OGRGeomType(self.attrs['geom_type']), - STATIC_URL=settings.STATIC_URL, - LANGUAGE_BIDI=translation.get_language_bidi(), - **attrs - )) + build_attrs_kwargs = { + 'name': name, + 'module': 'geodjango_%s' % name.replace('-', '_'), # JS-safe + 'serialized': self.serialize(value), + 'geom_type': gdal.OGRGeomType(self.attrs['geom_type']), + 'STATIC_URL': settings.STATIC_URL, + 'LANGUAGE_BIDI': translation.get_language_bidi(), + } + build_attrs_kwargs.update(attrs) + context.update(self.build_attrs(self.attrs, build_attrs_kwargs)) return context class OpenLayersWidget(BaseGeometryWidget): template_name = 'gis/openlayers.html' + map_srid = 3857 class Media: css = { @@ -102,7 +105,6 @@ class OSMWidget(OpenLayersWidget): template_name = 'gis/openlayers-osm.html' default_lon = 5 default_lat = 47 - map_srid = 3857 def __init__(self, attrs=None): super(OSMWidget, self).__init__() diff --git a/django/contrib/gis/gdal/__init__.py b/django/contrib/gis/gdal/__init__.py index 86ce62a06800..4c217dd5b319 100644 --- a/django/contrib/gis/gdal/__init__.py +++ b/django/contrib/gis/gdal/__init__.py @@ -25,32 +25,23 @@ by setting `GDAL_LIBRARY_PATH` in your settings with the path to the GDAL C library on your system. """ +from django.contrib.gis.gdal.datasource import DataSource +from django.contrib.gis.gdal.driver import Driver from django.contrib.gis.gdal.envelope import Envelope -from django.contrib.gis.gdal.error import ( # NOQA +from django.contrib.gis.gdal.error import ( GDALException, OGRException, OGRIndexError, SRSException, check_err, ) -from django.contrib.gis.gdal.geomtype import OGRGeomType # NOQA - -__all__ = [ - 'check_err', 'Envelope', 'GDALException', 'OGRException', 'OGRIndexError', - 'SRSException', 'OGRGeomType', 'HAS_GDAL', -] - -# Attempting to import objects that depend on the GDAL library. The -# HAS_GDAL flag will be set to True if the library is present on -# the system. -try: - from django.contrib.gis.gdal.driver import Driver # NOQA - from django.contrib.gis.gdal.datasource import DataSource # NOQA - from django.contrib.gis.gdal.libgdal import gdal_version, gdal_full_version, GDAL_VERSION # NOQA - from django.contrib.gis.gdal.raster.source import GDALRaster # NOQA - from django.contrib.gis.gdal.srs import SpatialReference, CoordTransform # NOQA - from django.contrib.gis.gdal.geometries import OGRGeometry # NOQA - HAS_GDAL = True - __all__ += [ - 'Driver', 'DataSource', 'gdal_version', 'gdal_full_version', - 'GDALRaster', 'GDAL_VERSION', 'SpatialReference', 'CoordTransform', - 'OGRGeometry', - ] -except GDALException: - HAS_GDAL = False +from django.contrib.gis.gdal.geometries import OGRGeometry +from django.contrib.gis.gdal.geomtype import OGRGeomType +from django.contrib.gis.gdal.libgdal import ( + GDAL_VERSION, gdal_full_version, gdal_version, +) +from django.contrib.gis.gdal.raster.source import GDALRaster +from django.contrib.gis.gdal.srs import CoordTransform, SpatialReference + +__all__ = ( + 'Driver', 'DataSource', 'CoordTransform', 'Envelope', 'GDALException', + 'GDALRaster', 'GDAL_VERSION', 'OGRException', 'OGRGeometry', 'OGRGeomType', + 'OGRIndexError', 'SpatialReference', 'SRSException', + 'check_err', 'gdal_version', 'gdal_full_version', +) diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py index 64cac5baa072..0de78d8c5877 100644 --- a/django/contrib/gis/gdal/envelope.py +++ b/django/contrib/gis/gdal/envelope.py @@ -126,7 +126,7 @@ def expand_to_include(self, *args): raise TypeError('Incorrect type of argument: %s' % str(type(args[0]))) elif len(args) == 2: # An x and an y parameter were passed in - return self.expand_to_include((args[0], args[1], args[0], args[1])) + return self.expand_to_include((args[0], args[1], args[0], args[1])) elif len(args) == 4: # Individual parameters passed in. return self.expand_to_include(args) diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 7d7292b7b8b3..022aa945d759 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -23,12 +23,12 @@ lib_names = None elif os.name == 'nt': # Windows NT shared libraries - lib_names = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17'] + lib_names = [str('gdal201'), str('gdal20'), str('gdal111'), str('gdal110'), str('gdal19')] elif os.name == 'posix': # *NIX library names. - lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0'] + lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0'] else: - raise GDALException('Unsupported OS "%s"' % os.name) + raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) # Using the ctypes `find_library` utility to find the # path to the GDAL library from the list of library names. @@ -39,9 +39,10 @@ break if lib_path is None: - raise GDALException( - 'Could not find the GDAL library (tried "%s"). Try setting ' - 'GDAL_LIBRARY_PATH in your settings.' % '", "'.join(lib_names) + raise ImproperlyConfigured( + 'Could not find the GDAL library (tried "%s"). Is GDAL installed? ' + 'If it is, try setting GDAL_LIBRARY_PATH in your settings.' + % '", "'.join(lib_names) ) # This loads the GDAL/OGR C library diff --git a/django/contrib/gis/gdal/prototypes/raster.py b/django/contrib/gis/gdal/prototypes/raster.py index b4519a853d27..af710dfb6dc8 100644 --- a/django/contrib/gis/gdal/prototypes/raster.py +++ b/django/contrib/gis/gdal/prototypes/raster.py @@ -21,7 +21,7 @@ double_output = partial(double_output, cpl=True) # Raster Driver Routines -register_all = void_output(std_call('GDALAllRegister'), []) +register_all = void_output(std_call('GDALAllRegister'), [], errcheck=False) get_driver = voidptr_output(std_call('GDALGetDriver'), [c_int]) get_driver_by_name = voidptr_output(std_call('GDALGetDriverByName'), [c_char_p], errcheck=False) get_driver_count = int_output(std_call('GDALGetDriverCount'), []) diff --git a/django/contrib/gis/geoip/prototypes.py b/django/contrib/gis/geoip/prototypes.py index 74b9b2142f0a..ed46aebcb9b1 100644 --- a/django/contrib/gis/geoip/prototypes.py +++ b/django/contrib/gis/geoip/prototypes.py @@ -4,7 +4,6 @@ # #### GeoIP C Structure definitions #### - class GeoIPRecord(Structure): _fields_ = [('country_code', c_char_p), ('country_code3', c_char_p), diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py index 48532d5c53ad..2257061ed7bd 100644 --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py @@ -179,7 +179,7 @@ def get_func(self, *args, **kwargs): # '3.0.0rc4-CAPI-1.3.3', '3.0.0-CAPI-1.4.1', '3.4.0dev-CAPI-1.8.0' or '3.4.0dev-CAPI-1.8.0 r0' version_regex = re.compile( r'^(?P(?P\d+)\.(?P\d+)\.(?P\d+))' - r'((rc(?P\d+))|dev)?-CAPI-(?P\d+\.\d+\.\d+)( r\d+)?$' + r'((rc(?P\d+))|dev)?-CAPI-(?P\d+\.\d+\.\d+)( r\d+)?( \w+)?$' ) diff --git a/django/contrib/gis/geos/prototypes/io.py b/django/contrib/gis/geos/prototypes/io.py index c932a1a15f6f..befe929d8d05 100644 --- a/django/contrib/gis/geos/prototypes/io.py +++ b/django/contrib/gis/geos/prototypes/io.py @@ -2,7 +2,9 @@ from ctypes import POINTER, Structure, byref, c_char, c_char_p, c_int, c_size_t from django.contrib.gis.geos.base import GEOSBase -from django.contrib.gis.geos.libgeos import GEOM_PTR, GEOSFuncFactory +from django.contrib.gis.geos.libgeos import ( + GEOM_PTR, GEOSFuncFactory, geos_version_info, +) from django.contrib.gis.geos.prototypes.errcheck import ( check_geom, check_sized_string, check_string, ) @@ -214,6 +216,7 @@ class WKBWriter(IOBase): _constructor = wkb_writer_create ptr_type = WKB_WRITE_PTR destructor = wkb_writer_destroy + geos_version = geos_version_info() def __init__(self, dim=2): super(WKBWriter, self).__init__() @@ -236,7 +239,7 @@ def write(self, geom): from django.contrib.gis.geos import Polygon geom = self._handle_empty_point(geom) wkb = wkb_writer_write(self.ptr, geom.ptr, byref(c_size_t())) - if isinstance(geom, Polygon) and geom.empty: + if self.geos_version['version'] < '3.6.1' and isinstance(geom, Polygon) and geom.empty: # Fix GEOS output for empty polygon. # See https://trac.osgeo.org/geos/ticket/680. wkb = wkb[:-8] + b'\0' * 4 @@ -247,7 +250,7 @@ def write_hex(self, geom): from django.contrib.gis.geos.polygon import Polygon geom = self._handle_empty_point(geom) wkb = wkb_writer_write_hex(self.ptr, geom.ptr, byref(c_size_t())) - if isinstance(geom, Polygon) and geom.empty: + if self.geos_version['version'] < '3.6.1' and isinstance(geom, Polygon) and geom.empty: wkb = wkb[:-16] + b'0' * 8 return wkb diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po index 997f5f440531..060b2a2ac401 100644 --- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/gis/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: 2015-10-09 17:42+0200\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -89,11 +89,7 @@ msgstr "" msgid "WKT debugging window:" msgstr "" -#: contrib/gis/templates/gis/google/google-map.html:4 -msgid "Google Maps via GeoDjango" -msgstr "" - -#: contrib/gis/templates/gis/openlayers.html:19 +#: contrib/gis/templates/gis/openlayers.html:13 msgid "Debugging window (serialized value)" msgstr "" diff --git a/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo b/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo index e844d229e902..38685e67136b 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 304e59aefdd3..284498a97060 100644 --- a/django/contrib/gis/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/eu/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Aitzol Naberan , 2011-2012 +# Eneko Illarramendi , 2017 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: 2015-10-10 09:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 14:44+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -17,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "GIS" -msgstr "" +msgstr "GIS" msgid "The base GIS field." msgstr "" @@ -39,7 +40,7 @@ msgid "Multi-point" msgstr "Puntu anitz" msgid "Multi-line string" -msgstr "Lerro anitz sting-a" +msgstr "Lerro-anitzeko string-a" msgid "Multi polygon" msgstr "Multi poligonoa" @@ -73,9 +74,6 @@ msgstr "" msgid "WKT debugging window:" msgstr "" -msgid "Google Maps via GeoDjango" -msgstr "" - msgid "Debugging window (serialized value)" msgstr "" diff --git a/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo index c7b2576a02b5..8230878f4ee0 100644 Binary files a/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/fr/LC_MESSAGES/django.po b/django/contrib/gis/locale/fr/LC_MESSAGES/django.po index 21cd742f598a..80f38d1ff4fe 100644 --- a/django/contrib/gis/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/fr/LC_MESSAGES/django.po @@ -1,15 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2014-2015 +# Claude Paroz , 2014-2015,2017 # Claude Paroz , 2012 # Jannis Leidel , 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: 2015-10-10 13:23+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-13 13:13+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgid "Raster Field" msgstr "Champ matriciel" msgid "No geometry value provided." -msgstr "Acune valeur géométrique fournie." +msgstr "Aucune valeur géométrique fournie." msgid "Invalid geometry value." msgstr "Valeur géométrique non valide." @@ -79,9 +79,6 @@ msgstr "Supprimer toutes les localisations" msgid "WKT debugging window:" msgstr "Fenêtre de débogage WKT :" -msgid "Google Maps via GeoDjango" -msgstr "Google Maps via GeoDjango" - msgid "Debugging window (serialized value)" msgstr "Fenêtre de débogage (valeur sérialisée)" diff --git a/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo index 6b9301c6f9de..1e96ed8b8c49 100644 Binary files a/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/hr/LC_MESSAGES/django.po b/django/contrib/gis/locale/hr/LC_MESSAGES/django.po index fdb367b6a26b..5d7659e225ce 100644 --- a/django/contrib/gis/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/hr/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # berislavlopac , 2012 # Davor Lučić , 2012 +# Filip Cuk , 2016 # Jannis Leidel , 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: 2015-10-10 09:11+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:20+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Croatian (http://www.transifex.com/django/django/language/" "hr/)\n" @@ -74,14 +75,11 @@ msgstr "" "forme." msgid "Delete all Features" -msgstr "" +msgstr "Izbriši sve značajke" msgid "WKT debugging window:" msgstr "" -msgid "Google Maps via GeoDjango" -msgstr "" - msgid "Debugging window (serialized value)" msgstr "" diff --git a/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo index 6afc57a13cca..197784f9cd31 100644 Binary files a/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ia/LC_MESSAGES/django.po b/django/contrib/gis/locale/ia/LC_MESSAGES/django.po index b3dbaa3d383b..cb2ba35e4b0a 100644 --- a/django/contrib/gis/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ia/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Martijn Dekker , 2012 +# Martijn Dekker , 2012,2016 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: 2015-10-10 09:11+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:20+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Interlingua (http://www.transifex.com/django/django/language/" "ia/)\n" @@ -21,11 +21,13 @@ msgid "GIS" msgstr "" msgid "The base GIS field." -msgstr "" +msgstr "Le campo GIS de base." msgid "" "The base Geometry field -- maps to the OpenGIS Specification Geometry type." msgstr "" +"Le campo Geometry de base. Corresponde al typo geometric del specification " +"OpenGIS." msgid "Point" msgstr "Puncto" @@ -71,16 +73,13 @@ msgstr "" "del formulario geometric." msgid "Delete all Features" -msgstr "" +msgstr "Deler tote le elementos" msgid "WKT debugging window:" -msgstr "" - -msgid "Google Maps via GeoDjango" -msgstr "" +msgstr "Fenestra pro debugging WKT:" msgid "Debugging window (serialized value)" -msgstr "" +msgstr "Fenestra pro debugging (valor serialisate)" msgid "No feeds are registered." msgstr "Nulle syndication es registrate." diff --git a/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo b/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo index 8eaf94773c23..1ceb0713171f 100644 Binary files a/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/lv/LC_MESSAGES/django.po b/django/contrib/gis/locale/lv/LC_MESSAGES/django.po index 3f244b9a0c01..260309e8bd5e 100644 --- a/django/contrib/gis/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/lv/LC_MESSAGES/django.po @@ -2,12 +2,13 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2015-10-10 09:11+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:20+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" @@ -19,14 +20,14 @@ msgstr "" "2);\n" msgid "GIS" -msgstr "" +msgstr "ĢIS" msgid "The base GIS field." -msgstr "" +msgstr "ĢIS bāzes lauks." msgid "" "The base Geometry field -- maps to the OpenGIS Specification Geometry type." -msgstr "" +msgstr "Bāzes ĢIS lauks -- atbilst OpenGIS specifikācijas Geometry tipam." msgid "Point" msgstr "Punkts" @@ -50,10 +51,10 @@ msgid "Geometry collection" msgstr "Ģeometrijas kolekcija" msgid "Extent Aggregate Field" -msgstr "" +msgstr "Apjoma agregācijas lauks" msgid "Raster Field" -msgstr "" +msgstr "Rastra lauks" msgid "No geometry value provided." msgstr "Nav norādīta ģeometrijas vērtība." @@ -71,20 +72,17 @@ msgstr "" "Sastapta kļūda, pārveidojot ģeometriju uz ģeometriskās formas lauka SRID." msgid "Delete all Features" -msgstr "" +msgstr "Dzēst visus objektus" msgid "WKT debugging window:" -msgstr "" - -msgid "Google Maps via GeoDjango" -msgstr "" +msgstr "WKT atkļūdošanas logs:" msgid "Debugging window (serialized value)" -msgstr "" +msgstr "Atkļūdošanas logs (serializēta vērtība)" msgid "No feeds are registered." -msgstr "" +msgstr "Nav reģistrētu barotņu." #, python-format msgid "Slug %r isn't registered." -msgstr "" +msgstr "Vienkāršotais nosaukums %r nav reģistrēts." diff --git a/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo index c161b8ad6cf1..d63367b2e188 100644 Binary files a/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/pl/LC_MESSAGES/django.po b/django/contrib/gis/locale/pl/LC_MESSAGES/django.po index 97d74ba080b7..6622101a1be1 100644 --- a/django/contrib/gis/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/pl/LC_MESSAGES/django.po @@ -7,31 +7,33 @@ # Piotr Jakimiak , 2015 # m_aciek , 2015 # Mattia Procopio , 2014 +# Tomasz Kajtoch , 2016-2017 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: 2015-11-25 16:58+0000\n" -"Last-Translator: Janusz Harkot \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-22 11:28+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "GIS" msgstr "GIS" msgid "The base GIS field." -msgstr "Bazowe pole GIS." +msgstr "Pole bazowe GIS." msgid "" "The base Geometry field -- maps to the OpenGIS Specification Geometry type." msgstr "" -"Bazowe pole Geometrii -- mapowane na typ Geometry specyfikacji OpenGIS." +"Pole bazowe Geometrii -- mapowane na typ Geometry specyfikacji OpenGIS." msgid "Point" msgstr "Punkt" @@ -55,7 +57,7 @@ msgid "Geometry collection" msgstr "Zbiór geometrii" msgid "Extent Aggregate Field" -msgstr "Pole do agregacji zasięgów" +msgstr "Pole Zasięgu Agregacji" msgid "Raster Field" msgstr "Pole Rastrowe" @@ -82,15 +84,12 @@ msgstr "Usuń wszystkie Elementy" msgid "WKT debugging window:" msgstr "Okno debugowania WKT:" -msgid "Google Maps via GeoDjango" -msgstr "Mapy Google w ramach GeoDjango" - msgid "Debugging window (serialized value)" -msgstr "Okno debugowania (zserializowana wartość)" +msgstr "Okno debugowania (wartość zserializowana)" msgid "No feeds are registered." -msgstr "Kanał informacyjny (RSS/ATOM) nie został zarejestrowany." +msgstr "Brak zarejestrowanych kanałów informacyjnych." #, python-format msgid "Slug %r isn't registered." -msgstr "Slug '%r' nie został zarejestrowany." +msgstr "Slug %r nie jest zarejestrowany." diff --git a/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo index 7eaea541e646..ac5ca0cadc78 100644 Binary files a/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/sl/LC_MESSAGES/django.po b/django/contrib/gis/locale/sl/LC_MESSAGES/django.po index 6e2bb91d5c8a..66889c426b5e 100644 --- a/django/contrib/gis/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/sl/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Jannis Leidel , 2011 +# Primož Verdnik , 2017 # zejn , 2016 # zejn , 2012 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: 2016-05-14 13:47+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-02 08:40+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -59,7 +60,7 @@ msgid "Raster Field" msgstr "Rastersko polje" msgid "No geometry value provided." -msgstr "Ni navdene geometrijske vrednosti." +msgstr "Ni navedene geometrijske vrednosti." msgid "Invalid geometry value." msgstr "Neveljavna geometrijska vrednost." @@ -78,10 +79,7 @@ msgid "Delete all Features" msgstr "Pobriši vse atribute" msgid "WKT debugging window:" -msgstr "Okno za razhroščanje WKT" - -msgid "Google Maps via GeoDjango" -msgstr "Google Maps prek GeoDjango" +msgstr "Okno za razhroščevanje WKT" msgid "Debugging window (serialized value)" msgstr "Okno za razhroščevanje (serializirana vrednost)" diff --git a/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo index 97b6b5ed64af..a906808f22f2 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 d7775a8082fb..c26035b4a880 100644 --- a/django/contrib/gis/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/uk/LC_MESSAGES/django.po @@ -1,8 +1,9 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Denis Podlesniy , 2016 +# Денис Подлесный , 2016 # Jannis Leidel , 2011 +# Kirill Gagarski , 2016 # Max V. Stotsky , 2014 # Roman Kozlovskyi , 2012 # Sergey Lysach , 2011 @@ -11,9 +12,9 @@ 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: 2016-07-07 23:11+0000\n" -"Last-Translator: Denis Podlesniy \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 08:20+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -55,10 +56,10 @@ msgid "Geometry collection" msgstr "Набір геометричних об'єктів" msgid "Extent Aggregate Field" -msgstr "" +msgstr "Поле, агрегуюче площу чи об'єм" msgid "Raster Field" -msgstr "Raster поле" +msgstr "Растрове поле" msgid "No geometry value provided." msgstr "Не задано геометричне значення." @@ -78,13 +79,10 @@ msgid "Delete all Features" msgstr "Видалити всі Features" msgid "WKT debugging window:" -msgstr "" - -msgid "Google Maps via GeoDjango" -msgstr "Google Maps за допомогою GeoDjango" +msgstr "Вікно налагождення WKT:" msgid "Debugging window (serialized value)" -msgstr "" +msgstr "Вікно налагождення (серіалізоване значення)" msgid "No feeds are registered." msgstr "Немає зареєстрованих підписок." diff --git a/django/contrib/gis/management/commands/inspectdb.py b/django/contrib/gis/management/commands/inspectdb.py index 27345c59d464..5275175d66ac 100644 --- a/django/contrib/gis/management/commands/inspectdb.py +++ b/django/contrib/gis/management/commands/inspectdb.py @@ -1,5 +1,6 @@ -from django.core.management.commands.inspectdb import \ - Command as InspectDBCommand +from django.core.management.commands.inspectdb import ( + Command as InspectDBCommand, +) class Command(InspectDBCommand): diff --git a/django/contrib/gis/serializers/geojson.py b/django/contrib/gis/serializers/geojson.py index dcdf153c3623..a1329f89d948 100644 --- a/django/contrib/gis/serializers/geojson.py +++ b/django/contrib/gis/serializers/geojson.py @@ -1,12 +1,9 @@ from __future__ import unicode_literals -from django.contrib.gis.gdal import HAS_GDAL +from django.contrib.gis.gdal import CoordTransform, SpatialReference from django.core.serializers.base import SerializerDoesNotExist from django.core.serializers.json import Serializer as JSONSerializer -if HAS_GDAL: - from django.contrib.gis.gdal import CoordTransform, SpatialReference - class Serializer(JSONSerializer): """ diff --git a/django/contrib/gis/static/gis/js/OLMapWidget.js b/django/contrib/gis/static/gis/js/OLMapWidget.js index 4cd98e2f1aae..dae97e1f8753 100644 --- a/django/contrib/gis/static/gis/js/OLMapWidget.js +++ b/django/contrib/gis/static/gis/js/OLMapWidget.js @@ -207,15 +207,15 @@ ol.inherits(GeometryTypeControl, ol.control.Control); } else { geometry = features[0].getGeometry().clone(); for (var j = 1; j < features.length; j++) { - switch(geometry.getType()) { - case "MultiPoint": - geometry.appendPoint(features[j].getGeometry().getPoint(0)); - break; - case "MultiLineString": - geometry.appendLineString(features[j].getGeometry().getLineString(0)); - break; - case "MultiPolygon": - geometry.appendPolygon(features[j].getGeometry().getPolygon(0)); + switch (geometry.getType()) { + case "MultiPoint": + geometry.appendPoint(features[j].getGeometry().getPoint(0)); + break; + case "MultiLineString": + geometry.appendLineString(features[j].getGeometry().getLineString(0)); + break; + case "MultiPolygon": + geometry.appendPolygon(features[j].getGeometry().getPolygon(0)); } } } diff --git a/django/contrib/gis/utils/__init__.py b/django/contrib/gis/utils/__init__.py index 78b221663fc1..1df98b1f23bc 100644 --- a/django/contrib/gis/utils/__init__.py +++ b/django/contrib/gis/utils/__init__.py @@ -1,17 +1,15 @@ """ This module contains useful utilities for GeoDjango. """ -from django.contrib.gis.gdal import HAS_GDAL +from django.contrib.gis.utils.ogrinfo import ogrinfo # NOQA +from django.contrib.gis.utils.ogrinspect import mapping, ogrinspect # NOQA +from django.contrib.gis.utils.srs import add_srs_entry # NOQA from django.contrib.gis.utils.wkt import precision_wkt # NOQA from django.core.exceptions import ImproperlyConfigured -if HAS_GDAL: - from django.contrib.gis.utils.ogrinfo import ogrinfo # NOQA - from django.contrib.gis.utils.ogrinspect import mapping, ogrinspect # NOQA - from django.contrib.gis.utils.srs import add_srs_entry # NOQA - try: - # LayerMapping requires DJANGO_SETTINGS_MODULE to be set, - # so this needs to be in try/except. - from django.contrib.gis.utils.layermapping import LayerMapping, LayerMapError # NOQA - except ImproperlyConfigured: - pass +try: + # LayerMapping requires DJANGO_SETTINGS_MODULE to be set, + # so this needs to be in try/except. + from django.contrib.gis.utils.layermapping import LayerMapping, LayerMapError # NOQA +except ImproperlyConfigured: + pass diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo index 25e4e8bf3a64..24653aa93317 100644 Binary files a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po index f74930955a39..5b9ab84468eb 100644 --- a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2017 # Jannis Leidel , 2011 # lardissone , 2014 # Ramiro Morales, 2012,2014-2015 @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2015-11-30 00:25+0000\n" -"Last-Translator: Ramiro Morales\n" +"PO-Revision-Date: 2017-07-05 06:33+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -215,7 +216,7 @@ msgstr "ahora" #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "hace un\\u00a0segundo" +msgstr[0] "hace un segundo" msgstr[1] "hace %(count)s segundos" #. Translators: please keep a non-breaking space (U+00A0) @@ -223,7 +224,7 @@ msgstr[1] "hace %(count)s segundos" #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" -msgstr[0] "hace un\\u00a0minutos" +msgstr[0] "hace un minutos" msgstr[1] "hace %(count)s minutos" #. Translators: please keep a non-breaking space (U+00A0) @@ -231,7 +232,7 @@ msgstr[1] "hace %(count)s minutos" #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" -msgstr[0] "hace una\\u00a0hora" +msgstr[0] "hace una hora" msgstr[1] "hace %(count)s horas" #, python-format @@ -244,7 +245,7 @@ msgstr "dentro de %(delta)s" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "dentro de un\\u00a0segundo" +msgstr[0] "dentro de un segundo" msgstr[1] "dentro de %(count)s segundos" #. Translators: please keep a non-breaking space (U+00A0) @@ -252,7 +253,7 @@ msgstr[1] "dentro de %(count)s segundos" #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" -msgstr[0] "dentro de un\\u00a0minuto" +msgstr[0] "dentro de un minuto" msgstr[1] "dentro de %(count)s minutos" #. Translators: please keep a non-breaking space (U+00A0) @@ -260,5 +261,5 @@ msgstr[1] "dentro de %(count)s minutos" #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" -msgstr[0] "dentro de una\\u00a0hora" +msgstr[0] "dentro de una hora" msgstr[1] "dentro de %(count)s horas" diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo index 242f8aa62d97..33ba0d6caa3f 100644 Binary files a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po index 0baeb79c4f86..5dc6f7db9b5d 100644 --- a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Abraham Estrada , 2011-2012 +# Abraham Estrada, 2011-2012 # Alex Dzul , 2015 +# Juan Pablo Flores , 2016 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: 2015-12-30 19:27+0000\n" -"Last-Translator: Alex Dzul \n" +"PO-Revision-Date: 2016-11-29 18:45+0000\n" +"Last-Translator: Juan Pablo Flores \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/" "language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Humanize" -msgstr "" +msgstr "Humanizar" msgid "th" msgstr "to" @@ -214,8 +215,8 @@ msgstr "ahora" #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "hace un segundo" +msgstr[1] "Hace %(count)s segundos" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -243,8 +244,8 @@ msgstr "%(delta)s a partir de ahora" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Un segundo desde ahora" +msgstr[1] "%(count)s desde ahora" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. diff --git a/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.mo index 32f6e8fd6f68..0b4fa7487acc 100644 Binary files a/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.po index f4bda317c1b7..e988d55c6a5a 100644 --- a/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_VE/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eduardo , 2017 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: 2014-10-05 20:12+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/" -"django/language/es_VE/)\n" +"PO-Revision-Date: 2017-02-16 14:06+0000\n" +"Last-Translator: Eduardo \n" +"Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/" +"language/es_VE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Humanize" -msgstr "" +msgstr "Humanizar" msgid "th" msgstr "" @@ -164,40 +165,40 @@ msgstr[0] "" msgstr[1] "" msgid "one" -msgstr "" +msgstr "uno" msgid "two" -msgstr "" +msgstr "dos" msgid "three" -msgstr "" +msgstr "tres" msgid "four" -msgstr "" +msgstr "cuatro" msgid "five" -msgstr "" +msgstr "cinco" msgid "six" -msgstr "" +msgstr "seis" msgid "seven" -msgstr "" +msgstr "siete" msgid "eight" -msgstr "" +msgstr "ocho" msgid "nine" -msgstr "" +msgstr "nueve" msgid "today" -msgstr "" +msgstr "hoy" msgid "tomorrow" -msgstr "" +msgstr "mañana" msgid "yesterday" -msgstr "" +msgstr "ayer" #, python-format msgctxt "naturaltime" @@ -205,7 +206,7 @@ msgid "%(delta)s ago" msgstr "" msgid "now" -msgstr "" +msgstr "ahora" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo index 15faf23d42c2..17aa1bd48e18 100644 Binary files a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po index 41366e523b2b..73d2cd803ae2 100644 --- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po @@ -1,8 +1,9 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aitzol Naberan , 2011-2012 +# Aitzol Naberan , 2011-2012,2016 # Ander Martínez , 2014 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 # julen , 2014 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2014-10-05 20:10+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 13:22+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -20,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Humanize" -msgstr "" +msgstr "Humanizatu" msgid "th" msgstr "." @@ -37,8 +38,8 @@ msgstr "." #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" -msgstr[0] "miloi %(value).1f " -msgstr[1] "%(value).1f miloi" +msgstr[0] "milioi %(value).1f " +msgstr[1] "%(value).1f milioi" #, python-format msgid "%(value)s million" @@ -49,8 +50,8 @@ msgstr[1] "%(value)s milioi" #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "biloi %(value).1f " -msgstr[1] "%(value).1f biloi" +msgstr[0] "bilioi %(value).1f " +msgstr[1] "%(value).1f bilioi" #, python-format msgid "%(value)s billion" @@ -61,8 +62,8 @@ msgstr[1] "%(value)s bilioi" #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "triloi %(value).1f " -msgstr[1] "%(value).1f triloi" +msgstr[0] "trilioi %(value).1f " +msgstr[1] "%(value).1f trilioi" #, python-format msgid "%(value)s trillion" @@ -128,7 +129,7 @@ msgstr[1] "%(value).1f octilioi" msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "octillioi %(value)s" -msgstr[1] " %(value)s octilioi" +msgstr[1] " %(value)s octilioi" #, python-format msgid "%(value).1f nonillion" @@ -146,7 +147,7 @@ msgstr[1] "%(value)s nonilioi" msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "dezilioi %(value).1f" -msgstr[1] "%(value).1f deziioi" +msgstr[1] "%(value).1f dezilioi" #, python-format msgid "%(value)s decillion" @@ -157,14 +158,14 @@ msgstr[1] "%(value)s dezilioi" #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" -msgstr[0] "gugol %(value).1f" -msgstr[1] "%(value).1f gugol" +msgstr[0] "googol %(value).1f" +msgstr[1] "%(value).1f googol" #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" -msgstr[0] "gugol %(value)s" -msgstr[1] "%(value)s gugol" +msgstr[0] "googol %(value)s" +msgstr[1] "%(value)s googol" msgid "one" msgstr "bat" @@ -215,24 +216,24 @@ msgstr "orain" #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "duela segundu bat" +msgstr[1] "duela %(count)s segundu" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "duela minutu bat" +msgstr[1] "duela %(count)s minutu" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "duela ordubete" +msgstr[1] "duela %(count)s ordu" #, python-format msgctxt "naturaltime" @@ -244,21 +245,21 @@ msgstr "%(delta)s barru" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "segundu bat barru" +msgstr[1] "%(count)s segundu barru" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "minutu bat barru" +msgstr[1] "%(count)s minutu barru" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ordubete barru" +msgstr[1] "%(count)s ordu barru" diff --git a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo index d8f3b580f8c7..08f986fcd27e 100644 Binary files a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po index 3d8e48c24e28..ea879c103a5f 100644 --- a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Martijn Dekker , 2012 +# Martijn Dekker , 2012,2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-25 21:09+0000\n" +"Last-Translator: Martijn Dekker \n" "Language-Team: Interlingua (http://www.transifex.com/django/django/language/" "ia/)\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Humanize" -msgstr "" +msgstr "Humanisar" msgid "th" msgstr "e" @@ -213,24 +213,24 @@ msgstr "ora" #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un secunda retro" +msgstr[1] "%(count)s secundas retro" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un minuta retro" +msgstr[1] "%(count)s minutas retro" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un hora retro" +msgstr[1] "%(count)s horas retro" #, python-format msgctxt "naturaltime" @@ -242,21 +242,21 @@ msgstr "in %(delta)s" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un secunda desde ora" +msgstr[1] "%(count)s secundas desde ora" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un minuta desde ora" +msgstr[1] "%(count)s minutas desde ora" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "un hora desde ora" +msgstr[1] "%(count)s horas desde ora" diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo index f7a3297cf187..23549c5183ab 100644 Binary files a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po index 1725bf41ee84..9ec9116c72fa 100644 --- a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# gudmundur , 2012 +# gudmundur , 2012 # Hafsteinn Einarsson , 2012 # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-07 19:42+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -197,10 +198,10 @@ msgid "today" msgstr "í dag" msgid "tomorrow" -msgstr "morgundagur" +msgstr "á morgun" msgid "yesterday" -msgstr "gærdagur" +msgstr "í gær" #, python-format msgctxt "naturaltime" diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo index 53beef26eecd..c772f93eaf77 100644 Binary files a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po index e68804c1f9f1..f77a9599565a 100644 --- a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Leo Trubach , 2017 # yun_man_ger , 2011 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-01-14 16:07+0000\n" +"Last-Translator: Leo Trubach \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,22 +65,22 @@ msgstr[0] "%(value)s trillion" #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" -msgstr[0] "" +msgstr[0] "%(value).1f квадриллион" #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "" +msgstr[0] "%(value)s квадриллион" #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" -msgstr[0] "" +msgstr[0] "%(value).1f квинтиллион" #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" -msgstr[0] "" +msgstr[0] "%(value)s квинтиллион" #, python-format msgid "%(value).1f sextillion" diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo index 7b0c6386349c..65574f6b6ec2 100644 Binary files a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po index c3f71f655cea..8d7a5e12b027 100644 --- a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-13 06:57+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "2);\n" msgid "Humanize" -msgstr "" +msgstr "Padarīt cilvēcīgu" msgid "th" msgstr "th" @@ -43,9 +44,9 @@ msgstr[2] "%(value).1f miljonu" #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value)s miljonu" +msgstr[1] "%(value)s miljons" +msgstr[2] "%(value)s miljonu" #, python-format msgid "%(value).1f billion" @@ -57,9 +58,9 @@ msgstr[2] "%(value).1f miljardu" #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value)s miljardu" +msgstr[1] "%(value)s miljards" +msgstr[2] "%(value)s miljardu" #, python-format msgid "%(value).1f trillion" @@ -226,10 +227,10 @@ msgstr "vakar" #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" -msgstr "" +msgstr "%(delta)s atpakaļ" msgid "now" -msgstr "" +msgstr "tagad" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -237,7 +238,7 @@ msgstr "" msgid "a second ago" msgid_plural "%(count)s seconds ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "sekundi atpakaļ" msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) @@ -246,7 +247,7 @@ msgstr[2] "" msgid "a minute ago" msgid_plural "%(count)s minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "minūti atpakaļ" msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) @@ -261,7 +262,7 @@ msgstr[2] "" #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "" +msgstr "%(delta)s no šī brīža" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo index 322c36a71204..96f301875ccc 100644 Binary files a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po index a6eccf165d3e..060168cbe615 100644 --- a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po @@ -7,23 +7,25 @@ # Jannis Leidel , 2011 # Piotr Meuś , 2014 # Roman Barczyński , 2012 +# Tomasz Kajtoch , 2016 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: 2015-01-14 14:30+0000\n" -"Last-Translator: Adam Stachowicz \n" +"PO-Revision-Date: 2016-11-12 11:51+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Humanize" -msgstr "Uczłowieczać" +msgstr "Humanizacja" msgid "th" msgstr "-y" @@ -43,6 +45,7 @@ msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f miliony" msgstr[2] "%(value).1f milionów" +msgstr[3] "%(value).1f milionów" #, python-format msgid "%(value)s million" @@ -50,6 +53,7 @@ msgid_plural "%(value)s million" msgstr[0] "%(value)s milion" msgstr[1] "%(value)s miliony" msgstr[2] "%(value)s milionów" +msgstr[3] "%(value)s milionów" #, python-format msgid "%(value).1f billion" @@ -57,6 +61,7 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miliard" msgstr[1] "%(value).1f miliardy" msgstr[2] "%(value).1f miliardów" +msgstr[3] "%(value).1f miliardów" #, python-format msgid "%(value)s billion" @@ -64,34 +69,39 @@ msgid_plural "%(value)s billion" msgstr[0] "%(value)s miliard" msgstr[1] "%(value)s miliardy" msgstr[2] "%(value)s miliardów" +msgstr[3] "%(value)s miliardów" #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f bilion" +msgstr[0] "%(value).1f kwintylion" msgstr[1] "%(value).1f biliony" -msgstr[2] "%(value).1f bilionów" +msgstr[2] "%(value).1f kwintylionów" +msgstr[3] "%(value).1f kwintylionów" #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" -msgstr[0] "%(value)s bilion" +msgstr[0] "%(value)s kwintylion" msgstr[1] "%(value)s biliony" -msgstr[2] "%(value)s bilionów" +msgstr[2] "%(value)s kwintylionów" +msgstr[3] "%(value)s kwintylionów" #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f biliard" +msgstr[0] "%(value).1f kwadrylion" msgstr[1] "%(value).1f biliardy" -msgstr[2] "%(value).1f biliardów" +msgstr[2] "%(value).1f kwadrylionów" +msgstr[3] "%(value).1f kwadrylionów" #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "%(value)s biliard" +msgstr[0] "%(value)s kwadrylion" msgstr[1] "%(value)s biliardy" -msgstr[2] "%(value)s biliardów" +msgstr[2] "%(value)s kwadrylionów" +msgstr[3] "%(value)s kwadrylionów" #, python-format msgid "%(value).1f quintillion" @@ -99,6 +109,7 @@ msgid_plural "%(value).1f quintillion" msgstr[0] "%(value).1f trylion" msgstr[1] "%(value).1f tryliony" msgstr[2] "%(value).1f trylionów" +msgstr[3] "%(value).1f trylionów" #, python-format msgid "%(value)s quintillion" @@ -106,6 +117,7 @@ msgid_plural "%(value)s quintillion" msgstr[0] "%(value)s trylion" msgstr[1] "%(value)s tryliony" msgstr[2] "%(value)s trylionyów" +msgstr[3] "%(value)s trylionyów" #, python-format msgid "%(value).1f sextillion" @@ -113,6 +125,7 @@ msgid_plural "%(value).1f sextillion" msgstr[0] "%(value).1f tryliard" msgstr[1] "%(value).1f tryliardy" msgstr[2] "%(value).1f tryliardów" +msgstr[3] "%(value).1f tryliardów" #, python-format msgid "%(value)s sextillion" @@ -120,20 +133,23 @@ msgid_plural "%(value)s sextillion" msgstr[0] " %(value)s tryliard" msgstr[1] "%(value)s tryliardy" msgstr[2] "%(value)s tryliardów" +msgstr[3] "%(value)s tryliardów" #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f kwadrylion" -msgstr[1] "%(value).1f kwadryliony" -msgstr[2] "%(value).1f kwadrylionów" +msgstr[0] "%(value).1f septylion" +msgstr[1] "%(value).1f septyliony" +msgstr[2] "%(value).1f septylionów" +msgstr[3] "%(value).1f septylionów" #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" -msgstr[0] "%(value)s kwadrylion" -msgstr[1] "%(value)s kwadryliony" -msgstr[2] "%(value)s kwadrylionów" +msgstr[0] "%(value)s septylion" +msgstr[1] "%(value)s septyliony" +msgstr[2] "%(value)s septylionów" +msgstr[3] "%(value)s septylionów" #, python-format msgid "%(value).1f octillion" @@ -141,6 +157,7 @@ msgid_plural "%(value).1f octillion" msgstr[0] "%(value).1f kwadryliard" msgstr[1] "%(value).1f kwardyliardy" msgstr[2] "%(value).1f kwadryliardów" +msgstr[3] "%(value).1f kwadryliardów" #, python-format msgid "%(value)s octillion" @@ -148,6 +165,7 @@ msgid_plural "%(value)s octillion" msgstr[0] "%(value)s kwadryliard" msgstr[1] "%(value)s kwardyliardy" msgstr[2] "%(value)s kwadryliardów" +msgstr[3] "%(value)s kwadryliardów" #, python-format msgid "%(value).1f nonillion" @@ -155,6 +173,7 @@ msgid_plural "%(value).1f nonillion" msgstr[0] "%(value).1f kwintylion" msgstr[1] "%(value).1f kwintyliony" msgstr[2] "%(value).1f kwintylionów" +msgstr[3] "%(value).1f kwintylionów" #, python-format msgid "%(value)s nonillion" @@ -162,6 +181,7 @@ msgid_plural "%(value)s nonillion" msgstr[0] "%(value)s kwintylion" msgstr[1] "%(value)s kwintyliony" msgstr[2] "%(value)s kwintylionów" +msgstr[3] "%(value)s kwintylionów" #, python-format msgid "%(value).1f decillion" @@ -169,6 +189,7 @@ msgid_plural "%(value).1f decillion" msgstr[0] "%(value).1f kwintyliard" msgstr[1] "%(value).1f kwintyliardy" msgstr[2] "%(value).1f kwintyliardów" +msgstr[3] "%(value).1f kwintyliardów" #, python-format msgid "%(value)s decillion" @@ -176,6 +197,7 @@ msgid_plural "%(value)s decillion" msgstr[0] "%(value)s kwintyliard" msgstr[1] "%(value)s kwintyliardy" msgstr[2] "%(value)s kwintyliardów" +msgstr[3] "%(value)s kwintyliardów" #, python-format msgid "%(value).1f googol" @@ -183,6 +205,7 @@ msgid_plural "%(value).1f googol" msgstr[0] "%(value).1f googol" msgstr[1] "%(value).1f googole" msgstr[2] "%(value).1f googolów" +msgstr[3] "%(value).1f googolów" #, python-format msgid "%(value)s googol" @@ -190,6 +213,7 @@ msgid_plural "%(value)s googol" msgstr[0] "%(value)s googol" msgstr[1] "%(value)s googole" msgstr[2] "%(value)s googolów" +msgstr[3] "%(value)s googolów" msgid "one" msgstr "jeden" @@ -243,6 +267,7 @@ msgid_plural "%(count)s seconds ago" msgstr[0] "sekundę temu" msgstr[1] "%(count)s sekundy temu" msgstr[2] "%(count)s sekund temu" +msgstr[3] "%(count)s sekund temu" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -252,6 +277,7 @@ msgid_plural "%(count)s minutes ago" msgstr[0] "minutę temu" msgstr[1] "%(count)s minuty temu" msgstr[2] "%(count)s minut temu" +msgstr[3] "%(count)s minut temu" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -261,6 +287,7 @@ msgid_plural "%(count)s hours ago" msgstr[0] "godzinę temu" msgstr[1] "%(count)s godziny temu" msgstr[2] "%(count)s godzin temu" +msgstr[3] "%(count)s godzin temu" #, python-format msgctxt "naturaltime" @@ -275,6 +302,7 @@ msgid_plural "%(count)s seconds from now" msgstr[0] "za sekundę" msgstr[1] "za %(count)s sekundy" msgstr[2] "za %(count)s sekund" +msgstr[3] "za %(count)s sekund" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -284,6 +312,7 @@ msgid_plural "%(count)s minutes from now" msgstr[0] "za minutę" msgstr[1] "za %(count)s minuty" msgstr[2] "za %(count)s minut" +msgstr[3] "za %(count)s minut" #. Translators: please keep a non-breaking space (U+00A0) #. between count and time unit. @@ -293,3 +322,4 @@ msgid_plural "%(count)s hours from now" msgstr[0] "za godzinę" msgstr[1] "za %(count)s godziny" msgstr[2] "za %(count)s godzin" +msgstr[3] "za %(count)s godzin" diff --git a/django/contrib/messages/__init__.py b/django/contrib/messages/__init__.py index a0cb24b2d9c1..25da09f3bf7e 100644 --- a/django/contrib/messages/__init__.py +++ b/django/contrib/messages/__init__.py @@ -1,5 +1,4 @@ from django.contrib.messages.api import * # NOQA from django.contrib.messages.constants import * # NOQA - default_app_config = 'django.contrib.messages.apps.MessagesConfig' diff --git a/django/contrib/postgres/aggregates/general.py b/django/contrib/postgres/aggregates/general.py index 5b3d22bf9817..cd9a4bc34988 100644 --- a/django/contrib/postgres/aggregates/general.py +++ b/django/contrib/postgres/aggregates/general.py @@ -1,4 +1,5 @@ from django.contrib.postgres.fields import JSONField +from django.db.models import Value from django.db.models.aggregates import Aggregate __all__ = [ @@ -43,11 +44,12 @@ def convert_value(self, value, expression, connection, context): class StringAgg(Aggregate): function = 'STRING_AGG' - template = "%(function)s(%(distinct)s%(expressions)s, '%(delimiter)s')" + template = '%(function)s(%(distinct)s%(expressions)s)' def __init__(self, expression, delimiter, distinct=False, **extra): distinct = 'DISTINCT ' if distinct else '' - super(StringAgg, self).__init__(expression, delimiter=delimiter, distinct=distinct, **extra) + delimiter_expr = Value(str(delimiter)) + super(StringAgg, self).__init__(expression, delimiter_expr, distinct=distinct, **extra) def convert_value(self, value, expression, connection, context): if not value: diff --git a/django/contrib/postgres/apps.py b/django/contrib/postgres/apps.py index 0eeee6332b17..9de733c261b4 100644 --- a/django/contrib/postgres/apps.py +++ b/django/contrib/postgres/apps.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from .lookups import SearchLookup, TrigramSimilar, Unaccent -from .signals import register_hstore_handler +from .signals import register_type_handlers class PostgresConfig(AppConfig): @@ -16,8 +16,8 @@ def ready(self): # Connections may already exist before we are called. for conn in connections.all(): if conn.connection is not None: - register_hstore_handler(conn) - connection_created.connect(register_hstore_handler) + register_type_handlers(conn) + connection_created.connect(register_type_handlers) CharField.register_lookup(Unaccent) TextField.register_lookup(Unaccent) CharField.register_lookup(SearchLookup) diff --git a/django/contrib/postgres/fields/citext.py b/django/contrib/postgres/fields/citext.py index cab1f879577b..f5ef86c586c6 100644 --- a/django/contrib/postgres/fields/citext.py +++ b/django/contrib/postgres/fields/citext.py @@ -1,8 +1,24 @@ -from django.db.models import CharField +from django.db.models import CharField, EmailField, TextField -__all__ = ['CITextField'] +__all__ = ['CICharField', 'CIEmailField', 'CIText', 'CITextField'] -class CITextField(CharField): +class CIText(object): + + def get_internal_type(self): + return 'CI' + super(CIText, self).get_internal_type() + def db_type(self, connection): return 'citext' + + +class CICharField(CIText, CharField): + pass + + +class CIEmailField(CIText, EmailField): + pass + + +class CITextField(CIText, TextField): + pass diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py index 605deaf62c53..5ddb10e5840c 100644 --- a/django/contrib/postgres/fields/hstore.py +++ b/django/contrib/postgres/fields/hstore.py @@ -86,7 +86,7 @@ def __init__(self, key_name, *args, **kwargs): def as_sql(self, compiler, connection): lhs, params = compiler.compile(self.lhs) - return "(%s -> '%s')" % (lhs, self.key_name), params + return '(%s -> %%s)' % lhs, tuple(params) + (self.key_name,) class KeyTransformFactory(object): diff --git a/django/contrib/postgres/fields/jsonb.py b/django/contrib/postgres/fields/jsonb.py index 0722a05a69c2..559fc5ba4e0b 100644 --- a/django/contrib/postgres/fields/jsonb.py +++ b/django/contrib/postgres/fields/jsonb.py @@ -104,12 +104,10 @@ def as_sql(self, compiler, connection): if len(key_transforms) > 1: return "(%s %s %%s)" % (lhs, self.nested_operator), [key_transforms] + params try: - int(self.key_name) + lookup = int(self.key_name) except ValueError: - lookup = "'%s'" % self.key_name - else: - lookup = "%s" % self.key_name - return "(%s %s %s)" % (lhs, self.operator, lookup), params + lookup = self.key_name + return '(%s %s %%s)' % (lhs, self.operator), tuple(params) + (lookup,) class KeyTextTransform(KeyTransform): diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py index 9830c8de4878..4fbeca88776c 100644 --- a/django/contrib/postgres/forms/array.py +++ b/django/contrib/postgres/forms/array.py @@ -7,7 +7,6 @@ ) from django.core.exceptions import ValidationError from django.utils import six -from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from ..utils import prefix_validation_error @@ -91,6 +90,7 @@ def run_validators(self, value): class SplitArrayWidget(forms.Widget): + template_name = 'postgres/widgets/split_array.html' def __init__(self, widget, size, **kwargs): self.widget = widget() if isinstance(widget, type) else widget @@ -117,11 +117,13 @@ def id_for_label(self, id_): id_ += '_0' return id_ - def render(self, name, value, attrs=None, renderer=None): + def get_context(self, name, value, attrs=None): + attrs = {} if attrs is None else attrs + context = super(SplitArrayWidget, self).get_context(name, value, attrs) if self.is_localized: self.widget.is_localized = self.is_localized value = value or [] - output = [] + context['widget']['subwidgets'] = [] final_attrs = self.build_attrs(attrs) id_ = final_attrs.get('id') for i in range(max(len(value), self.size)): @@ -131,11 +133,10 @@ def render(self, name, value, attrs=None, renderer=None): widget_value = None if id_: final_attrs = dict(final_attrs, id='%s_%s' % (id_, i)) - output.append(self.widget.render(name + '_%s' % i, widget_value, final_attrs, renderer)) - return mark_safe(self.format_output(output)) - - def format_output(self, rendered_widgets): - return ''.join(rendered_widgets) + context['widget']['subwidgets'].append( + self.widget.get_context(name + '_%s' % i, widget_value, final_attrs)['widget'] + ) + return context @property def media(self): diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py index 185ea7435c47..138dde26de8f 100644 --- a/django/contrib/postgres/indexes.py +++ b/django/contrib/postgres/indexes.py @@ -7,6 +7,11 @@ class BrinIndex(Index): suffix = 'brin' + # Allow an index name longer than 30 characters since the suffix is 4 + # characters (usual limit is 3). Since this index can only be used on + # PostgreSQL, the 30 character limit for cross-database compatibility isn't + # applicable. + max_name_length = 31 def __init__(self, fields=[], name=None, pages_per_range=None): if pages_per_range is not None and pages_per_range <= 0: @@ -26,7 +31,8 @@ def __repr__(self): def deconstruct(self): path, args, kwargs = super(BrinIndex, self).deconstruct() - kwargs['pages_per_range'] = self.pages_per_range + if self.pages_per_range is not None: + kwargs['pages_per_range'] = self.pages_per_range return path, args, kwargs def get_sql_create_template_values(self, model, schema_editor, using): diff --git a/django/contrib/postgres/jinja2/postgres/widgets/split_array.html b/django/contrib/postgres/jinja2/postgres/widgets/split_array.html new file mode 100644 index 000000000000..32fda82609f8 --- /dev/null +++ b/django/contrib/postgres/jinja2/postgres/widgets/split_array.html @@ -0,0 +1 @@ +{% include 'django/forms/widgets/multiwidget.html' %} diff --git a/django/contrib/postgres/locale/ar/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ar/LC_MESSAGES/django.mo index 77f8c4e3a4fc..b30ecef5eaab 100644 Binary files a/django/contrib/postgres/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ar/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ar/LC_MESSAGES/django.po index f33c9851b22b..06d7c2e69fef 100644 --- a/django/contrib/postgres/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/ar/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Bashar Al-Abdulhadi, 2015-2016 +# Bashar Al-Abdulhadi, 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 09:32+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n" "MIME-Version: 1.0\n" @@ -27,12 +27,12 @@ msgstr "العنصر %(nth)s في المجموعة لم يتم التحقق من msgid "Nested arrays must have the same length." msgstr "يجب أن تكون المجموعات المتداخلة بنفس الطول." -msgid "Map of strings to strings" -msgstr "خريطة السلاسل للسلاسل" +msgid "Map of strings to strings/nulls" +msgstr "" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "القيمة لـ \"%(key)s\" ليست سلسلة." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" msgid "A JSON object" msgstr "كائن JSON" @@ -44,7 +44,7 @@ msgid "Could not load JSON data." msgstr "لا يمكن عرض بيانات JSON." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "المُدخل يجب أن يكون بصيغة بصيغة قاموس JSON." #, python-format msgid "'%(value)s' value must be valid JSON." diff --git a/django/contrib/postgres/locale/be/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/be/LC_MESSAGES/django.mo index 488322cb7497..04f9f6833202 100644 Binary files a/django/contrib/postgres/locale/be/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/be/LC_MESSAGES/django.po b/django/contrib/postgres/locale/be/LC_MESSAGES/django.po index b4129e55f48c..6c88f5c1d068 100644 --- a/django/contrib/postgres/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/be/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Viktar Palstsiuk , 2015 -# znotdead , 2016 +# znotdead , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-15 09:30+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-15 07:17+0000\n" "Last-Translator: znotdead \n" "Language-Team: Belarusian (http://www.transifex.com/django/django/language/" "be/)\n" @@ -30,12 +30,12 @@ msgstr "Элемент масіву нумар %(nth)s не прайшоў пр msgid "Nested arrays must have the same length." msgstr "Укладзенныя масівы павінны мець аднолькавую даўжыню." -msgid "Map of strings to strings" -msgstr "Адпаведнасць радкоў у радкі." +msgid "Map of strings to strings/nulls" +msgstr "Адпаведнасць радкоў у радкі/нулі" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Значэнне \"%(key)s\" не з'яўляецца радком." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Значэнне \"%(key)s\" не з'яўляецца радком ці нулём." msgid "A JSON object" msgstr "JSON аб’ект" diff --git a/django/contrib/postgres/locale/ca/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ca/LC_MESSAGES/django.mo index 1213bc2e6b57..2c89704af2a5 100644 Binary files a/django/contrib/postgres/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ca/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ca/LC_MESSAGES/django.po index a6a3a7a82ae3..bc92f34d4de0 100644 --- a/django/contrib/postgres/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/ca/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Antoni Aloy , 2015 +# Antoni Aloy , 2015,2017 # duub qnnp, 2015 # Roger Pons , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:32+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/django/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -29,12 +29,12 @@ msgstr "L'element %(nth)s de la matriu no valida:" msgid "Nested arrays must have the same length." msgstr "Les matrius niades han de tenir la mateixa longitud." -msgid "Map of strings to strings" -msgstr "Mapa de cadenes a cadenes" +msgid "Map of strings to strings/nulls" +msgstr "Mapa de cadenes a cadenes/nuls" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "El valor de \"%(key)s\" no és una cadena." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "El valor de \"%(key)s no és ni una cadena ni un nul." msgid "A JSON object" msgstr "Un objecte JSON" @@ -46,7 +46,7 @@ msgid "Could not load JSON data." msgstr "No es poden carregar les dades JSON" msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "L'entrada ha de ser un diccionari JSON" #, python-format msgid "'%(value)s' value must be valid JSON." diff --git a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo index 6a1f634b1d2e..50cbe57885d9 100644 Binary files a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po index 6009b54adf9b..8cf11f57f475 100644 --- a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Tomáš Ehrlich , 2015 -# Vláďa Macek , 2015-2016 +# Vláďa Macek , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-16 22:28+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-21 09:48+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" @@ -27,12 +27,12 @@ msgstr "%(nth)s. položka pole je neplatná:" msgid "Nested arrays must have the same length." msgstr "Vnořená pole musejí mít stejnou délku." -msgid "Map of strings to strings" -msgstr "Asociativní pole řetězcových klíčů na řetězcové hodnoty" +msgid "Map of strings to strings/nulls" +msgstr "Mapování řetězců na řetězce či hodnoty NULL" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Hodnota klíče \"%(key)s\" není řetězec." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Hodnota s klíčem \"%(key)s\" není řetězec ani NULL." msgid "A JSON object" msgstr "Objekt typu JSON" diff --git a/django/contrib/postgres/locale/da/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/da/LC_MESSAGES/django.mo index ac148159c702..ffedabc83f4a 100644 Binary files a/django/contrib/postgres/locale/da/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/da/LC_MESSAGES/django.po b/django/contrib/postgres/locale/da/LC_MESSAGES/django.po index 1bd916aa7a05..4d4201639330 100644 --- a/django/contrib/postgres/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/da/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Erik Wognsen , 2015-2016 +# Erik Wognsen , 2015-2017 # valberg , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-23 00:15+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 22:45+0000\n" "Last-Translator: Erik Wognsen \n" "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" @@ -27,12 +27,12 @@ msgstr "Element %(nth)s i array'et blev ikke valideret." msgid "Nested arrays must have the same length." msgstr "Indlejrede arrays skal have den samme længde." -msgid "Map of strings to strings" -msgstr "Map af strenge til strenge." +msgid "Map of strings to strings/nulls" +msgstr "Afbildning fra strenge til strenge/nulls" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Værdien af \"%(key)s\" er ikke en streng." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Værdien af \"%(key)s\" er ikke en streng eller null." msgid "A JSON object" msgstr "Et JSON-objekt." diff --git a/django/contrib/postgres/locale/de/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/de/LC_MESSAGES/django.mo index 544d4056b190..2a036d21055c 100644 Binary files a/django/contrib/postgres/locale/de/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/de/LC_MESSAGES/django.po b/django/contrib/postgres/locale/de/LC_MESSAGES/django.po index e908d3b35d92..a73da8e41271 100644 --- a/django/contrib/postgres/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/de/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Jannis Leidel , 2015-2016 +# Jannis Leidel , 2015-2017 # Jens Neuhaus , 2016 +# Markus Holtermann , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-26 11:18+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 10:46+0000\n" +"Last-Translator: Markus Holtermann \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" @@ -27,12 +28,12 @@ msgstr "Element %(nth)s des Arrays ist ungültig:" msgid "Nested arrays must have the same length." msgstr "Verschachtelte Arrays müssen die gleiche Länge haben." -msgid "Map of strings to strings" -msgstr "Zuordnung von Zeichenketten zu Zeichenketten" +msgid "Map of strings to strings/nulls" +msgstr "Zuordnung von Zeichenketten zu Zeichenketten/NULLs" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Der Wert von „%(key)s“ ist keine Zeichenkette." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Der Wert für „%(key)s“ ist keine Zeichenkette oder NULL." msgid "A JSON object" msgstr "Ein JSON-Objekt" @@ -48,7 +49,7 @@ msgstr "Eingabe muss ein JSON-Dictionary sein." #, python-format msgid "'%(value)s' value must be valid JSON." -msgstr "‚%(value)s‛ Wert muss gültiges JSON sein." +msgstr "„%(value)s“ Wert muss gültiges JSON sein." msgid "Enter two valid values." msgstr "Bitte zwei gültige Werte eingeben." diff --git a/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.mo index 339cb6d32848..3f636d4a474a 100644 Binary files a/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.po b/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.po index 5d4154d74a41..6a1d77f19a40 100644 --- a/django/contrib/postgres/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/postgres/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-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-18 22:33+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:54+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" "language/dsb/)\n" @@ -28,12 +28,12 @@ msgstr "Element %(nth)s w pólnej wariabli njejo se wobkšuśił:" msgid "Nested arrays must have the same length." msgstr "Zakašćikowane pólne wariable muse tu samsku dłujkosć měś." -msgid "Map of strings to strings" -msgstr "Pśirědowanje znamuškowych rjeśazkow k znamuškowym rjeśazkam" +msgid "Map of strings to strings/nulls" +msgstr "Konwertěrowanje znamuškowych rjeśazkow do znamuškowych rjeśazkow/nulow" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Gódnota „%(key)s“ njejo znamuškowy rjeśazk." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Gódnota \" %(key)s\" njejo znamuškowy rjeśazk abo null." msgid "A JSON object" msgstr "JSON-objekt" diff --git a/django/contrib/postgres/locale/el/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/el/LC_MESSAGES/django.mo index 2fd3f9ec990c..a8e737c5e599 100644 Binary files a/django/contrib/postgres/locale/el/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/el/LC_MESSAGES/django.po b/django/contrib/postgres/locale/el/LC_MESSAGES/django.po index 1cd2ea50f216..fdcc0be51b35 100644 --- a/django/contrib/postgres/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/el/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Giannis Meletakis , 2015 +# Nick Mavrakis , 2017 # Nick Mavrakis , 2016 # Pãnoș , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 14:11+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 11:00+0000\n" "Last-Translator: Nick Mavrakis \n" "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n" "MIME-Version: 1.0\n" @@ -28,12 +29,12 @@ msgstr "To στοιχείο %(nth)s στον πίνακα δεν είναι έγ msgid "Nested arrays must have the same length." msgstr "Οι ένθετοι πίνακες πρέπει να έχουν το ίδιο μήκος." -msgid "Map of strings to strings" -msgstr "Αντιστοίχιση strings σε strings" +msgid "Map of strings to strings/nulls" +msgstr "Αντιστοίχιση strings σε strings/nulls" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Η τιμή του \"%(key)s\" δεν είναι string." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Η τιμή του \"%(key)s\" δεν είναι string ή null." msgid "A JSON object" msgstr "Ένα αντικείμενο JSON" diff --git a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po index 2c0df915d694..0e00e7484b59 100644 --- a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/postgres/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: 2016-07-15 09:44+0200\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" "PO-Revision-Date: 2015-01-18 20:56+0100\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -28,13 +28,13 @@ msgstr "" msgid "Nested arrays must have the same length." msgstr "" -#: contrib/postgres/fields/hstore.py:15 -msgid "Map of strings to strings" +#: contrib/postgres/fields/hstore.py:16 +msgid "Map of strings to strings/nulls" msgstr "" #: contrib/postgres/fields/hstore.py:17 #, python-format -msgid "The value of \"%(key)s\" is not a string." +msgid "The value of \"%(key)s\" is not a string or null." msgstr "" #: contrib/postgres/fields/jsonb.py:15 diff --git a/django/contrib/postgres/locale/eo/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/eo/LC_MESSAGES/django.mo index b235a38bfb5d..440e222a9703 100644 Binary files a/django/contrib/postgres/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/eo/LC_MESSAGES/django.po b/django/contrib/postgres/locale/eo/LC_MESSAGES/django.po index 88100524a4af..d3068dd66610 100644 --- a/django/contrib/postgres/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/eo/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Baptiste Darthenay , 2015-2016 +# Baptiste Darthenay , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-28 11:07+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-22 00:04+0000\n" "Last-Translator: Baptiste Darthenay \n" "Language-Team: Esperanto (http://www.transifex.com/django/django/language/" "eo/)\n" @@ -27,12 +27,12 @@ msgstr "Ero %(nth)s en la tabelo ne validiĝis:" msgid "Nested arrays must have the same length." msgstr "Ingitaj tabeloj devas havi la saman grandon." -msgid "Map of strings to strings" -msgstr "Mapigo de signoĉenoj al signoĉenoj" +msgid "Map of strings to strings/nulls" +msgstr "Kongruo de signoĉenoj al signoĉenoj/nulvaloroj" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "La valoro de \"%(key)s\" ne estas signoĉeno." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "La valoro de \"%(key)s\" ne estas signoĉeno nek nulvaloro." msgid "A JSON object" msgstr "JSON objekto" diff --git a/django/contrib/postgres/locale/es/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/es/LC_MESSAGES/django.mo index 65353c270bce..eba779ae2d55 100644 Binary files a/django/contrib/postgres/locale/es/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/es/LC_MESSAGES/django.po b/django/contrib/postgres/locale/es/LC_MESSAGES/django.po index b56e8490b868..c55de4ecf49d 100644 --- a/django/contrib/postgres/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/es/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Antoni Aloy , 2015 +# Antoni Aloy , 2015,2017 # Ernesto Avilés Vázquez , 2015 # Igor Támara , 2015 # Pablo, 2015 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-14 07:10+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Spanish (http://www.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -31,12 +31,12 @@ msgstr "El elemento %(nth)s del arreglo no se pudo validar:" msgid "Nested arrays must have the same length." msgstr "Los arreglos anidados deben tener la misma longitud." -msgid "Map of strings to strings" -msgstr "Mapa de cadenas a cadenas" +msgid "Map of strings to strings/nulls" +msgstr "Mapa de cadenas a cadenas/nulos" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "El valor de \"%(key)s\" no es una cadena." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "El valor de \"%(key)s\" no es ni una cadena ni un nulo" msgid "A JSON object" msgstr "Un objeto JSON" @@ -48,7 +48,7 @@ msgid "Could not load JSON data." msgstr "No se pududieron cargar los datos JSON." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "La entrada debe ser un diccionario JSON" #, python-format msgid "'%(value)s' value must be valid JSON." diff --git a/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.mo index bdd1a468343f..d31519ee453f 100644 Binary files a/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.po index 8a0619cdcb8a..0d77d40d453a 100644 --- a/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/es_AR/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Ramiro Morales, 2015-2016 +# Ramiro Morales, 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-30 23:46+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-23 14:23+0000\n" "Last-Translator: Ramiro Morales\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/" "language/es_AR/)\n" @@ -27,12 +27,12 @@ msgstr "La validación del ítem %(nth)s del arreglo falló:" msgid "Nested arrays must have the same length." msgstr "Los arreglos anidados deben ser de la misma longitud." -msgid "Map of strings to strings" -msgstr "Mapeo de cadenas a cadenas" +msgid "Map of strings to strings/nulls" +msgstr "Mapa de cadenas a cadenas/nulos" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "El valor de \"%(key)s\" no es una cadena." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "El valor de \"%(key)s\" no es una cadena o nulo." msgid "A JSON object" msgstr "Un objeto JSON" diff --git a/django/contrib/postgres/locale/et/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/et/LC_MESSAGES/django.mo index 5ee1be5abe12..54df46d2966b 100644 Binary files a/django/contrib/postgres/locale/et/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/et/LC_MESSAGES/django.po b/django/contrib/postgres/locale/et/LC_MESSAGES/django.po index df151f8676b8..280b29e0e906 100644 --- a/django/contrib/postgres/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/et/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Martin Pajuste , 2015 +# Martin Pajuste , 2017 # Marti Raudsepp , 2015-2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-18 21:31+0000\n" -"Last-Translator: Marti Raudsepp \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-28 13:30+0000\n" +"Last-Translator: Martin Pajuste \n" "Language-Team: Estonian (http://www.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -28,12 +29,12 @@ msgstr "Selement %(nth)s massiivis pole korrektne:" msgid "Nested arrays must have the same length." msgstr "Mitmemõõtmelised massiivid peavad olema sama pikad." -msgid "Map of strings to strings" -msgstr "Teisendus stringidest stringideks" +msgid "Map of strings to strings/nulls" +msgstr "" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Võtme \"%(key)s\" väärtus ei ole string." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Võtme \"%(key)s\" väärtus ei ole string ega tühi." msgid "A JSON object" msgstr "JSON objekt" diff --git a/django/contrib/postgres/locale/eu/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/eu/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..f69a10dc1e69 Binary files /dev/null and b/django/contrib/postgres/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/eu/LC_MESSAGES/django.po b/django/contrib/postgres/locale/eu/LC_MESSAGES/django.po new file mode 100644 index 000000000000..5c2559e7984c --- /dev/null +++ b/django/contrib/postgres/locale/eu/LC_MESSAGES/django.po @@ -0,0 +1,107 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Eneko Illarramendi , 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-03-22 15:02+0000\n" +"Last-Translator: Eneko Illarramendi \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" +"Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "PostgreSQL extensions" +msgstr "" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "Array-ko %(nth)s elementua ez da balekoa:" + +msgid "Nested arrays must have the same length." +msgstr "" + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\"-ren balioa ez da string bat, edo null." + +msgid "A JSON object" +msgstr "JSON objetu bat" + +msgid "Value must be valid JSON." +msgstr "Balioa ez da baleko JSON bat." + +msgid "Could not load JSON data." +msgstr "" + +msgid "Input must be a JSON dictionary." +msgstr "" + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "'%(value)s' balioa ez da baleko JSON bat." + +msgid "Enter two valid values." +msgstr "Idatzi bi baleko balio." + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "Idatzi bi zenbaki oso." + +msgid "Enter two numbers." +msgstr "Idatzi bi zenbaki." + +msgid "Enter two valid date/times." +msgstr "Idatzi bi baleko data/ordu." + +msgid "Enter two valid dates." +msgstr "Idatzi bi baleko data." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/fi/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/fi/LC_MESSAGES/django.mo index c4c7e1d968d5..1136fb130cee 100644 Binary files a/django/contrib/postgres/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/fi/LC_MESSAGES/django.po b/django/contrib/postgres/locale/fi/LC_MESSAGES/django.po index 2fd8eb40ff86..76cfe9887241 100644 --- a/django/contrib/postgres/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/fi/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Aarni Koskela, 2015 +# Aarni Koskela, 2015,2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 12:03+0000\n" +"Last-Translator: Aarni Koskela\n" "Language-Team: Finnish (http://www.transifex.com/django/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -27,12 +27,12 @@ msgstr "Taulukon %(nth)s alkio ei ole kelvollinen:" msgid "Nested arrays must have the same length." msgstr "Sisäkkäisillä taulukoilla tulee olla sama pituus." -msgid "Map of strings to strings" -msgstr "Kartta merkkijonoista merkkijonoihin" +msgid "Map of strings to strings/nulls" +msgstr "Kartta merkkijonoista merkkijonoihin tai tyhjiin (null)" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Avain \"%(key)s\" ei ole merkkijono." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Avaimen \"%(key)s\" arvo ei ole merkkijono tai tyhjä (null)." msgid "A JSON object" msgstr "JSON-tietue" @@ -44,7 +44,7 @@ msgid "Could not load JSON data." msgstr "JSON-dataa ei voitu ladata." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "Syötteen tulee olla JSON-sanakirja." #, python-format msgid "'%(value)s' value must be valid JSON." diff --git a/django/contrib/postgres/locale/fr/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/fr/LC_MESSAGES/django.mo index add870c83d84..65bab8096954 100644 Binary files a/django/contrib/postgres/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/fr/LC_MESSAGES/django.po b/django/contrib/postgres/locale/fr/LC_MESSAGES/django.po index b2e9b9cc2e1e..cd1dbd78e292 100644 --- a/django/contrib/postgres/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/fr/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2015-2016 +# Claude Paroz , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 15:46+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 14:48+0000\n" "Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" @@ -26,12 +26,12 @@ msgstr "L'élément n°%(nth)s du tableau n'est pas valide :" msgid "Nested arrays must have the same length." msgstr "Les tableaux imbriqués doivent être de même longueur." -msgid "Map of strings to strings" -msgstr "Correspondances clé/valeur (chaînes)" +msgid "Map of strings to strings/nulls" +msgstr "Correspondances clé/valeur (chaînes ou valeurs nulles)" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "La valeur de « %(key)s » n'est pas une chaîne." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "La valeur de « %(key)s » n'est pas une chaîne, ni une valeur nulle." msgid "A JSON object" msgstr "Un objet JSON" diff --git a/django/contrib/postgres/locale/gd/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/gd/LC_MESSAGES/django.mo index 9e433d9059f1..e73533e92be7 100644 Binary files a/django/contrib/postgres/locale/gd/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/gd/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/gd/LC_MESSAGES/django.po b/django/contrib/postgres/locale/gd/LC_MESSAGES/django.po index 42534edf9cbd..d0d3031e9252 100644 --- a/django/contrib/postgres/locale/gd/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/gd/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# GunChleoc, 2016 +# GunChleoc, 2016-2017 # GunChleoc, 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 10:28+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 11:04+0000\n" "Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/django/django/" "language/gd/)\n" @@ -29,12 +29,12 @@ msgstr "Cha deach le dearbhadh an nì %(nth)s san arraigh: " msgid "Nested arrays must have the same length." msgstr "Feumaidh an aon fhaid a bhith aig a h-uile arraigh neadaichte." -msgid "Map of strings to strings" -msgstr "Mapaichean de shreangan gu sreangan" +msgid "Map of strings to strings/nulls" +msgstr "Mapaichean de shreangan gu sreangan/luachan null" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Chan eil an luach air “%(key)s” ’na shreang." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Chan eil an luach air “%(key)s” ’na shreang no null." msgid "A JSON object" msgstr "Oibjeact JSON" diff --git a/django/contrib/postgres/locale/gl/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/gl/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..5e5e018b1608 Binary files /dev/null and b/django/contrib/postgres/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/gl/LC_MESSAGES/django.po b/django/contrib/postgres/locale/gl/LC_MESSAGES/django.po new file mode 100644 index 000000000000..b8cc626b1a47 --- /dev/null +++ b/django/contrib/postgres/locale/gl/LC_MESSAGES/django.po @@ -0,0 +1,108 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# fasouto , 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-03-28 16:28+0000\n" +"Last-Translator: fasouto \n" +"Language-Team: Galician (http://www.transifex.com/django/django/language/" +"gl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "PostgreSQL extensions" +msgstr "" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "" + +msgid "Nested arrays must have the same length." +msgstr "" + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" + +msgid "A JSON object" +msgstr "Un obxecto JSON" + +msgid "Value must be valid JSON." +msgstr "O valor debe ser JSON válido." + +msgid "Could not load JSON data." +msgstr "" + +msgid "Input must be a JSON dictionary." +msgstr "" + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "" + +msgid "Enter two valid values." +msgstr "" + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "" + +msgid "Enter two numbers." +msgstr "Insira dous números." + +msgid "Enter two valid date/times." +msgstr "" + +msgid "Enter two valid dates." +msgstr "Insira dúas datas válidas." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/he/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/he/LC_MESSAGES/django.mo index f1e1399c00e1..16d3f7feb400 100644 Binary files a/django/contrib/postgres/locale/he/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/he/LC_MESSAGES/django.po b/django/contrib/postgres/locale/he/LC_MESSAGES/django.po index da27aaff0a9a..23fa99d357de 100644 --- a/django/contrib/postgres/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/he/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Meir Kriheli , 2015 +# Meir Kriheli , 2015,2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-01 14:42+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,12 +26,12 @@ msgstr "פריט %(nth)s במערך לא עבר בדיקת חוקיות: " msgid "Nested arrays must have the same length." msgstr "מערכים מקוננים חייבים להיות באותו האורך." -msgid "Map of strings to strings" -msgstr "מיפוי מחרוזות אל מחרוזות." +msgid "Map of strings to strings/nulls" +msgstr "מיפוי מחרוזות אל מחרוזות/nulls." #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "הערך של \"%(key)s\" אינו מחרוזת." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "הערך של \"%(key)s\" אינו מחרוזת או null." msgid "A JSON object" msgstr "אובייקט JSON" @@ -43,7 +43,7 @@ msgid "Could not load JSON data." msgstr "לא ניתן לטעון מידע JSON." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "הקלט חייב להיות מילון JSON." #, python-format msgid "'%(value)s' value must be valid JSON." diff --git a/django/contrib/postgres/locale/hr/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/hr/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..482142e9e7b0 Binary files /dev/null and b/django/contrib/postgres/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/hr/LC_MESSAGES/django.po b/django/contrib/postgres/locale/hr/LC_MESSAGES/django.po new file mode 100644 index 000000000000..c2411e2621b6 --- /dev/null +++ b/django/contrib/postgres/locale/hr/LC_MESSAGES/django.po @@ -0,0 +1,112 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Filip Cuk , 2016 +# Mislav Cimperšak , 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-01-20 09:32+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Croatian (http://www.transifex.com/django/django/language/" +"hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\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" + +msgid "PostgreSQL extensions" +msgstr "" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "" + +msgid "Nested arrays must have the same length." +msgstr "" + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" + +msgid "A JSON object" +msgstr "JSON objekt" + +msgid "Value must be valid JSON." +msgstr "Vrijednost mora biti ispravan JSON" + +msgid "Could not load JSON data." +msgstr "JSON podatci neuspješno učitani." + +msgid "Input must be a JSON dictionary." +msgstr "" + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "'%(value)s' vrijednost mora biti ispravan JSON." + +msgid "Enter two valid values." +msgstr "Unesite 2 ispravne vrijednosti." + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "Unesite dva cijela broja." + +msgid "Enter two numbers." +msgstr "Unesite dva broja." + +msgid "Enter two valid date/times." +msgstr "Unesite dva ispravna datuma/vremena." + +msgid "Enter two valid dates." +msgstr "Unesite dva ispravna datuma." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.mo index 8aa09383fabc..5ca88fc76725 100644 Binary files a/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.po b/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.po index 758635468243..702bca9ebd59 100644 --- a/django/contrib/postgres/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/postgres/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 +# Michael Wolf , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-18 22:34+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-08 20:54+0000\n" "Last-Translator: Michael Wolf \n" "Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" "language/hsb/)\n" @@ -28,12 +28,12 @@ msgstr "Element %(nth)s w pólnej wariabli njeje so wobkrućił:" msgid "Nested arrays must have the same length." msgstr "Zakašćikowane pólne wariable maja samsnu dołhosć." -msgid "Map of strings to strings" -msgstr "Přirjadowanje znamješkowych rjećazkow k znamješkowym rjećazkam" +msgid "Map of strings to strings/nulls" +msgstr "Konwertowanje znamješkowych rjećazkow do znamješkowych rjećazkow/nulow" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Hódnota „%(key)s“ znamješkowy rjećazk njeje." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Hódnota \" %(key)s\" znamješkowy rjećazk abo null njeje." msgid "A JSON object" msgstr "JSON-objekt" diff --git a/django/contrib/postgres/locale/hu/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/hu/LC_MESSAGES/django.mo index d56020c63c9e..7e0f582f88b9 100644 Binary files a/django/contrib/postgres/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/hu/LC_MESSAGES/django.po b/django/contrib/postgres/locale/hu/LC_MESSAGES/django.po index 695c56b3cd54..243eddfe0238 100644 --- a/django/contrib/postgres/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/hu/LC_MESSAGES/django.po @@ -2,13 +2,15 @@ # # Translators: # András Veres-Szentkirályi, 2016 +# Dóra Szendrei , 2017 +# János Péter Ronkay , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-19 07:41+0000\n" -"Last-Translator: András Veres-Szentkirályi\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-24 11:24+0000\n" +"Last-Translator: Dóra Szendrei \n" "Language-Team: Hungarian (http://www.transifex.com/django/django/language/" "hu/)\n" "MIME-Version: 1.0\n" @@ -27,12 +29,12 @@ msgstr "A tömb %(nth)s. értéke érvénytelen:" msgid "Nested arrays must have the same length." msgstr "A belső tömböknek egyforma hosszúaknak kell lenniük." -msgid "Map of strings to strings" -msgstr "String-string leképezés" +msgid "Map of strings to strings/nulls" +msgstr "String-string/null leképezés" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "A(z) \"%(key)s\" érték nem string." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\" értéke nem karakterlánc vagy null." msgid "A JSON object" msgstr "Egy JSON objektum" diff --git a/django/contrib/postgres/locale/ia/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ia/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..102a45befec4 Binary files /dev/null and b/django/contrib/postgres/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ia/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ia/LC_MESSAGES/django.po new file mode 100644 index 000000000000..7cda99f2febf --- /dev/null +++ b/django/contrib/postgres/locale/ia/LC_MESSAGES/django.po @@ -0,0 +1,108 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Martijn Dekker , 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-01-20 09:32+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Interlingua (http://www.transifex.com/django/django/language/" +"ia/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ia\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "PostgreSQL extensions" +msgstr "Extensiones PostgreSQL" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "Le elemento %(nth)s in le array non passava validation:" + +msgid "Nested arrays must have the same length." +msgstr "Arrays annidate debe haber le mesme longitude." + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" + +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + +msgid "Could not load JSON data." +msgstr "" + +msgid "Input must be a JSON dictionary." +msgstr "" + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "" + +msgid "Enter two valid values." +msgstr "" + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "" + +msgid "Enter two numbers." +msgstr "" + +msgid "Enter two valid date/times." +msgstr "" + +msgid "Enter two valid dates." +msgstr "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo index 758e8b48aa46..45f5932e2f31 100644 Binary files a/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/id/LC_MESSAGES/django.po b/django/contrib/postgres/locale/id/LC_MESSAGES/django.po index 24dcd84797f1..a3a51bfd7350 100644 --- a/django/contrib/postgres/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/id/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Fery Setiawan , 2015-2016 +# Fery Setiawan , 2015-2017 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi (OonID) , 2016 +# rodin , 2016 # Sutrisno Efendi , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-08-23 04:54+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-05 13:13+0000\n" "Last-Translator: Fery Setiawan \n" "Language-Team: Indonesian (http://www.transifex.com/django/django/language/" "id/)\n" @@ -25,23 +26,23 @@ msgstr "Ekstensi PostgreSQL" #, python-format msgid "Item %(nth)s in the array did not validate: " -msgstr "butir %(nth)s di dalam susunan tidak disahkan:" +msgstr "Item %(nth)s di dalam array tidak divalidasi:" msgid "Nested arrays must have the same length." -msgstr "Array bersarang harus mempunyai panjang sama." +msgstr "Array bersaran harus mempunyai panjang yang sama." -msgid "Map of strings to strings" -msgstr "Pemetaan dari strings ke strings" +msgid "Map of strings to strings/nulls" +msgstr "Pemetaan dari strings ke string/null" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Sebuah nilai dari \"%(key)s\" bukan sebuah untaian." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Nilai dari \"%(key)s\" adalah bukan sebuah string atau null." msgid "A JSON object" -msgstr "Sebuah obyek JSON" +msgstr "Obyek JSON" msgid "Value must be valid JSON." -msgstr "Nilai harus JSON sah." +msgstr "Nilai harus berupa JSON yang valid." msgid "Could not load JSON data." msgstr "Tidak dapat memuat data JSON." @@ -51,10 +52,10 @@ msgstr "Masukan harus kamus JSON." #, python-format msgid "'%(value)s' value must be valid JSON." -msgstr "Nilai '%(value)s' harus JSON sah." +msgstr "Nilai '%(value)s' harus berupa JSON yang valid." msgid "Enter two valid values." -msgstr "Masukkan dua nilai yang benar" +msgstr "Masukkan dua nilai yang valid." msgid "The start of the range must not exceed the end of the range." msgstr "Awal jangkauan harus tidak melebihi akhir dari jangkauan." @@ -66,10 +67,10 @@ msgid "Enter two numbers." msgstr "Masukkan dua buah bilangan." msgid "Enter two valid date/times." -msgstr "Masukan dua buah tanggal/waktu" +msgstr "Masukan dua buah tanggal/waktu." msgid "Enter two valid dates." -msgstr "Masukan dua buah tanggal yang benar" +msgstr "Masukan dua buah tanggal yang benar." #, python-format msgid "" @@ -79,8 +80,8 @@ msgid_plural "" "List contains %(show_value)d items, it should contain no more than " "%(limit_value)d." msgstr[0] "" -"Daftar mengandung barang %(show_value)d, dia harus mengandung tidak lebih " -"dari %(limit_value)d." +"Daftar mengandung %(show_value)d item, dia harus mengandung tidak lebih dari " +"%(limit_value)d." #, python-format msgid "" diff --git a/django/contrib/postgres/locale/is/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/is/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..49e30952d32f Binary files /dev/null and b/django/contrib/postgres/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/is/LC_MESSAGES/django.po b/django/contrib/postgres/locale/is/LC_MESSAGES/django.po new file mode 100644 index 000000000000..9b2a04bb31ea --- /dev/null +++ b/django/contrib/postgres/locale/is/LC_MESSAGES/django.po @@ -0,0 +1,118 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Thordur Sigurdsson , 2016-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-02-04 04:14+0000\n" +"Last-Translator: Thordur Sigurdsson \n" +"Language-Team: Icelandic (http://www.transifex.com/django/django/language/" +"is/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: is\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" + +msgid "PostgreSQL extensions" +msgstr "PostgreSQL viðbætur" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "Hlutur %(nth)s í listanum er ógildur:" + +msgid "Nested arrays must have the same length." +msgstr "Faldaðir (nested) listar verða að vera af sömu lengd." + +msgid "Map of strings to strings/nulls" +msgstr "Möppun strengja í strengi/null" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Gildið á \"%(key)s\" er ekki strengur eða null." + +msgid "A JSON object" +msgstr "JSON hlutur" + +msgid "Value must be valid JSON." +msgstr "Gildi verður að vera gilt JSON." + +msgid "Could not load JSON data." +msgstr "Gat ekki hlaðið inn JSON gögnum." + +msgid "Input must be a JSON dictionary." +msgstr "Inntak verður að vera JSON hlutur (dictionary)." + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "Gildi '%(value)s' verður að vera gilt JSON." + +msgid "Enter two valid values." +msgstr "Sláðu inn tvö gild gildi." + +msgid "The start of the range must not exceed the end of the range." +msgstr "Upphaf bils má ekki ná yfir endalok bils." + +msgid "Enter two whole numbers." +msgstr "Sláðu inn tvær heilar tölur." + +msgid "Enter two numbers." +msgstr "Sláðu inn tvær tölur." + +msgid "Enter two valid date/times." +msgstr "Sláðu inn tvær gildar dagsetningar ásamt tíma." + +msgid "Enter two valid dates." +msgstr "Sláðu inn tvær gildar dagsetningar." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +"Listinn inniheldur %(show_value)d hlut, en má ekki innihalda fleiri en " +"%(limit_value)d." +msgstr[1] "" +"Listinn inniheldur %(show_value)d hluti, en má ekki innihalda fleiri en " +"%(limit_value)d." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +"Listinn inniheldur %(show_value)d hlut, en má ekki innihalda færri en " +"%(limit_value)d." +msgstr[1] "" +"Listinn inniheldur %(show_value)d hluti, en má ekki innihalda færri en " +"%(limit_value)d." + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "Þessa lykla vantar: %(keys)s" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "Þessir óþekktu lyklar fundust: %(keys)s" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" +"Gakktu úr skugga um að þetta bil sé minna eða jafnt og %(limit_value)s." + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" +"Gakktu úr skugga um að þetta bil sé stærra eða jafnt og %(limit_value)s." diff --git a/django/contrib/postgres/locale/it/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/it/LC_MESSAGES/django.mo index f628d6d0884f..dcaf5cbf793e 100644 Binary files a/django/contrib/postgres/locale/it/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/it/LC_MESSAGES/django.po b/django/contrib/postgres/locale/it/LC_MESSAGES/django.po index 3cdea7f96705..9523a936b167 100644 --- a/django/contrib/postgres/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/it/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# bbstuntman , 2017 # Flavio Curella , 2016 # palmux , 2015 # Mattia Procopio , 2015 @@ -9,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-28 11:37+0000\n" -"Last-Translator: Stefano Brentegani \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-19 07:22+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/django/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -30,12 +31,12 @@ msgstr "L'elemento %(nth)s dell'array non ha superato la validazione:" msgid "Nested arrays must have the same length." msgstr "Gli array annidati devono avere la stessa lunghezza." -msgid "Map of strings to strings" -msgstr "Mappa di stringhe a stringhe" +msgid "Map of strings to strings/nulls" +msgstr "Mappa di stringhe a stringhe/null" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Il valore di \"%(key)s\" non corrisponde a una stringa." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Il valore di \"%(key)s\" non è una stringa o nullo." msgid "A JSON object" msgstr "Un oggetto JSON" diff --git a/django/contrib/postgres/locale/ja/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ja/LC_MESSAGES/django.mo index a511e7fa132a..da516f3d81e6 100644 Binary files a/django/contrib/postgres/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ja/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ja/LC_MESSAGES/django.po index 6f7bcc3a8d84..de5b4a99f566 100644 --- a/django/contrib/postgres/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/ja/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Shinya Okano , 2015-2016 +# Shinya Okano , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-21 13:53+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-25 09:55+0000\n" "Last-Translator: Shinya Okano \n" "Language-Team: Japanese (http://www.transifex.com/django/django/language/" "ja/)\n" @@ -27,12 +27,12 @@ msgstr "配列内のアイテム %(nth)s は検証できませんでした:" msgid "Nested arrays must have the same length." msgstr "ネストした配列は同じ長さにしなければなりません。" -msgid "Map of strings to strings" -msgstr "文字列と文字列のマップ" +msgid "Map of strings to strings/nulls" +msgstr "文字列と文字列/NULLのマップ" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "\"%(key)s\" の値は文字列ではありません。" +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\" の値は文字列または NULL ではありません。" msgid "A JSON object" msgstr "JSONオブジェクト" diff --git a/django/contrib/postgres/locale/kk/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/kk/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..ddfe8d67555b Binary files /dev/null and b/django/contrib/postgres/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/kk/LC_MESSAGES/django.po b/django/contrib/postgres/locale/kk/LC_MESSAGES/django.po new file mode 100644 index 000000000000..fe0e397b95db --- /dev/null +++ b/django/contrib/postgres/locale/kk/LC_MESSAGES/django.po @@ -0,0 +1,105 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Leo Trubach , 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-01-20 09:32+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "PostgreSQL extensions" +msgstr "PostgreSQL кеңейтулері" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "Ауқым %(nth)s элементінің сенімділігі расталмаған" + +msgid "Nested arrays must have the same length." +msgstr "Бір-бірін ішіне салынған ауқымдардың ұзындықтары бірдей болу керек" + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" + +msgid "A JSON object" +msgstr "" + +msgid "Value must be valid JSON." +msgstr "" + +msgid "Could not load JSON data." +msgstr "" + +msgid "Input must be a JSON dictionary." +msgstr "" + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "" + +msgid "Enter two valid values." +msgstr "" + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "" + +msgid "Enter two numbers." +msgstr "" + +msgid "Enter two valid date/times." +msgstr "" + +msgid "Enter two valid dates." +msgstr "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/lt/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/lt/LC_MESSAGES/django.mo index 406be50f2b09..deea950ea556 100644 Binary files a/django/contrib/postgres/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/lt/LC_MESSAGES/django.po b/django/contrib/postgres/locale/lt/LC_MESSAGES/django.po index f61a9235deb9..3ffd07e15f8c 100644 --- a/django/contrib/postgres/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/lt/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Matas Dailyda , 2015-2016 +# Matas Dailyda , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-18 09:08+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-30 14:07+0000\n" "Last-Translator: Matas Dailyda \n" "Language-Team: Lithuanian (http://www.transifex.com/django/django/language/" "lt/)\n" @@ -28,12 +28,12 @@ msgstr "Masyve nevalidus %(nth)s elementas: " msgid "Nested arrays must have the same length." msgstr "Iterpti vienas į kitą masyvai turi būti vienodo ilgio." -msgid "Map of strings to strings" -msgstr "Teksto eilučių \"string\" į teksto eilutes sąsaja" +msgid "Map of strings to strings/nulls" +msgstr "Susietos tekstinės reikšmės su tekstinėmis reikšmėmis/nulls" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "\"%(key)s\" reikšmė nėra teksto eilutė \"string\"." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\" reikšmė nėra tekstinė arba null." msgid "A JSON object" msgstr "JSON objektas" diff --git a/django/contrib/postgres/locale/lv/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/lv/LC_MESSAGES/django.mo new file mode 100644 index 000000000000..6c5c328db78f Binary files /dev/null and b/django/contrib/postgres/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/lv/LC_MESSAGES/django.po b/django/contrib/postgres/locale/lv/LC_MESSAGES/django.po new file mode 100644 index 000000000000..362d6bddaec8 --- /dev/null +++ b/django/contrib/postgres/locale/lv/LC_MESSAGES/django.po @@ -0,0 +1,111 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# peterisb , 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-01-20 09:32+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Latvian (http://www.transifex.com/django/django/language/" +"lv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +msgid "PostgreSQL extensions" +msgstr "PostgreSQL paplašinājums" + +#, python-format +msgid "Item %(nth)s in the array did not validate: " +msgstr "" + +msgid "Nested arrays must have the same length." +msgstr "" + +msgid "Map of strings to strings/nulls" +msgstr "" + +#, python-format +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "" + +msgid "A JSON object" +msgstr "JSON objekts" + +msgid "Value must be valid JSON." +msgstr "Vērtībai ir jābūt derīgam JSON." + +msgid "Could not load JSON data." +msgstr "Nevarēja ielādēt JSON datus." + +msgid "Input must be a JSON dictionary." +msgstr "Ieejošajiem datiem ir jābūt JSON vārdnīcai." + +#, python-format +msgid "'%(value)s' value must be valid JSON." +msgstr "" + +msgid "Enter two valid values." +msgstr "" + +msgid "The start of the range must not exceed the end of the range." +msgstr "" + +msgid "Enter two whole numbers." +msgstr "" + +msgid "Enter two numbers." +msgstr "" + +msgid "Enter two valid date/times." +msgstr "" + +msgid "Enter two valid dates." +msgstr "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely less than or equal to %(limit_value)s." +msgstr "" + +#, python-format +msgid "" +"Ensure that this range is completely greater than or equal to " +"%(limit_value)s." +msgstr "" diff --git a/django/contrib/postgres/locale/mk/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/mk/LC_MESSAGES/django.mo index e57ff1178ab6..9c81baf15bda 100644 Binary files a/django/contrib/postgres/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/mk/LC_MESSAGES/django.po b/django/contrib/postgres/locale/mk/LC_MESSAGES/django.po index 8cd03978a0cd..f07c1a596c9b 100644 --- a/django/contrib/postgres/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/mk/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # dekomote , 2015 -# Vasil Vangelovski , 2015-2016 +# Vasil Vangelovski , 2015-2017 # Vasil Vangelovski , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-05 09:18+0000\n" +"Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/django/django/language/" "mk/)\n" "MIME-Version: 1.0\n" @@ -29,12 +29,12 @@ msgstr "Членот %(nth)s на низата не помина валидац msgid "Nested arrays must have the same length." msgstr "Вгнездени низи мораат да имаат иста должина." -msgid "Map of strings to strings" -msgstr "Асоцијативна низа на текстуален податок со текстуален податок." +msgid "Map of strings to strings/nulls" +msgstr "" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Вредноста за \"%(key)s\" не е низа од знаци." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Вредноста за \"%(key)s\" не е низа од знаци или ништо (null)." msgid "A JSON object" msgstr "JSON објект" diff --git a/django/contrib/postgres/locale/nl/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/nl/LC_MESSAGES/django.mo index 0766cc122183..0eb938222f83 100644 Binary files a/django/contrib/postgres/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/nl/LC_MESSAGES/django.po b/django/contrib/postgres/locale/nl/LC_MESSAGES/django.po index 202a98e487ea..670fd2618104 100644 --- a/django/contrib/postgres/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/nl/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Evelijn Saaltink , 2016 # Ilja Maas , 2015 -# Sander Steffann , 2015 +# Sander Steffann , 2015 +# Tonnes , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-05-02 10:48+0000\n" +"Last-Translator: Tonnes \n" "Language-Team: Dutch (http://www.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "PostgreSQL extensions" -msgstr "PostgreSQL uitbreidingen" +msgstr "PostgreSQL-extensies" #, python-format msgid "Item %(nth)s in the array did not validate: " @@ -27,47 +29,47 @@ msgstr "Item %(nth)s in de lijst werd niet gevalideerd:" msgid "Nested arrays must have the same length." msgstr "Lijsten met meerdere lagen moeten allemaal dezelfde lengte hebben." -msgid "Map of strings to strings" -msgstr "Vertaling van strings naar strings" +msgid "Map of strings to strings/nulls" +msgstr "Toewijzing van tekenreeksen naar tekenreeksen/nulwaarden" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "De waarde van \"%(key)s\" is geen string." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "De waarde van '%(key)s' is geen tekenreeks of nul." msgid "A JSON object" -msgstr "Een JSON object" +msgstr "Een JSON-object" msgid "Value must be valid JSON." msgstr "De waarde moet valide JSON zijn." msgid "Could not load JSON data." -msgstr "Kon de JSON gegevens niet inlezen." +msgstr "Kon JSON-gegevens niet laden." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "Invoer moet een JSON-bibliotheek zijn." #, python-format msgid "'%(value)s' value must be valid JSON." -msgstr "'%(value)s' waarde moet valide JSON zijn." +msgstr "Waarde '%(value)s' moet geldige JSON zijn." msgid "Enter two valid values." -msgstr "Geef twee geldige waarden op." +msgstr "Voer twee geldige waarden in." msgid "The start of the range must not exceed the end of the range." msgstr "" -"Het begin van het bereik mag niet groter zijn dan het eind van het bereik." +"Het begin van het bereik mag niet groter zijn dan het einde van het bereik." msgid "Enter two whole numbers." -msgstr "Geef twee gehele getallen op." +msgstr "Voer twee gehele getallen in." msgid "Enter two numbers." -msgstr "Geef twee getallen op." +msgstr "Voer twee getallen in." msgid "Enter two valid date/times." -msgstr "Geef twee geldige datums/tijden op." +msgstr "Voer twee geldige datums/tijden in." msgid "Enter two valid dates." -msgstr "Geef twee geldige datums op." +msgstr "Voer twee geldige datums in." #, python-format msgid "" @@ -77,10 +79,10 @@ msgid_plural "" "List contains %(show_value)d items, it should contain no more than " "%(limit_value)d." msgstr[0] "" -"Lijst bevat %(show_value)d element maar mag niet meer dan %(limit_value)d " +"Lijst bevat %(show_value)d element, maar mag niet meer dan %(limit_value)d " "elementen bevatten." msgstr[1] "" -"Lijst bevat %(show_value)d elementen maar mag niet meer dan %(limit_value)d " +"Lijst bevat %(show_value)d elementen, maar mag niet meer dan %(limit_value)d " "elementen bevatten." #, python-format @@ -91,27 +93,29 @@ msgid_plural "" "List contains %(show_value)d items, it should contain no fewer than " "%(limit_value)d." msgstr[0] "" -"Lijst bevat %(show_value)d element maar mag niet minder dan %(limit_value)d " +"Lijst bevat %(show_value)d element, maar mag niet minder dan %(limit_value)d " "elementen bevatten." msgstr[1] "" -"Lijst bevat %(show_value)d elementen maar mag niet minder dan " +"Lijst bevat %(show_value)d elementen, maar mag niet minder dan " "%(limit_value)d elementen bevatten." #, python-format msgid "Some keys were missing: %(keys)s" -msgstr "Sommige sleutels missen: %(keys)s" +msgstr "Sommige sleutels ontbreken: %(keys)s" #, python-format msgid "Some unknown keys were provided: %(keys)s" -msgstr "Een aantal onbekende sleutels werden opgegeven: %(keys)s" +msgstr "Er zijn enkele onbekende sleutels opgegeven: %(keys)s" #, python-format msgid "" "Ensure that this range is completely less than or equal to %(limit_value)s." -msgstr "Controleer dat dit bereik minder dan of gelijk is aan %(limit_value)s." +msgstr "" +"Zorg ervoor dat dit bereik minder dan of gelijk is aan %(limit_value)s." #, python-format msgid "" "Ensure that this range is completely greater than or equal to " "%(limit_value)s." -msgstr "Controleer dat dit bereik groter dan of gelijk is aan %(limit_value)s." +msgstr "" +"Zorg ervoor dat dit bereik groter dan of gelijk is aan %(limit_value)s." diff --git a/django/contrib/postgres/locale/pl/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/pl/LC_MESSAGES/django.mo index d87987184f73..c1fbd8598e19 100644 Binary files a/django/contrib/postgres/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/pl/LC_MESSAGES/django.po b/django/contrib/postgres/locale/pl/LC_MESSAGES/django.po index fc2f19fe4a12..1b87ef3ec855 100644 --- a/django/contrib/postgres/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/pl/LC_MESSAGES/django.po @@ -4,73 +4,75 @@ # Dariusz Paluch , 2015 # Janusz Harkot , 2015 # Piotr Jakimiak , 2015 -# m_aciek , 2016 +# m_aciek , 2016-2017 # m_aciek , 2015 +# Tomasz Kajtoch , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-20 21:29+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 11:07+0000\n" "Last-Translator: m_aciek \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "PostgreSQL extensions" msgstr "Rozszerzenia PostgreSQL" #, python-format msgid "Item %(nth)s in the array did not validate: " -msgstr "Element %(nth)s tablicy jest nieprawidłowy:" +msgstr "Element %(nth)s w tablicy nie przeszedł walidacji:" msgid "Nested arrays must have the same length." msgstr "Zagnieżdżone tablice muszą mieć tę samą długość." -msgid "Map of strings to strings" -msgstr "Mapowanie ciągów znaków na ciąg znaków" +msgid "Map of strings to strings/nulls" +msgstr "Mapowanie ciągów znaków na ciągi znaków/nulle" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Wartość \"%(key)s\" nie jest ciągiem znaków." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Wartość „%(key)s” nie jest ciągiem znaków ani nullem." msgid "A JSON object" msgstr "Obiekt JSON" msgid "Value must be valid JSON." -msgstr "Wartość musi być poprawnie zakodowana w JSON." +msgstr "Wartość musi być poprawnym JSON-em." msgid "Could not load JSON data." msgstr "Nie można załadować danych JSON." msgid "Input must be a JSON dictionary." -msgstr "Dane wejściowe muszą być słownikiem JSON." +msgstr "Wejście musi być słownikiem JSON." #, python-format msgid "'%(value)s' value must be valid JSON." -msgstr "Wartość '%(value)s' musi być poprawnie zakodowana w JSON." +msgstr "Wartość '%(value)s' musi być poprawnym JSON-em." msgid "Enter two valid values." -msgstr "Wpisz dwie poprawne wartości." +msgstr "Podaj dwie poprawne wartości." msgid "The start of the range must not exceed the end of the range." msgstr "Początek zakresu nie może przekroczyć jego końca." msgid "Enter two whole numbers." -msgstr "Wpisz dwie liczby całkowite." +msgstr "Podaj dwie liczby całkowite." msgid "Enter two numbers." -msgstr "Wpisz dwie liczby." +msgstr "Podaj dwie liczby." msgid "Enter two valid date/times." -msgstr "Wpisz dwie poprawne daty/godziny." +msgstr "Podaj dwie poprawne daty/godziny." msgid "Enter two valid dates." -msgstr "Wpisz dwie poprawne daty." +msgstr "Podaj dwie poprawne daty." #, python-format msgid "" @@ -88,6 +90,9 @@ msgstr[1] "" msgstr[2] "" "Lista zawiera %(show_value)d elementów, a nie powinna zawierać więcej niż " "%(limit_value)d." +msgstr[3] "" +"Lista zawiera %(show_value)d elementów, a nie powinna zawierać więcej niż " +"%(limit_value)d." #, python-format msgid "" @@ -105,10 +110,13 @@ msgstr[1] "" msgstr[2] "" "Lista zawiera %(show_value)d elementów, a powinna zawierać nie mniej niż " "%(limit_value)d." +msgstr[3] "" +"Lista zawiera %(show_value)d elementów, a powinna zawierać nie mniej niż " +"%(limit_value)d." #, python-format msgid "Some keys were missing: %(keys)s" -msgstr "Brakuje części kluczy: %(keys)s" +msgstr "Brak części kluczy: %(keys)s" #, python-format msgid "Some unknown keys were provided: %(keys)s" diff --git a/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.mo index 10a55055f39c..de1e9c692807 100644 Binary files a/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.po index 969eea25dc70..a40b311118e0 100644 --- a/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/pt_BR/LC_MESSAGES/django.po @@ -6,14 +6,15 @@ # Claudemiro Alves Feitosa Neto , 2015 # Fábio C. Barrionuevo da Luz , 2015 # Lucas Infante , 2015 +# Luiz Boaretto , 2017 # rafaelribeiroo , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-08-02 11:55+0000\n" -"Last-Translator: andrewsmedina \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-02-06 02:30+0000\n" +"Last-Translator: Luiz Boaretto \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -32,12 +33,12 @@ msgstr "O item %(nth)s no array não pode ser validado:" msgid "Nested arrays must have the same length." msgstr "Matrizes aninhadas devem ter o mesmo comprimento." -msgid "Map of strings to strings" -msgstr "Mapa de strings para strings" +msgid "Map of strings to strings/nulls" +msgstr "Mapa de strings para strings/nulls" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "O valor de \"%(key)s\" não é uma string." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "O valor de \"%(key)s\" não é uma string ou null." msgid "A JSON object" msgstr "Um objeto JSON" diff --git a/django/contrib/postgres/locale/ru/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ru/LC_MESSAGES/django.mo index 5fc8f0932cf6..fba68fbc7569 100644 Binary files a/django/contrib/postgres/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ru/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ru/LC_MESSAGES/django.po index fe12dea50630..8f9624d70013 100644 --- a/django/contrib/postgres/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/ru/LC_MESSAGES/django.po @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eugene MechanisM , 2016 # eXtractor , 2015 # Kirill Gagarski , 2015 -# Алексей Борискин , 2015-2016 +# Vasiliy Anikin , 2017 +# Алексей Борискин , 2015-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-20 10:00+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-04-08 15:22+0000\n" "Last-Translator: Алексей Борискин \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" @@ -22,21 +24,23 @@ msgstr "" "%100>=11 && n%100<=14)? 2 : 3);\n" msgid "PostgreSQL extensions" -msgstr "Дополнения для PostgreSQL" +msgstr "Расширения PostgreSQL" #, python-format msgid "Item %(nth)s in the array did not validate: " -msgstr "Элемент массива №%(nth)s не прошёл проверку:" +msgstr "Элемент %(nth)s в массиве не прошёл проверку:" msgid "Nested arrays must have the same length." msgstr "Вложенные массивы должны иметь одинаковую длину." -msgid "Map of strings to strings" -msgstr "Ассоциативный массив, ключами и значениями которого являются строки." +msgid "Map of strings to strings/nulls" +msgstr "" +"Ассоциативный массив со строковыми ключами и строковыми или отсутствующими " +"значениями." #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Значение, соответствующее ключу \"%(key)s\", не является строкой." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Значение \"%(key)s\" не является строкой или отсутствующим значением." msgid "A JSON object" msgstr "JSON-объект" @@ -48,7 +52,7 @@ msgid "Could not load JSON data." msgstr "Не удалось загрузить JSON-данные." msgid "Input must be a JSON dictionary." -msgstr "Значение должно быть словарём в формате JSON." +msgstr "Значение должно быть JSON-словарём." #, python-format msgid "'%(value)s' value must be valid JSON." @@ -58,7 +62,7 @@ msgid "Enter two valid values." msgstr "Введите два правильных значения." msgid "The start of the range must not exceed the end of the range." -msgstr "Значение начала интервала не должно превышать значения его конца." +msgstr "Начало диапазона не может превышать его предел." msgid "Enter two whole numbers." msgstr "Введите два целых числа." @@ -114,7 +118,7 @@ msgstr[3] "" #, python-format msgid "Some keys were missing: %(keys)s" -msgstr "Не хватает некоторых ключей: %(keys)s" +msgstr "Некоторые ключи пропущены: %(keys)s" #, python-format msgid "Some unknown keys were provided: %(keys)s" @@ -133,6 +137,4 @@ msgstr "" msgid "" "Ensure that this range is completely greater than or equal to " "%(limit_value)s." -msgstr "" -"Убедитесь, что все значения, принадлежащие этому интервалу, больше или равны " -"%(limit_value)s." +msgstr "Убедитесь, что этот диапазон, больше или равен %(limit_value)s." diff --git a/django/contrib/postgres/locale/sl/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/sl/LC_MESSAGES/django.mo index 34bd10b59f12..668d11f075ec 100644 Binary files a/django/contrib/postgres/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/sl/LC_MESSAGES/django.po b/django/contrib/postgres/locale/sl/LC_MESSAGES/django.po index ff33460f3e92..90dca9e09d35 100644 --- a/django/contrib/postgres/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/sl/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Primož Verdnik , 2017 # zejn , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-27 19:25+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-02 08:27+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -28,12 +29,12 @@ msgstr "Element št. %(nth)s v seznamu ni veljaven:" msgid "Nested arrays must have the same length." msgstr "Gnezdeni seznami morajo imeti enako dolžino." -msgid "Map of strings to strings" -msgstr "Preslikava nizev v nize " +msgid "Map of strings to strings/nulls" +msgstr "Preslikava nizev v nize/null" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Vrednost \"%(key)s\" ni niz." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Vrednost \"%(key)s\" ni niz ali null." msgid "A JSON object" msgstr "JSON objekt" diff --git a/django/contrib/postgres/locale/tr/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/tr/LC_MESSAGES/django.mo index bf3a19931952..01a69c0e26f5 100644 Binary files a/django/contrib/postgres/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/tr/LC_MESSAGES/django.po b/django/contrib/postgres/locale/tr/LC_MESSAGES/django.po index b027ab77d0a3..bf71640030da 100644 --- a/django/contrib/postgres/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/tr/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# BouRock, 2015-2016 +# BouRock, 2015-2017 # BouRock, 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 11:02+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-20 18:05+0000\n" "Last-Translator: BouRock\n" "Language-Team: Turkish (http://www.transifex.com/django/django/language/" "tr/)\n" @@ -28,12 +28,12 @@ msgstr "Dizilimdeki %(nth)s öğesi doğrulanmadı: " msgid "Nested arrays must have the same length." msgstr "İç içe dizilimler aynı uzunlukta olmak zorunda." -msgid "Map of strings to strings" -msgstr "Dizgilerden dizgilere eşleme" +msgid "Map of strings to strings/nulls" +msgstr "Dizgiler/boşlar olarak dizgilerin eşlemesi" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "\"%(key)s\" değeri bir dizgi değil." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\" değeri bir dizgi ya da boş değil." msgid "A JSON object" msgstr "JSON nesnesi" diff --git a/django/contrib/postgres/locale/uk/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/uk/LC_MESSAGES/django.mo index 02a2d478cd1e..d298eeb674a3 100644 Binary files a/django/contrib/postgres/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/uk/LC_MESSAGES/django.po b/django/contrib/postgres/locale/uk/LC_MESSAGES/django.po index acdf9e0450b9..4847acc448a8 100644 --- a/django/contrib/postgres/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/uk/LC_MESSAGES/django.po @@ -2,15 +2,17 @@ # # Translators: # Andriy Sokolovskiy , 2015 -# Denis Podlesniy , 2016 -# Kirill Gagarski , 2015 +# Денис Подлесный , 2016 +# Igor Melnyk, 2017 +# Kirill Gagarski , 2015-2016 +# Zoriana Zaiats, 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-07-15 09:52+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-17 16:56+0000\n" +"Last-Translator: Zoriana Zaiats\n" "Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" @@ -30,12 +32,12 @@ msgstr "Елемент масиву №%(nth)s не пройшов переві msgid "Nested arrays must have the same length." msgstr "Вкладени масиви мусять бути однакової довжини." -msgid "Map of strings to strings" -msgstr "Карта строк в строках" +msgid "Map of strings to strings/nulls" +msgstr "Асоціативний масив із рядків у рядки/обнулення" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "Значення \"%(key)s\" не є рядком." +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "Значення від \"%(key)s\" не є стрічкою чи null." msgid "A JSON object" msgstr "Об'єкт JSON" @@ -47,7 +49,7 @@ msgid "Could not load JSON data." msgstr "Не вдалося завантажити JSON-дані." msgid "Input must be a JSON dictionary." -msgstr "" +msgstr "Значення повинне бути JSON-словником." #, python-format msgid "'%(value)s' value must be valid JSON." @@ -82,10 +84,10 @@ msgstr[0] "" "Список містить %(show_value)d елемент, кількість яких не має перевищувати " "%(limit_value)d." msgstr[1] "" -"Список містить %(show_value)d елементів, кількість яких не має перевищувати " +"Список містить %(show_value)d елементи, кількість яких не має перевищувати " "%(limit_value)d." msgstr[2] "" -"Список містить %(show_value)d елемента, кількість яких не має перевищувати " +"Список містить %(show_value)d елементів, кількість яких не має перевищувати " "%(limit_value)d." #, python-format diff --git a/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.mo index aae94effb195..d857bbc2271c 100644 Binary files a/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.po index 3483c96bbc10..efdaa5b5de7f 100644 --- a/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Lele Long , 2015 +# Lele Long , 2015,2017 # Liping Wang , 2016 # Liping Wang , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-09-20 02:20+0000\n" -"Last-Translator: Liping Wang \n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-03-14 11:38+0000\n" +"Last-Translator: Lele Long \n" "Language-Team: Chinese (China) (http://www.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -29,12 +29,12 @@ msgstr "数组中的第 %(nth)s 项无法校验。" msgid "Nested arrays must have the same length." msgstr "嵌套数组必须是相同长度。" -msgid "Map of strings to strings" -msgstr "包含字符串对应字串符的映射。" +msgid "Map of strings to strings/nulls" +msgstr "字符串到字符串/空的映射" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "“%(key)s”的值不是字符串。" +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "\"%(key)s\" 的值不是字符串或者为空。" msgid "A JSON object" msgstr "一个JSON对象" diff --git a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo index 8ea8c9693413..49a665c5cbed 100644 Binary files a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po index 82f1e4810204..74253f86e9a3 100644 --- a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # # Translators: # Chen Chun-Chia , 2015 -# Tzu-ping Chung , 2016 +# Tzu-ping Chung , 2016-2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-15 09:44+0200\n" -"PO-Revision-Date: 2016-08-30 09:32+0000\n" +"POT-Creation-Date: 2017-01-19 16:49+0100\n" +"PO-Revision-Date: 2017-01-21 16:29+0000\n" "Last-Translator: Tzu-ping Chung \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" "language/zh_TW/)\n" @@ -28,12 +28,12 @@ msgstr "陣列中第 %(nth)s 個物件驗證失敗：" msgid "Nested arrays must have the same length." msgstr "各嵌套陣列長度必須相同。" -msgid "Map of strings to strings" -msgstr "字串與字串值的對應" +msgid "Map of strings to strings/nulls" +msgstr "字串與字串/空值的對應" #, python-format -msgid "The value of \"%(key)s\" is not a string." -msgstr "「%(key)s」並非字串。" +msgid "The value of \"%(key)s\" is not a string or null." +msgstr "「%(key)s」並非字串或空值。" msgid "A JSON object" msgstr "一個 JSON 物件" diff --git a/django/contrib/postgres/lookups.py b/django/contrib/postgres/lookups.py index 53a62eacd16f..466b8cdf5651 100644 --- a/django/contrib/postgres/lookups.py +++ b/django/contrib/postgres/lookups.py @@ -8,7 +8,7 @@ class PostgresSimpleLookup(Lookup): def as_sql(self, qn, connection): lhs, lhs_params = self.process_lhs(qn, connection) rhs, rhs_params = self.process_rhs(qn, connection) - params = lhs_params + rhs_params + params = tuple(lhs_params) + tuple(rhs_params) return '%s %s %s' % (lhs, self.operator, rhs), params diff --git a/django/contrib/postgres/operations.py b/django/contrib/postgres/operations.py index cb45d4f705ed..cf790209b1f8 100644 --- a/django/contrib/postgres/operations.py +++ b/django/contrib/postgres/operations.py @@ -1,4 +1,4 @@ -from django.contrib.postgres.signals import register_hstore_handler +from django.contrib.postgres.signals import register_type_handlers from django.db.migrations.operations.base import Operation @@ -15,6 +15,10 @@ def database_forwards(self, app_label, schema_editor, from_state, to_state): if schema_editor.connection.vendor != 'postgresql': return schema_editor.execute("CREATE EXTENSION IF NOT EXISTS %s" % schema_editor.quote_name(self.name)) + # Registering new type handlers cannot be done before the extension is + # installed, otherwise a subsequent data migration would use the same + # connection. + register_type_handlers(schema_editor.connection) def database_backwards(self, app_label, schema_editor, from_state, to_state): schema_editor.execute("DROP EXTENSION %s" % schema_editor.quote_name(self.name)) @@ -40,13 +44,6 @@ class HStoreExtension(CreateExtension): def __init__(self): self.name = 'hstore' - def database_forwards(self, app_label, schema_editor, from_state, to_state): - super(HStoreExtension, self).database_forwards(app_label, schema_editor, from_state, to_state) - # Register hstore straight away as it cannot be done before the - # extension is installed, a subsequent data migration would use the - # same connection - register_hstore_handler(schema_editor.connection) - class TrigramExtension(CreateExtension): diff --git a/django/contrib/postgres/signals.py b/django/contrib/postgres/signals.py index 183ba1d98300..af7f0b2d3096 100644 --- a/django/contrib/postgres/signals.py +++ b/django/contrib/postgres/signals.py @@ -1,10 +1,11 @@ +import psycopg2 from psycopg2 import ProgrammingError from psycopg2.extras import register_hstore from django.utils import six -def register_hstore_handler(connection, **kwargs): +def register_type_handlers(connection, **kwargs): if connection.vendor != 'postgresql': return @@ -23,3 +24,17 @@ def register_hstore_handler(connection, **kwargs): # This is also needed in order to create the connection in order to # install the hstore extension. pass + + try: + with connection.cursor() as cursor: + # Retrieve oids of citext arrays. + cursor.execute("SELECT typarray FROM pg_type WHERE typname = 'citext'") + oids = tuple(row[0] for row in cursor) + array_type = psycopg2.extensions.new_array_type(oids, 'citext[]', psycopg2.STRING) + psycopg2.extensions.register_type(array_type, None) + except ProgrammingError: + # citext is not available on the database. + # + # The same comments in the except block of the above call to + # register_hstore() also apply here. + pass diff --git a/django/contrib/postgres/templates/postgres/widgets/split_array.html b/django/contrib/postgres/templates/postgres/widgets/split_array.html new file mode 100644 index 000000000000..32fda82609f8 --- /dev/null +++ b/django/contrib/postgres/templates/postgres/widgets/split_array.html @@ -0,0 +1 @@ +{% include 'django/forms/widgets/multiwidget.html' %} diff --git a/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo index 8017d1eb2506..f423f2825fcf 100644 Binary files a/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/de/LC_MESSAGES/django.po b/django/contrib/redirects/locale/de/LC_MESSAGES/django.po index 577e99082222..b58695d07861 100644 --- a/django/contrib/redirects/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/de/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # André Hagenbruch, 2015 -# Jannis Leidel , 2011,2013-2016 +# Jannis Leidel , 2011,2013-2017 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: 2016-07-26 11:55+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 10:45+0000\n" +"Last-Translator: Markus Holtermann \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" @@ -30,8 +30,8 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/" -"events/search/'." +"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: „/" +"events/search/“." msgid "redirect to" msgstr "Umleitung nach" diff --git a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo index 7d3b9b538f24..9f81de496d18 100644 Binary files a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po index 222a7a10a049..9affdd31a196 100644 --- a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eneko Illarramendi , 2017 # Jannis Leidel , 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: 2015-10-10 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 13:05+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -17,10 +18,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Redirects" -msgstr "" +msgstr "Redirects" msgid "site" -msgstr "" +msgstr "webgunea" msgid "redirect from" msgstr "nondik berbidalia" @@ -29,7 +30,7 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Honek 'bide' absolutua izan beharko luke, dominio izena kenduta. 'Adibidez: " +"Honek 'bide' absolutua izan behar du, domeinu izena kenduta. Adibidez: '/" "events/search/'." msgid "redirect to" diff --git a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo index 57264de8bc40..73afe7d2ab17 100644 Binary files a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po index 15bcd3f73cf6..032ebfd416f4 100644 --- a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# fasouto , 2017 # Jannis Leidel , 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: 2015-10-10 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-28 16:28+0000\n" +"Last-Translator: fasouto \n" "Language-Team: Galician (http://www.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -21,7 +22,7 @@ msgid "Redirects" msgstr "" msgid "site" -msgstr "" +msgstr "sitio" msgid "redirect from" msgstr "orixe da redirección" diff --git a/django/contrib/redirects/locale/ia/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ia/LC_MESSAGES/django.mo index 1eeb6e94eb60..731a9a28e429 100644 Binary files a/django/contrib/redirects/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/ia/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ia/LC_MESSAGES/django.po index 08f3bb49ce9a..d04a4f9b5914 100644 --- a/django/contrib/redirects/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/ia/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Martijn Dekker , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" -"language/ia/)\n" +"POT-Creation-Date: 2015-10-09 17:42+0200\n" +"PO-Revision-Date: 2016-11-25 21:25+0000\n" +"Last-Translator: Martijn Dekker \n" +"Language-Team: Interlingua (http://www.transifex.com/django/django/language/" +"ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,26 +18,33 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Redirects" -msgstr "" +msgstr "Redirectiones" + +msgid "site" +msgstr "sito" msgid "redirect from" -msgstr "" +msgstr "formulario de redirection" msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" +"Isto debe esser un cammino absolute, excludente le nomine de dominio. " +"Exemplo: '/eventos/recerca'." msgid "redirect to" -msgstr "" +msgstr "rediriger a" msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" +"Isto pote esser o un cammino absolute (como supra) o un URL complete " +"comenciante con 'http://'." msgid "redirect" -msgstr "" +msgstr "redirection" msgid "redirects" -msgstr "" +msgstr "redirectiones" diff --git a/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo index 5cdf949548ef..bf1f57e66d47 100644 Binary files a/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/is/LC_MESSAGES/django.po b/django/contrib/redirects/locale/is/LC_MESSAGES/django.po index 50a28813ab3b..52d88ec21d29 100644 --- a/django/contrib/redirects/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/is/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016 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: 2015-10-10 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-07 17:30+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -21,7 +22,7 @@ msgid "Redirects" msgstr "" msgid "site" -msgstr "" +msgstr "vefur" msgid "redirect from" msgstr "vísun frá" diff --git a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo index e8fe892e84cd..a28fb2d4bb7b 100644 Binary files a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po index 37d851e7a997..6892affcc6b7 100644 --- a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Leo Trubach , 2017 # yun_man_ger , 2011 # Zhazira , 2011 msgid "" @@ -8,8 +9,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2015-10-10 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-01-14 16:16+0000\n" +"Last-Translator: Leo Trubach \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,10 +19,10 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Redirects" -msgstr "" +msgstr "Қайта бағыттаулар" msgid "site" -msgstr "" +msgstr "сайт" msgid "redirect from" msgstr " бағыттау (қайдан)" diff --git a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo index 5d627bf82f12..b63e886598af 100644 Binary files a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po index 0e54ea4d8576..7c6e764a3bb2 100644 --- a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2015-10-10 08:31+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-11 05:19+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -19,10 +20,10 @@ msgstr "" "2);\n" msgid "Redirects" -msgstr "" +msgstr "Pārvirzīšanas" msgid "site" -msgstr "" +msgstr "vietne" msgid "redirect from" msgstr "pārvirzīt(redirect) no" diff --git a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo index 7d8e3f8e0e66..fbc98d8a6164 100644 Binary files a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po index 72274ee0c8d1..2c33ee57e724 100644 --- a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po @@ -3,26 +3,28 @@ # Translators: # Jannis Leidel , 2011 # Janusz Harkot , 2014-2015 +# Tomasz Kajtoch , 2016 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: 2015-11-25 16:57+0000\n" -"Last-Translator: Janusz Harkot \n" +"PO-Revision-Date: 2016-11-11 17:27+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Redirects" msgstr "Przekierowania" msgid "site" -msgstr "strony" +msgstr "strona" msgid "redirect from" msgstr "przekieruj z" @@ -31,17 +33,18 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Podaj bezwzględną ścieżkę, bez nazwy domeny. Przykład: '/events/search/'." +"Podaj ścieżkę bezwzględną wykluczając nazwę domeny. Na przykład '/events/" +"search/'." msgid "redirect to" -msgstr "przekierowanie do" +msgstr "przekieruj na" msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -"Podaj bezwzględną ścieżkę (jak powyżej) lub pełny adres URL zaczynający się " -"od 'http://'" +"Podaj ścieżkę bezwzględną (jak powyżej) lub pełen URL rozpoczynający się od " +"'http://'." msgid "redirect" msgstr "przekieruj" diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py index 40c557ba0b7c..8e09fd8d80d3 100644 --- a/django/contrib/sessions/backends/base.py +++ b/django/contrib/sessions/backends/base.py @@ -306,10 +306,7 @@ def cycle_key(self): """ Creates a new session key, while retaining the current session data. """ - try: - data = self._session_cache - except AttributeError: - data = {} + data = self._session key = self.session_key self.create() self._session_cache = data diff --git a/django/contrib/sessions/backends/signed_cookies.py b/django/contrib/sessions/backends/signed_cookies.py index f4c085fb59d7..c790fbe90f8d 100644 --- a/django/contrib/sessions/backends/signed_cookies.py +++ b/django/contrib/sessions/backends/signed_cookies.py @@ -74,9 +74,8 @@ def _get_session_key(self): generate a secure url-safe Base64-encoded string of data as our session key. """ - session_cache = getattr(self, '_session_cache', {}) return signing.dumps( - session_cache, compress=True, + self._session, compress=True, salt='django.contrib.sessions.backends.signed_cookies', serializer=self.serializer, ) diff --git a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo index 389706ddd300..b586a7290697 100644 Binary files a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po index a77262653f57..9ea60e222e87 100644 --- a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 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: 2014-10-05 20:10+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 14:31+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -17,13 +18,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Sessions" -msgstr "" +msgstr "Sesioak" msgid "session key" msgstr "sesioaren giltza" msgid "session data" -msgstr "sesioaren data" +msgstr "sesioaren datuak" msgid "expire date" msgstr "amaiera data" diff --git a/django/contrib/sessions/locale/ia/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ia/LC_MESSAGES/django.mo index 1eeb6e94eb60..309087c4f6b6 100644 Binary files a/django/contrib/sessions/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/ia/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ia/LC_MESSAGES/django.po index 00b6bbec9312..ed33177b7f7b 100644 --- a/django/contrib/sessions/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/ia/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Martijn Dekker , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" -"language/ia/)\n" +"PO-Revision-Date: 2016-11-25 21:22+0000\n" +"Last-Translator: Martijn Dekker \n" +"Language-Team: Interlingua (http://www.transifex.com/django/django/language/" +"ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,19 +18,19 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Sessions" -msgstr "" +msgstr "Sessiones" msgid "session key" -msgstr "" +msgstr "clave de session" msgid "session data" -msgstr "" +msgstr "datos de session" msgid "expire date" -msgstr "" +msgstr "data de expiration" msgid "session" -msgstr "" +msgstr "session" msgid "sessions" -msgstr "" +msgstr "sessiones" diff --git a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo index cc94504291eb..76570e342e81 100644 Binary files a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po index f1653acb6d96..e2a1284c8ba4 100644 --- a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# peterisb , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-11 05:12+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "2);\n" msgid "Sessions" -msgstr "" +msgstr "Sesijas" msgid "session key" msgstr "sesijas atslēga" diff --git a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo index 52511a1746c5..24dcccef2b7e 100644 Binary files a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po index 51c59b10d4f0..465c2cd35210 100644 --- a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po @@ -3,20 +3,22 @@ # Translators: # Jannis Leidel , 2011 # Mattia Procopio , 2014 +# Tomasz Kajtoch , 2016 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: 2014-10-05 20:12+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-11 17:25+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Sessions" msgstr "Sesje" @@ -25,7 +27,7 @@ msgid "session key" msgstr "klucz sesji" msgid "session data" -msgstr "data sesji" +msgstr "dane sesji" msgid "expire date" msgstr "data wygaśnięcia sesji" diff --git a/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo b/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo index e2cca4fc3e43..901dcdb3edca 100644 Binary files a/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/eu/LC_MESSAGES/django.po b/django/contrib/sites/locale/eu/LC_MESSAGES/django.po index 7ca84ef51fdc..055364b3f5d4 100644 --- a/django/contrib/sites/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/eu/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Ander Martínez , 2013 +# Eneko Illarramendi , 2017 # Jannis Leidel , 2011 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: 2014-10-05 20:10+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-03-22 12:45+0000\n" +"Last-Translator: Eneko Illarramendi \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" @@ -18,19 +19,19 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Sites" -msgstr "" +msgstr "Webguneak" msgid "The domain name cannot contain any spaces or tabs." msgstr "Domeinu izenak ezin du zuriunerik edo tabuladorerik eduki." msgid "domain name" -msgstr "dominio izena" +msgstr "domeinu-izena" msgid "display name" msgstr "erakusteko izena" msgid "site" -msgstr "web gunea" +msgstr "webgunea" msgid "sites" -msgstr "web guneak" +msgstr "webguneak" diff --git a/django/contrib/sites/locale/ia/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ia/LC_MESSAGES/django.mo index 1eeb6e94eb60..4d0e31ebdc4a 100644 Binary files a/django/contrib/sites/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/ia/LC_MESSAGES/django.po b/django/contrib/sites/locale/ia/LC_MESSAGES/django.po index d07a892d0fc9..0c81cecc71d6 100644 --- a/django/contrib/sites/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/ia/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Martijn Dekker , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" -"language/ia/)\n" +"PO-Revision-Date: 2016-11-25 21:24+0000\n" +"Last-Translator: Martijn Dekker \n" +"Language-Team: Interlingua (http://www.transifex.com/django/django/language/" +"ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,19 +18,19 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Sites" -msgstr "" +msgstr "Sitos" msgid "The domain name cannot contain any spaces or tabs." -msgstr "" +msgstr "Le nomine de dominio non pote continer spatios o tabulationes." msgid "domain name" -msgstr "" +msgstr "nomine de dominio" msgid "display name" -msgstr "" +msgstr "nomine a monstrar" msgid "site" -msgstr "" +msgstr "sito" msgid "sites" -msgstr "" +msgstr "sitos" diff --git a/django/contrib/sites/locale/is/LC_MESSAGES/django.mo b/django/contrib/sites/locale/is/LC_MESSAGES/django.mo index cdf1495bde6b..74e9f555bddb 100644 Binary files a/django/contrib/sites/locale/is/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/is/LC_MESSAGES/django.po b/django/contrib/sites/locale/is/LC_MESSAGES/django.po index f237be3e77c4..9eee1faa533b 100644 --- a/django/contrib/sites/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/is/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# Thordur Sigurdsson , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-07 17:32+0000\n" +"Last-Translator: Thordur Sigurdsson \n" "Language-Team: Icelandic (http://www.transifex.com/django/django/language/" "is/)\n" "MIME-Version: 1.0\n" @@ -18,10 +19,10 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" msgid "Sites" -msgstr "" +msgstr "Vefir" msgid "The domain name cannot contain any spaces or tabs." -msgstr "" +msgstr "Lénið má ekki innihalda bil eða dálkastafi (tab characters)." msgid "domain name" msgstr "lén" diff --git a/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo b/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo index 8dfaf61864de..fe2f34568cdb 100644 Binary files a/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/kk/LC_MESSAGES/django.po b/django/contrib/sites/locale/kk/LC_MESSAGES/django.po index f385ff94ae61..82119e02c69e 100644 --- a/django/contrib/sites/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/kk/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Leo Trubach , 2017 # yun_man_ger , 2011 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2017-01-14 16:15+0000\n" +"Last-Translator: Leo Trubach \n" "Language-Team: Kazakh (http://www.transifex.com/django/django/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,13 +18,13 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Sites" -msgstr "" +msgstr "Сайттар" msgid "The domain name cannot contain any spaces or tabs." -msgstr "" +msgstr "Домен атауының ішінде аралық және табуляция белілерге тыйым салынады" msgid "domain name" -msgstr "домналық атауы" +msgstr "домен атауы" msgid "display name" msgstr "бейнелеу атауы" diff --git a/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo b/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo index 4b53d23c0990..c8319b785895 100644 Binary files a/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/lv/LC_MESSAGES/django.po b/django/contrib/sites/locale/lv/LC_MESSAGES/django.po index 994193192852..9d10fb737d67 100644 --- a/django/contrib/sites/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/lv/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # edgars , 2011 # Jannis Leidel , 2011 +# peterisb , 2016 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: 2014-10-05 20:11+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-10-11 05:18+0000\n" +"Last-Translator: peterisb \n" "Language-Team: Latvian (http://www.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -20,10 +21,10 @@ msgstr "" "2);\n" msgid "Sites" -msgstr "" +msgstr "Vietnes" msgid "The domain name cannot contain any spaces or tabs." -msgstr "" +msgstr "Domēna nosaukumā nevar būt tukšumi vai tabulatori." msgid "domain name" msgstr "domēna vārds" diff --git a/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo index 4d68e03371b4..6f05c11d9dab 100644 Binary files a/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/pl/LC_MESSAGES/django.po b/django/contrib/sites/locale/pl/LC_MESSAGES/django.po index b5b5b5e148c8..f8bd81fd9d40 100644 --- a/django/contrib/sites/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/pl/LC_MESSAGES/django.po @@ -4,32 +4,34 @@ # angularcircle, 2013 # Jannis Leidel , 2011 # Mattia Procopio , 2014 +# Tomasz Kajtoch , 2016 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: 2015-11-25 16:57+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-11 17:24+0000\n" +"Last-Translator: Tomasz Kajtoch \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" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%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" msgid "Sites" msgstr "Strony" msgid "The domain name cannot contain any spaces or tabs." -msgstr "Nazwa domeny nie może zawierać spacji, bądź znaków tabulatora." +msgstr "Nazwa domeny nie może zawierać spacji ani tabulatorów." msgid "domain name" msgstr "nazwa domeny" msgid "display name" -msgstr "wyświetlana nazwa" +msgstr "nazwa wyświetlana" msgid "site" msgstr "strona" diff --git a/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo index 6d90f656084e..d2471dfadd73 100644 Binary files a/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/ru/LC_MESSAGES/django.po b/django/contrib/sites/locale/ru/LC_MESSAGES/django.po index 1b1529710007..517f8ed6c3f4 100644 --- a/django/contrib/sites/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/ru/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Eugene MechanisM , 2013 +# Eugene MechanisM , 2016 # Jannis Leidel , 2011 # Алексей Борискин , 2014 msgid "" @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2015-10-22 13:35+0000\n" -"Last-Translator: Jannis Leidel \n" +"PO-Revision-Date: 2016-11-05 23:49+0000\n" +"Last-Translator: Eugene MechanisM \n" "Language-Team: Russian (http://www.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -31,7 +32,7 @@ msgid "domain name" msgstr "доменное имя" msgid "display name" -msgstr "выводимое имя" +msgstr "отображаемое имя" msgid "site" msgstr "сайт" diff --git a/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo index a8612ca88967..0caf90ecd9a3 100644 Binary files a/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/sl/LC_MESSAGES/django.po b/django/contrib/sites/locale/sl/LC_MESSAGES/django.po index 9dca668e3a6e..3425455ac8db 100644 --- a/django/contrib/sites/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/sl/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Jannis Leidel , 2011 +# Primož Verdnik , 2017 # zejn , 2013,2016 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: 2016-05-14 13:23+0000\n" -"Last-Translator: zejn \n" +"PO-Revision-Date: 2017-03-02 08:42+0000\n" +"Last-Translator: Primož Verdnik \n" "Language-Team: Slovenian (http://www.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" @@ -23,7 +24,7 @@ msgid "Sites" msgstr "Strani" msgid "The domain name cannot contain any spaces or tabs." -msgstr "Domena ne more vsebovati presledkov ali tabulatorjev." +msgstr "Domena ne sme vsebovati presledkov ali tabulatorjev." msgid "domain name" msgstr "ime domene" diff --git a/django/contrib/staticfiles/management/commands/runserver.py b/django/contrib/staticfiles/management/commands/runserver.py index c25ac1f36952..455d926b3ebd 100644 --- a/django/contrib/staticfiles/management/commands/runserver.py +++ b/django/contrib/staticfiles/management/commands/runserver.py @@ -1,7 +1,8 @@ from django.conf import settings from django.contrib.staticfiles.handlers import StaticFilesHandler -from django.core.management.commands.runserver import \ - Command as RunserverCommand +from django.core.management.commands.runserver import ( + Command as RunserverCommand, +) class Command(RunserverCommand): diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py index 9cbfe0be1d07..1235f7e098ae 100644 --- a/django/core/cache/backends/base.py +++ b/django/core/cache/backends/base.py @@ -157,13 +157,15 @@ def get_or_set(self, key, default, timeout=DEFAULT_TIMEOUT, version=None): Return the value of the key stored or retrieved. """ val = self.get(key, version=version) - if val is None and default is not None: + if val is None: if callable(default): default = default() - self.add(key, default, timeout=timeout, version=version) - # Fetch the value again to avoid a race condition if another caller - # added a value between the first get() and the add() above. - return self.get(key, default, version=version) + if default is not None: + self.add(key, default, timeout=timeout, version=version) + # Fetch the value again to avoid a race condition if another + # caller added a value between the first get() and the add() + # above. + return self.get(key, default, version=version) return val def has_key(self, key, version=None): diff --git a/django/core/checks/urls.py b/django/core/checks/urls.py index e950cb563755..e1049167fd8d 100644 --- a/django/core/checks/urls.py +++ b/django/core/checks/urls.py @@ -53,17 +53,21 @@ def check_url_namespaces_unique(app_configs, **kwargs): return errors -def _load_all_namespaces(resolver): +def _load_all_namespaces(resolver, parents=()): """ Recursively load all namespaces from URL patterns. """ url_patterns = getattr(resolver, 'url_patterns', []) namespaces = [ - url.namespace for url in url_patterns + ':'.join(parents + (url.namespace,)) for url in url_patterns if getattr(url, 'namespace', None) is not None ] for pattern in url_patterns: - namespaces.extend(_load_all_namespaces(pattern)) + namespace = getattr(pattern, 'namespace', None) + current = parents + if namespace is not None: + current += (namespace,) + namespaces.extend(_load_all_namespaces(pattern, current)) return namespaces diff --git a/django/core/files/move.py b/django/core/files/move.py index f3972c5f984d..8be62ff6d808 100644 --- a/django/core/files/move.py +++ b/django/core/files/move.py @@ -5,6 +5,7 @@ >>> file_move_safe("/tmp/old_file", "/tmp/new_file") """ +import errno import os from shutil import copystat @@ -67,7 +68,15 @@ def file_move_safe(old_file_name, new_file_name, chunk_size=1024 * 64, allow_ove finally: locks.unlock(fd) os.close(fd) - copystat(old_file_name, new_file_name) + + try: + copystat(old_file_name, new_file_name) + except OSError as e: + # Certain filesystems (e.g. CIFS) fail to copy the file's metadata if + # the type of the destination filesystem isn't the same as the source + # filesystem; ignore that. + if getattr(e, 'errno', 0) != errno.EPERM: + raise try: os.remove(old_file_name) diff --git a/django/core/handlers/exception.py b/django/core/handlers/exception.py index f1c7b5789127..48324372b462 100644 --- a/django/core/handlers/exception.py +++ b/django/core/handlers/exception.py @@ -7,7 +7,10 @@ from django.conf import settings from django.core import signals -from django.core.exceptions import PermissionDenied, SuspiciousOperation +from django.core.exceptions import ( + PermissionDenied, RequestDataTooBig, SuspiciousOperation, + TooManyFieldsSent, +) from django.http import Http404 from django.http.multipartparser import MultiPartParserError from django.urls import get_resolver, get_urlconf @@ -64,6 +67,11 @@ def response_for_exception(request, exc): response = get_exception_response(request, get_resolver(get_urlconf()), 400, exc) elif isinstance(exc, SuspiciousOperation): + if isinstance(exc, (RequestDataTooBig, TooManyFieldsSent)): + # POST data can't be accessed again, otherwise the original + # exception would be raised. + request._mark_post_parse_error() + # The request logger receives events for any problematic request # The security logger receives events for all SuspiciousOperations security_logger = logging.getLogger('django.security.%s' % exc.__class__.__name__) diff --git a/django/core/mail/backends/filebased.py b/django/core/mail/backends/filebased.py index cfe033fb4873..17e89b75a442 100644 --- a/django/core/mail/backends/filebased.py +++ b/django/core/mail/backends/filebased.py @@ -5,8 +5,9 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.core.mail.backends.console import \ - EmailBackend as ConsoleEmailBackend +from django.core.mail.backends.console import ( + EmailBackend as ConsoleEmailBackend, +) from django.utils import six diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 3cebbaf9d245..0bd522c04df9 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -286,7 +286,13 @@ def __init__(self, subject='', body='', from_email=None, to=None, bcc=None, self.from_email = from_email or settings.DEFAULT_FROM_EMAIL self.subject = subject self.body = body - self.attachments = attachments or [] + self.attachments = [] + if attachments: + for attachment in attachments: + if isinstance(attachment, MIMEBase): + self.attach(attachment) + else: + self.attach(*attachment) self.extra_headers = headers or {} self.connection = connection diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index fdc1af2aa2cf..ad66735c82f6 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -82,8 +82,9 @@ def call_command(command_name, *args, **options): This is the primary API you should use for calling specific commands. - `name` may be a string or a command object. Using a string is preferred - unless the command object is required for further processing or testing. + `command_name` may be a string or a command object. Using a string is + preferred unless the command object is required for further processing or + testing. Some examples: call_command('migrate') @@ -133,9 +134,6 @@ def call_command(command_name, *args, **options): class ManagementUtility(object): """ Encapsulates the logic of the django-admin and manage.py utilities. - - A ManagementUtility has a number of commands, which can be manipulated - by editing the self.commands dictionary. """ def __init__(self, argv=None): self.argv = argv or sys.argv[:] diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 0bfbd5b68e15..43cb6c40fdda 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -15,7 +15,6 @@ from django.utils import autoreload, six from django.utils.encoding import force_text, get_system_encoding - naiveip_re = re.compile(r"""^(?: (?P (?P\d{1,3}(?:\.\d{1,3}){3}) | # IPv4 address diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py index de8f33ed84ec..506a69156cc5 100644 --- a/django/core/management/commands/shell.py +++ b/django/core/management/commands/shell.py @@ -59,7 +59,7 @@ def python(self, options): # we already know 'readline' was imported successfully. import rlcompleter readline.set_completer(rlcompleter.Completer(imported_objects).complete) - # Enable tab completion on systems using libedit (e.g. Mac OSX). + # Enable tab completion on systems using libedit (e.g. macOS). # These lines are copied from Lib/site.py on Python 3.4. readline_doc = getattr(readline, '__doc__', '') if readline_doc is not None and 'libedit' in readline_doc: diff --git a/django/core/paginator.py b/django/core/paginator.py index c77a62a1fe31..f149598203f0 100644 --- a/django/core/paginator.py +++ b/django/core/paginator.py @@ -105,11 +105,18 @@ def _check_object_list_is_ordered(self): """ Warn if self.object_list is unordered (typically a QuerySet). """ - if hasattr(self.object_list, 'ordered') and not self.object_list.ordered: + ordered = getattr(self.object_list, 'ordered', None) + if ordered is not None and not ordered: + obj_list_repr = ( + '{} {}'.format(self.object_list.model, self.object_list.__class__.__name__) + if hasattr(self.object_list, 'model') + else '{!r}'.format(self.object_list) + ) warnings.warn( 'Pagination may yield inconsistent results with an unordered ' - 'object_list: {!r}'.format(self.object_list), - UnorderedObjectListWarning + 'object_list: {}.'.format(obj_list_repr), + UnorderedObjectListWarning, + stacklevel=3 ) diff --git a/django/core/serializers/base.py b/django/core/serializers/base.py index 46fb25ea7864..ae3866172b3e 100644 --- a/django/core/serializers/base.py +++ b/django/core/serializers/base.py @@ -88,7 +88,7 @@ def serialize(self, queryset, **options): if self.selected_fields is None or field.attname in self.selected_fields: self.handle_field(obj, field) else: - if self.field_is_selected(field) and self.output_pk_field(obj, field): + if self.selected_fields is None or field.attname[:-3] in self.selected_fields: self.handle_fk_field(obj, field) for field in concrete_model._meta.many_to_many: if field.serialize: @@ -101,12 +101,6 @@ def serialize(self, queryset, **options): self.end_serialization() return self.getvalue() - def field_is_selected(self, field): - return self.selected_fields is None or field.attname[:-3] in self.selected_fields - - def output_pk_field(self, obj, pk_field): - return self.use_natural_primary_keys or pk_field != obj._meta.pk - def start_serialization(self): """ Called when serializing of the queryset starts. diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index 9da8993ee649..a475858205d1 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -16,6 +16,7 @@ Deserializer as PythonDeserializer, Serializer as PythonSerializer, ) from django.utils import six +from django.utils.deprecation import CallableBool from django.utils.duration import duration_iso_string from django.utils.functional import Promise from django.utils.timezone import is_aware @@ -117,5 +118,7 @@ def default(self, o): return str(o) elif isinstance(o, Promise): return six.text_type(o) + elif isinstance(o, CallableBool): + return bool(o) else: return super(DjangoJSONEncoder, self).default(o) diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py index 3928d8c3ff67..82f8cf8fa0cb 100644 --- a/django/core/servers/basehttp.py +++ b/django/core/servers/basehttp.py @@ -73,11 +73,6 @@ def __init__(self, *args, **kwargs): self.allow_reuse_address = kwargs.pop('allow_reuse_address', True) super(WSGIServer, self).__init__(*args, **kwargs) - def server_bind(self): - """Override server_bind to store the server name.""" - super(WSGIServer, self).server_bind() - self.setup_environ() - def handle_error(self, request, client_address): if is_broken_pipe_error(): logger.info("- Broken pipe from %s\n", client_address) diff --git a/django/core/validators.py b/django/core/validators.py index 3f777254f481..ea18685fdb46 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -54,8 +54,8 @@ def __init__(self, regex=None, message=None, code=None, inverse_match=None, flag def __call__(self, value): """ - Validates that the input matches the regular expression - if inverse_match is False, otherwise raises ValidationError. + Validate that the input contains a match for the regular expression + if inverse_match is False, otherwise raise ValidationError. """ if not (self.inverse_match is not bool(self.regex.search( force_text(value)))): @@ -146,7 +146,6 @@ def __call__(self, value): validate_ipv6_address(potential_ip) except ValidationError: raise ValidationError(self.message, code=self.code) - url = value # The maximum length of a full host name is 253 characters per RFC 1034 # section 3.1. It's defined to be 255 bytes or less, but this includes diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py index b00853b74d54..efef3e0f3cba 100644 --- a/django/db/backends/base/schema.py +++ b/django/db/backends/base/schema.py @@ -2,7 +2,8 @@ import logging from datetime import datetime -from django.db.backends.utils import strip_quotes +from django.db.backends.utils import split_identifier +from django.db.models import Index from django.db.transaction import TransactionManagementError, atomic from django.utils import six, timezone from django.utils.encoding import force_bytes @@ -10,12 +11,28 @@ logger = logging.getLogger('django.db.backends.schema') +def _is_relevant_relation(relation, altered_field): + """ + When altering the given field, must constraints on its model from the given + relation be temporarily dropped? + """ + field = relation.field + if field.many_to_many: + # M2M reverse field + return False + if altered_field.primary_key and field.to_fields == [None]: + # Foreign key constraint on the primary key, which is being altered. + return True + # Is the constraint targeting the field being altered? + return altered_field.name in field.to_fields + + def _related_non_m2m_objects(old_field, new_field): # Filters out m2m objects from reverse relations. # Returns (old_relation, new_relation) tuples. return zip( - (obj for obj in old_field.model._meta.related_objects if not obj.field.many_to_many), - (obj for obj in new_field.model._meta.related_objects if not obj.field.many_to_many) + (obj for obj in old_field.model._meta.related_objects if _is_relevant_relation(obj, old_field)), + (obj for obj in new_field.model._meta.related_objects if _is_relevant_relation(obj, new_field)) ) @@ -433,6 +450,7 @@ def add_field(self, model, field): "table": self.quote_name(model._meta.db_table), "changes": self.sql_alter_column_no_default % { "column": self.quote_name(field.column), + "type": db_params['type'], } } self.execute(sql) @@ -541,9 +559,15 @@ def _alter_field(self, model, old_field, new_field, old_type, new_type, )) for constraint_name in constraint_names: self.execute(self._delete_constraint_sql(self.sql_delete_unique, model, constraint_name)) - # Drop incoming FK constraints if we're a primary key and things are going - # to change. - if old_field.primary_key and new_field.primary_key and old_type != new_type: + # Drop incoming FK constraints if the field is a primary key or unique, + # which might be a to_field target, and things are going to change. + drop_foreign_keys = ( + ( + (old_field.primary_key and new_field.primary_key) or + (old_field.unique and new_field.unique) + ) and old_type != new_type + ) + if drop_foreign_keys: # '_meta.related_field' also contains M2M reverse fields, these # will be filtered out for _old_rel, new_rel in _related_non_m2m_objects(old_field, new_field): @@ -564,8 +588,16 @@ def _alter_field(self, model, old_field, new_field, old_type, new_type, # True | False | True | True if old_field.db_index and not old_field.unique and (not new_field.db_index or new_field.unique): # Find the index for this field - index_names = self._constraint_names(model, [old_field.column], index=True) + meta_index_names = {index.name for index in model._meta.indexes} + # Retrieve only BTREE indexes since this is what's created with + # db_index=True. + index_names = self._constraint_names(model, [old_field.column], index=True, type_=Index.suffix) for index_name in index_names: + if index_name in meta_index_names: + # The only way to check if an index was created with + # db_index=True or with Index(['field'], name='foo') + # is to look at its name (refs #28053). + continue self.execute(self._delete_constraint_sql(self.sql_delete_index, model, index_name)) # Change check constraints? if old_db_params['check'] != new_db_params['check'] and old_db_params['check']: @@ -762,9 +794,9 @@ def _alter_field(self, model, old_field, new_field, old_type, new_type, new_field.db_constraint): self.execute(self._create_fk_sql(model, new_field, "_fk_%(to_table)s_%(to_column)s")) # Rebuild FKs that pointed to us if we previously had to drop them - if old_field.primary_key and new_field.primary_key and old_type != new_type: + if drop_foreign_keys: for rel in new_field.model._meta.related_objects: - if not rel.many_to_many: + if _is_relevant_relation(rel, new_field) and rel.field.db_constraint: self.execute(self._create_fk_sql(rel.related_model, rel.field, "_fk")) # Does it have check constraints we need to add? if old_db_params['check'] != new_db_params['check'] and new_db_params['check']: @@ -842,7 +874,7 @@ def _create_index_name(self, model, column_names, suffix=""): The name is divided into 3 parts: the table name, the column names, and a unique digest and suffix. """ - table_name = strip_quotes(model._meta.db_table) + _, table_name = split_identifier(model._meta.db_table) hash_data = [table_name] + list(column_names) hash_suffix_part = '%s%s' % (self._digest(*hash_data), suffix) max_length = self.connection.ops.max_name_length() or 200 @@ -935,7 +967,7 @@ def _rename_field_sql(self, table, old_field, new_field, new_type): def _create_fk_sql(self, model, field, suffix): from_table = model._meta.db_table from_column = field.column - to_table = field.target_field.model._meta.db_table + _, to_table = split_identifier(field.target_field.model._meta.db_table) to_column = field.target_field.column suffix = suffix % { "to_table": to_table, @@ -946,7 +978,7 @@ def _create_fk_sql(self, model, field, suffix): "table": self.quote_name(from_table), "name": self.quote_name(self._create_index_name(model, [from_column], suffix=suffix)), "column": self.quote_name(from_column), - "to_table": self.quote_name(to_table), + "to_table": self.quote_name(field.target_field.model._meta.db_table), "to_column": self.quote_name(to_column), "deferrable": self.connection.ops.deferrable_sql(), } @@ -966,7 +998,7 @@ def _delete_constraint_sql(self, template, model, name): def _constraint_names(self, model, column_names=None, unique=None, primary_key=None, index=None, foreign_key=None, - check=None): + check=None, type_=None): """ Returns all constraint names matching the columns and conditions """ @@ -990,5 +1022,7 @@ def _constraint_names(self, model, column_names=None, unique=None, continue if foreign_key is not None and not infodict['foreign_key']: continue + if type_ is not None and infodict['type'] != type_: + continue result.append(name) return result diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 7a59ecd61247..06833236e70a 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -42,13 +42,12 @@ from .schema import DatabaseSchemaEditor # isort:skip from .validation import DatabaseValidation # isort:skip -# We want version (1, 2, 1, 'final', 2) or later. We can't just use -# lexicographic ordering in this check because then (1, 2, 1, 'gamma') -# inadvertently passes the version test. version = Database.version_info -if (version < (1, 2, 1) or ( - version[:3] == (1, 2, 1) and (len(version) < 5 or version[3] != 'final' or version[4] < 2))): - raise ImproperlyConfigured("MySQLdb-1.2.1p2 or newer is required; you have %s" % Database.__version__) +if version < (1, 2, 3): + raise ImproperlyConfigured( + "MySQLdb/mysqlclient 1.2.3 or newer is required; you have %s" + % Database.__version__ + ) def adapt_datetime_warn_on_aware_datetime(value, conv): @@ -65,11 +64,11 @@ def adapt_datetime_warn_on_aware_datetime(value, conv): return Thing2Literal(value.strftime("%Y-%m-%d %H:%M:%S.%f"), conv) -# MySQLdb-1.2.1 returns TIME columns as timedelta -- they are more like -# timedelta in terms of actual behavior as they are signed and include days -- -# and Django expects time, so we still need to override that. We also need to -# add special handling for SafeText and SafeBytes as MySQLdb's type -# checking is too tight to catch those (see Django ticket #6052). +# MySQLdb returns TIME columns as timedelta -- they are more like timedelta in +# terms of actual behavior as they are signed and include days -- and Django +# expects time, so we still need to override that. We also need to add special +# handling for SafeText and SafeBytes as MySQLdb's type checking is too tight +# to catch those (see Django ticket #6052). django_conversions = conversions.copy() django_conversions.update({ FIELD_TYPE.TIME: backend_utils.typecast_time, @@ -83,13 +82,6 @@ def adapt_datetime_warn_on_aware_datetime(value, conv): server_version_re = re.compile(r'(\d{1,2})\.(\d{1,2})\.(\d{1,2})') -# MySQLdb-1.2.1 and newer automatically makes use of SHOW WARNINGS on -# MySQL-4.1 and newer, so the MysqlDebugWrapper is unnecessary. Since the -# point is to raise Warnings as exceptions, this can be done with the Python -# warning module, and this is setup when the connection is created, and the -# standard backend_utils.CursorDebugWrapper can be used. Also, using sql_mode -# TRADITIONAL will automatically cause most warnings to be treated as errors. - class CursorWrapper(object): """ A thin wrapper around MySQLdb's normal cursor class so that we can catch @@ -137,8 +129,8 @@ def __enter__(self): return self def __exit__(self, type, value, traceback): - # Ticket #17671 - Close instead of passing thru to avoid backend - # specific behavior. + # Close instead of passing through to avoid backend-specific behavior + # (#17671). self.close() diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py index ae4370935a27..c53b9f83353d 100644 --- a/django/db/backends/mysql/creation.py +++ b/django/db/backends/mysql/creation.py @@ -25,7 +25,7 @@ def _clone_test_db(self, number, verbosity, keepdb=False): with self._nodb_connection.cursor() as cursor: try: cursor.execute("CREATE DATABASE %s" % qn(target_database_name)) - except Exception as e: + except Exception: if keepdb: return try: diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index 457c8b7f4866..b429e6a3cf8b 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -6,6 +6,7 @@ from django.db.backends.base.introspection import ( BaseDatabaseIntrospection, FieldInfo, TableInfo, ) +from django.db.models.indexes import Index from django.utils.datastructures import OrderedSet from django.utils.deprecation import RemovedInDjango21Warning from django.utils.encoding import force_text @@ -217,7 +218,7 @@ def get_constraints(self, cursor, table_name): 'foreign_key': None, } constraints[index]['index'] = True - constraints[index]['type'] = type_.lower() + constraints[index]['type'] = Index.suffix if type_ == 'BTREE' else type_.lower() constraints[index]['columns'].add(column) # Convert the sorted sets to lists for constraint in constraints.values(): diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 8e23b95fed2b..2de74da5f81e 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -200,9 +200,12 @@ def _connect_string(self): settings_dict['PASSWORD'], dsn) def get_connection_params(self): - conn_params = self.settings_dict['OPTIONS'].copy() - if 'use_returning_into' in conn_params: - del conn_params['use_returning_into'] + # Specify encoding to support unicode in DSN. + conn_params = {'encoding': 'UTF-8', 'nencoding': 'UTF-8'} + user_params = self.settings_dict['OPTIONS'].copy() + if 'use_returning_into' in user_params: + del user_params['use_returning_into'] + conn_params.update(user_params) return conn_params def get_new_connection(self, conn_params): @@ -359,6 +362,8 @@ def __init__(self, param, cursor, strings_only=False): elif string_size > 4000: # Mark any string param greater than 4000 characters as a CLOB. self.input_size = Database.CLOB + elif isinstance(param, decimal.Decimal): + self.input_size = Database.NUMBER else: self.input_size = None @@ -400,11 +405,24 @@ class FormatStylePlaceholderCursor(object): def __init__(self, connection): self.cursor = connection.cursor() - # Necessary to retrieve decimal values without rounding error. - self.cursor.numbersAsStrings = True + self.cursor.outputtypehandler = self._output_type_handler # Default arraysize of 1 is highly sub-optimal. self.cursor.arraysize = 100 + @staticmethod + def _output_type_handler(cursor, name, defaultType, length, precision, scale): + """ + Called for each db column fetched from cursors. Return numbers as + strings so that decimal values don't have rounding error. + """ + if defaultType == Database.NUMBER: + return cursor.var( + Database.STRING, + size=255, + arraysize=cursor.arraysize, + outconverter=str, + ) + def _format_params(self, params): try: return {k: OracleParam(v, self, True) for k, v in params.items()} @@ -550,7 +568,8 @@ def _rowfactory(row, cursor): casted = [] for value, desc in zip(row, cursor.description): if value is not None and desc[1] is Database.NUMBER: - precision, scale = desc[4:6] + precision = desc[4] or 0 + scale = desc[5] or 0 if scale == -127: if precision == 0: # NUMBER column: decimal-precision floating point diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index d34f2a2d5079..911f19b50ee1 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -96,6 +96,8 @@ def _create_test_db(self, verbosity=1, autoclobber=False, keepdb=False): print("Tests cancelled.") sys.exit(1) + # Cursor must be closed before closing connection. + cursor.close() self._maindb_connection.close() # done with main user -- test user and tablespaces created self._switch_to_test_user(parameters) return self.connection.settings_dict['NAME'] @@ -180,6 +182,8 @@ def _destroy_test_db(self, test_database_name, verbosity=1): if verbosity >= 1: print('Destroying test database tables...') self._execute_test_db_destruction(cursor, parameters, verbosity) + # Cursor must be closed before closing connection. + cursor.close() self._maindb_connection.close() def _execute_test_db_creation(self, cursor, parameters, verbosity, keepdb=False): diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py index 7af2a18a8ddd..3cc96e4a83ac 100644 --- a/django/db/backends/oracle/introspection.py +++ b/django/db/backends/oracle/introspection.py @@ -16,22 +16,15 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): cx_Oracle.CLOB: 'TextField', cx_Oracle.DATETIME: 'DateField', cx_Oracle.FIXED_CHAR: 'CharField', + cx_Oracle.FIXED_NCHAR: 'CharField', + cx_Oracle.NATIVE_FLOAT: 'FloatField', + cx_Oracle.NCHAR: 'CharField', cx_Oracle.NCLOB: 'TextField', cx_Oracle.NUMBER: 'DecimalField', cx_Oracle.STRING: 'CharField', cx_Oracle.TIMESTAMP: 'DateTimeField', } - try: - data_types_reverse[cx_Oracle.NATIVE_FLOAT] = 'FloatField' - except AttributeError: - pass - - try: - data_types_reverse[cx_Oracle.UNICODE] = 'CharField' - except AttributeError: - pass - cache_bust_counter = 1 def get_field_type(self, data_type, description): @@ -84,7 +77,13 @@ def get_table_description(self, cursor, table_name): name = force_text(desc[0]) # cx_Oracle always returns a 'str' on both Python 2 and 3 internal_size, default = field_map[name] name = name % {} # cx_Oracle, for some reason, doubles percent signs. - description.append(FieldInfo(*(name.lower(),) + desc[1:3] + (internal_size,) + desc[4:] + (default,))) + description.append(FieldInfo(*( + (name.lower(),) + + desc[1:3] + + (internal_size, desc[4] or 0, desc[5] or 0) + + desc[6:] + + (default,) + ))) return description def table_name_converter(self, name): @@ -281,7 +280,7 @@ def get_constraints(self, cursor, table_name): "foreign_key": None, "check": False, "index": True, - "type": 'btree' if type_ == 'normal' else type_, + "type": 'idx' if type_ == 'normal' else type_, } # Record the details constraints[constraint]['columns'].append(column) diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 9c382895b713..1af985bfcbae 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -522,13 +522,11 @@ def combine_expression(self, connector, sub_expressions): def _get_sequence_name(self, table): name_length = self.max_name_length() - 3 - sequence_name = '%s_SQ' % strip_quotes(table) - return truncate_name(sequence_name, name_length).upper() + return '%s_SQ' % truncate_name(strip_quotes(table), name_length).upper() def _get_trigger_name(self, table): name_length = self.max_name_length() - 3 - trigger_name = '%s_TR' % strip_quotes(table) - return truncate_name(trigger_name, name_length).upper() + return '%s_TR' % truncate_name(strip_quotes(table), name_length).upper() def bulk_insert_sql(self, fields, placeholder_rows): return " UNION ALL ".join( diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index c40a67b2e154..df5f37b43ab8 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -32,8 +32,8 @@ def psycopg2_version(): PSYCOPG2_VERSION = psycopg2_version() -if PSYCOPG2_VERSION < (2, 4, 5): - raise ImproperlyConfigured("psycopg2_version 2.4.5 or newer is required; you have %s" % psycopg2.__version__) +if PSYCOPG2_VERSION < (2, 5, 4): + raise ImproperlyConfigured("psycopg2_version 2.5.4 or newer is required; you have %s" % psycopg2.__version__) # Some of these import psycopg2, so import them after checking if it's installed. diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py index 2f26b14e5227..c47bb534f2d5 100644 --- a/django/db/backends/postgresql/creation.py +++ b/django/db/backends/postgresql/creation.py @@ -41,7 +41,7 @@ def _clone_test_db(self, number, verbosity, keepdb=False): with self._nodb_connection.cursor() as cursor: try: cursor.execute(creation_sql) - except Exception as e: + except Exception: if keepdb: return try: diff --git a/django/db/backends/postgresql/introspection.py b/django/db/backends/postgresql/introspection.py index e9d7d0225f23..032a777aa535 100644 --- a/django/db/backends/postgresql/introspection.py +++ b/django/db/backends/postgresql/introspection.py @@ -5,6 +5,7 @@ from django.db.backends.base.introspection import ( BaseDatabaseIntrospection, FieldInfo, TableInfo, ) +from django.db.models.indexes import Index from django.utils.deprecation import RemovedInDjango21Warning from django.utils.encoding import force_text @@ -195,13 +196,17 @@ def get_constraints(self, cursor, table_name): "options": options, } # Now get indexes + # The row_number() function for ordering the index fields can be + # replaced by WITH ORDINALITY in the unnest() functions when support + # for PostgreSQL 9.3 is dropped. cursor.execute(""" SELECT - indexname, array_agg(attname), indisunique, indisprimary, - array_agg(ordering), amname, exprdef, s2.attoptions + indexname, array_agg(attname ORDER BY rnum), indisunique, indisprimary, + array_agg(ordering ORDER BY rnum), amname, exprdef, s2.attoptions FROM ( SELECT - c2.relname as indexname, idx.*, attr.attname, am.amname, + row_number() OVER () as rnum, c2.relname as indexname, + idx.*, attr.attname, am.amname, CASE WHEN idx.indexprs IS NOT NULL THEN pg_get_indexdef(idx.indexrelid) @@ -236,7 +241,7 @@ def get_constraints(self, cursor, table_name): "foreign_key": None, "check": False, "index": True, - "type": type_, + "type": Index.suffix if type_ == 'btree' else type_, "definition": definition, "options": options, } diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index 20f60ab5ae69..f2206397250c 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -83,8 +83,8 @@ def lookup_cast(self, lookup_type, internal_type=None): 'istartswith', 'endswith', 'iendswith', 'regex', 'iregex'): if internal_type in ('IPAddressField', 'GenericIPAddressField'): lookup = "HOST(%s)" - elif internal_type in ('CharField', 'TextField'): - lookup = '%s' + elif internal_type in ('CICharField', 'CIEmailField', 'CITextField'): + lookup = '%s::citext' else: lookup = "%s::text" @@ -262,7 +262,7 @@ def subtract_temporals(self, internal_type, lhs, rhs): if internal_type == 'DateField': lhs_sql, lhs_params = lhs rhs_sql, rhs_params = rhs - return "age(%s, %s)" % (lhs_sql, rhs_sql), lhs_params + rhs_params + return "(interval '1 day' * (%s - %s))" % (lhs_sql, rhs_sql), lhs_params + rhs_params return super(DatabaseOperations, self).subtract_temporals(internal_type, lhs, rhs) def fulltext_search_sql(self, field_name): diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index 7d24ca6f2614..637a6a533282 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -4,6 +4,7 @@ from django.db.backends.base.introspection import ( BaseDatabaseIntrospection, FieldInfo, TableInfo, ) +from django.db.models.indexes import Index from django.utils.deprecation import RemovedInDjango21Warning field_size_re = re.compile(r'^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$') @@ -262,7 +263,7 @@ def get_constraints(self, cursor, table_name): # Add type and column orders for indexes if constraints[index]['index'] and not constraints[index]['unique']: # SQLite doesn't support any index type other than b-tree - constraints[index]['type'] = 'btree' + constraints[index]['type'] = Index.suffix cursor.execute( "SELECT sql FROM sqlite_master " "WHERE type='index' AND name=%s" % self.connection.ops.quote_name(index) diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py index 73f1dbb6908e..e7f55d29728f 100644 --- a/django/db/backends/utils.py +++ b/django/db/backends/utils.py @@ -36,9 +36,9 @@ def __enter__(self): return self def __exit__(self, type, value, traceback): - # Ticket #17671 - Close instead of passing thru to avoid backend - # specific behavior. Catch errors liberally because errors in cleanup - # code aren't useful. + # Close instead of passing through to avoid backend-specific behavior + # (#17671). Catch errors liberally because errors in cleanup code + # aren't useful. try: self.close() except self.db.Database.Error: @@ -179,14 +179,35 @@ def rev_typecast_decimal(d): return str(d) -def truncate_name(name, length=None, hash_len=4): - """Shortens a string to a repeatable mangled version with the given length. +def split_identifier(identifier): """ + Split a SQL identifier into a two element tuple of (namespace, name). + + The identifier could be a table, column, or sequence name might be prefixed + by a namespace. + """ + try: + namespace, name = identifier.split('"."') + except ValueError: + namespace, name = '', identifier + return namespace.strip('"'), name.strip('"') + + +def truncate_name(identifier, length=None, hash_len=4): + """ + Shorten a SQL identifier to a repeatable mangled version with the given + length. + + If a quote stripped name contains a namespace, e.g. USERNAME"."TABLE, + truncate the table portion only. + """ + namespace, name = split_identifier(identifier) + if length is None or len(name) <= length: - return name + return identifier - hsh = hashlib.md5(force_bytes(name)).hexdigest()[:hash_len] - return '%s%s' % (name[:length - hash_len], hsh) + digest = hashlib.md5(force_bytes(name)).hexdigest()[:hash_len] + return '%s%s%s' % ('%s"."' % namespace if namespace else '', name[:length - hash_len], digest) def format_number(value, max_digits, decimal_places): diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py index bbbde07a9843..be39b09e26a2 100644 --- a/django/db/migrations/loader.py +++ b/django/db/migrations/loader.py @@ -89,8 +89,9 @@ def load_disk(self): continue raise else: - # PY3 will happily import empty dirs as namespaces. - if not hasattr(module, '__file__'): + # Empty directories are namespaces. + # getattr() needed on PY36 and older (replace w/attribute access). + if getattr(module, '__file__', None) is None: self.unmigrated_apps.add(app_config.label) continue # Module is not a package (e.g. migrations.py). diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py index 4ce465a0c36b..0d5e69047229 100644 --- a/django/db/migrations/operations/fields.py +++ b/django/db/migrations/operations/fields.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals +from django.core.exceptions import FieldDoesNotExist from django.db.models.fields import NOT_PROVIDED from django.utils.functional import cached_property from .base import Operation +from .utils import is_referenced_by_foreign_key class FieldOperation(Operation): @@ -200,8 +202,12 @@ def state_forwards(self, app_label, state): ] # TODO: investigate if old relational fields must be reloaded or if it's # sufficient if the new field is (#27737). - # Delay rendering of relationships if it's not a relational field - delay = not field.is_relation + # Delay rendering of relationships if it's not a relational field and + # not referenced by a foreign key. + delay = ( + not field.is_relation and + not is_referenced_by_foreign_key(state, self.model_name_lower, self.field, self.name) + ) state.reload_model(app_label, self.model_name_lower, delay=delay) def database_forwards(self, app_label, schema_editor, from_state, to_state): @@ -268,25 +274,31 @@ def deconstruct(self): ) def state_forwards(self, app_label, state): + model_state = state.models[app_label, self.model_name_lower] # Rename the field - state.models[app_label, self.model_name_lower].fields = [ - (self.new_name if n == self.old_name else n, f) - for n, f in state.models[app_label, self.model_name_lower].fields - ] + fields = model_state.fields + for index, (name, field) in enumerate(fields): + if name == self.old_name: + fields[index] = (self.new_name, field) + # Delay rendering of relationships if it's not a relational + # field and not referenced by a foreign key. + delay = ( + not field.is_relation and + not is_referenced_by_foreign_key(state, self.model_name_lower, field, self.name) + ) + break + else: + raise FieldDoesNotExist( + "%s.%s has no field named '%s'" % (app_label, self.model_name, self.old_name) + ) # Fix index/unique_together to refer to the new field - options = state.models[app_label, self.model_name_lower].options + options = model_state.options for option in ('index_together', 'unique_together'): if option in options: options[option] = [ [self.new_name if n == self.old_name else n for n in together] for together in options[option] ] - for n, f in state.models[app_label, self.model_name_lower].fields: - if n == self.new_name: - field = f - break - # Delay rendering of relationships if it's not a relational field - delay = not field.is_relation state.reload_model(app_label, self.model_name_lower, delay=delay) def database_forwards(self, app_label, schema_editor, from_state, to_state): diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index 16cadc7a2fbc..8019bd72dc80 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -777,7 +777,10 @@ def __init__(self, model_name, index): def state_forwards(self, app_label, state): model_state = state.models[app_label, self.model_name_lower] - model_state.options[self.option_name].append(self.index) + indexes = list(model_state.options[self.option_name]) + indexes.append(self.index.clone()) + model_state.options[self.option_name] = indexes + state.reload_model(app_label, self.model_name_lower, delay=True) def database_forwards(self, app_label, schema_editor, from_state, to_state): model = to_state.apps.get_model(app_label, self.model_name) @@ -821,6 +824,7 @@ def state_forwards(self, app_label, state): model_state = state.models[app_label, self.model_name_lower] indexes = model_state.options[self.option_name] model_state.options[self.option_name] = [idx for idx in indexes if idx.name != self.name] + state.reload_model(app_label, self.model_name_lower, delay=True) def database_forwards(self, app_label, schema_editor, from_state, to_state): model = from_state.apps.get_model(app_label, self.model_name) diff --git a/django/db/migrations/operations/special.py b/django/db/migrations/operations/special.py index 66c5a3af278f..e27d2578194c 100644 --- a/django/db/migrations/operations/special.py +++ b/django/db/migrations/operations/special.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from django.db import router +from django.utils import six from .base import Operation @@ -203,3 +204,11 @@ def describe(self): @staticmethod def noop(apps, schema_editor): return None + + +# Allow migrations using RunPython.noop to be squashed on Python 2 (it doesn't +# support serializing unbound methods so install a module function instead). +if six.PY2: + def noop(apps, schema_editor): + return None + RunPython.noop = staticmethod(noop) diff --git a/django/db/migrations/operations/utils.py b/django/db/migrations/operations/utils.py new file mode 100644 index 000000000000..af23ea956346 --- /dev/null +++ b/django/db/migrations/operations/utils.py @@ -0,0 +1,9 @@ +def is_referenced_by_foreign_key(state, model_name_lower, field, field_name): + for state_app_label, state_model in state.models: + for _, f in state.models[state_app_label, state_model].fields: + if (f.related_model and + '%s.%s' % (state_app_label, model_name_lower) == f.related_model.lower() and + hasattr(f, 'to_fields')): + if (f.to_fields[0] is None and field.primary_key) or field_name in f.to_fields: + return True + return False diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py index df08508a109f..6668e33fda60 100644 --- a/django/db/migrations/questioner.py +++ b/django/db/migrations/questioner.py @@ -46,7 +46,8 @@ def ask_initial(self, app_label): except ImportError: return self.defaults.get("ask_initial", False) else: - if hasattr(migrations_module, "__file__"): + # getattr() needed on PY36 and older (replace with attribute access). + if getattr(migrations_module, "__file__", None): filenames = os.listdir(os.path.dirname(migrations_module.__file__)) elif hasattr(migrations_module, "__path__"): if len(migrations_module.__path__) > 1: diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py index e44f737106e8..0ba8eea89f07 100644 --- a/django/db/migrations/state.py +++ b/django/db/migrations/state.py @@ -460,6 +460,12 @@ def from_model(cls, model, exclude_rels=False): elif name == "index_together": it = model._meta.original_attrs["index_together"] options[name] = set(normalize_together(it)) + elif name == "indexes": + indexes = [idx.clone() for idx in model._meta.indexes] + for index in indexes: + if not index.name: + index.set_name_with_model(model) + options['indexes'] = indexes else: options[name] = model._meta.original_attrs[name] # Force-convert all options to text_type (#23226) @@ -578,6 +584,9 @@ def clone(self): app_label=self.app_label, name=self.name, fields=list(self.fields), + # Since options are shallow-copied here, operations such as + # AddIndex must replace their option (e.g 'indexes') rather + # than mutating it. options=dict(self.options), bases=self.bases, managers=list(self.managers), diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py index 8ab11b098ad6..06806fcdc4c3 100644 --- a/django/db/models/__init__.py +++ b/django/db/models/__init__.py @@ -48,7 +48,8 @@ def permalink(func): warnings.warn( 'permalink() is deprecated in favor of calling django.urls.reverse() ' 'in the decorated method.', - RemovedInDjango21Warning + RemovedInDjango21Warning, + stacklevel=2, ) @wraps(func) diff --git a/django/db/models/base.py b/django/db/models/base.py index 53b761f45ab7..cf8f44919c22 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -303,12 +303,9 @@ def __new__(cls, name, bases, attrs): else: new_class.add_to_class(field.name, copy.deepcopy(field)) - # Set the name of _meta.indexes. This can't be done in - # Options.contribute_to_class() because fields haven't been added to - # the model at that point. - for index in new_class._meta.indexes: - if not index.name: - index.set_name_with_model(new_class) + # Copy indexes so that index names are unique when models extend an + # abstract model. + new_class._meta.indexes = [copy.deepcopy(idx) for idx in new_class._meta.indexes] if abstract: # Abstract base models can't be instantiated and don't appear in @@ -368,6 +365,13 @@ def _prepare(cls): manager.auto_created = True cls.add_to_class('objects', manager) + # Set the name of _meta.indexes. This can't be done in + # Options.contribute_to_class() because fields haven't been added to + # the model at that point. + for index in cls._meta.indexes: + if not index.name: + index.set_name_with_model(cls) + class_prepared.send(sender=cls) def _requires_legacy_default_manager(cls): # RemovedInDjango20Warning diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py index 26073be3ba71..590d5a229816 100644 --- a/django/db/models/deletion.py +++ b/django/db/models/deletion.py @@ -286,8 +286,8 @@ def delete(self): # update fields for model, instances_for_fieldvalues in six.iteritems(self.field_updates): - query = sql.UpdateQuery(model) for (field, value), instances in six.iteritems(instances_for_fieldvalues): + query = sql.UpdateQuery(model) query.update_batch([obj.pk for obj in instances], {field.name: value}, self.using) diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 36c2b969db12..e7084ebfc68a 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -390,7 +390,7 @@ def as_sql(self, compiler, connection): return DurationExpression(self.lhs, self.connector, self.rhs).as_sql(compiler, connection) if (lhs_output and rhs_output and self.connector == self.SUB and lhs_output.get_internal_type() in {'DateField', 'DateTimeField', 'TimeField'} and - lhs_output.get_internal_type() == lhs_output.get_internal_type()): + lhs_output.get_internal_type() == rhs_output.get_internal_type()): return TemporalSubtraction(self.lhs, self.rhs).as_sql(compiler, connection) expressions = [] expression_params = [] @@ -570,8 +570,8 @@ def as_sql(self, compiler, connection, function=None, template=None, arg_joiner= data['expressions'] = data['field'] = arg_joiner.join(sql_parts) return template % data, params - def as_sqlite(self, compiler, connection): - sql, params = self.as_sql(compiler, connection) + def as_sqlite(self, compiler, connection, **extra_context): + sql, params = self.as_sql(compiler, connection, **extra_context) try: if self.output_field.get_internal_type() == 'DecimalField': sql = 'CAST(%s AS NUMERIC)' % sql @@ -933,10 +933,15 @@ def resolve_all(child): def resolve(child): if hasattr(child, 'resolve_expression'): - return child.resolve_expression( + resolved = child.resolve_expression( query=query, allow_joins=allow_joins, reuse=reuse, summarize=summarize, for_save=for_save, ) + # Add table alias to the parent query's aliases to prevent + # quoting. + if hasattr(resolved, 'alias') and resolved.alias != resolved.target.model._meta.db_table: + clone.queryset.query.external_aliases.add(resolved.alias) + return resolved return child resolve_all(clone.queryset.query.where) @@ -972,7 +977,6 @@ def as_sql(self, compiler, connection, template=None, **extra_context): template = template or template_params.get('template', self.template) sql = template % template_params - sql = connection.ops.unification_cast_sql(self.output_field) % sql return sql, sql_params def _prepare(self, output_field): @@ -1059,6 +1063,7 @@ def as_sql(self, compiler, connection, template=None, **extra_context): } placeholders.update(extra_context) template = template or self.template + params *= template.count('%(expression)s') return (template % placeholders).rstrip(), params def as_sqlite(self, compiler, connection): @@ -1085,6 +1090,9 @@ def get_group_by_cols(self): def reverse_ordering(self): self.descending = not self.descending + if self.nulls_first or self.nulls_last: + self.nulls_first = not self.nulls_first + self.nulls_last = not self.nulls_last return self def asc(self): diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index b7d60f99218c..8d40c77345a7 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -514,7 +514,11 @@ def __reduce__(self): # instance. The code below will create a new empty instance of # class self.__class__, then update its dict with self.__dict__ # values - so, this is very close to normal pickle. - return _empty, (self.__class__,), self.__dict__ + state = self.__dict__.copy() + # The _get_default cached_property can't be pickled due to lambda + # usage. + state.pop('_get_default', None) + return _empty, (self.__class__,), state return _load_field, (self.model._meta.app_label, self.model._meta.object_name, self.name) @@ -879,7 +883,7 @@ def formfield(self, form_class=None, choices_form_class=None, **kwargs): for k in list(kwargs): if k not in ('coerce', 'empty_value', 'choices', 'required', 'widget', 'label', 'initial', 'help_text', - 'error_messages', 'show_hidden_initial'): + 'error_messages', 'show_hidden_initial', 'disabled'): del kwargs[k] defaults.update(kwargs) if form_class is None: @@ -1616,8 +1620,8 @@ def formfield(self, **kwargs): class DurationField(Field): """Stores timedelta objects. - Uses interval on postgres, INVERAL DAY TO SECOND on Oracle, and bigint of - microseconds on other databases. + Uses interval on PostgreSQL, INTERVAL DAY TO SECOND on Oracle, and bigint + of microseconds on other databases. """ empty_strings_allowed = False default_error_messages = { @@ -2387,7 +2391,7 @@ def get_db_prep_value(self, value, connection, prepared=False): return value.hex def to_python(self, value): - if not isinstance(value, uuid.UUID): + if value is not None and not isinstance(value, uuid.UUID): try: return uuid.UUID(value) except (AttributeError, ValueError): diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index e877fc7ef4c1..6906b8f485cc 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -8,7 +8,6 @@ from django.core.files.base import File from django.core.files.images import ImageFile from django.core.files.storage import default_storage -from django.core.validators import validate_image_file_extension from django.db.models import signals from django.db.models.fields import Field from django.utils import six @@ -387,7 +386,6 @@ def delete(self, save=True): class ImageField(FileField): - default_validators = [validate_image_file_extension] attr_class = ImageFieldFile descriptor_class = ImageFileDescriptor description = _("Image") diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py index af6fdc3e25c1..d51f73d85500 100644 --- a/django/db/models/fields/related_descriptors.py +++ b/django/db/models/fields/related_descriptors.py @@ -288,7 +288,10 @@ def get_object(self, instance): # on the related model for every deferred field. if not any(field in fields for field in deferred): kwargs = {field: getattr(instance, field) for field in fields} - return rel_model(**kwargs) + obj = rel_model(**kwargs) + obj._state.adding = instance._state.adding + obj._state.db = instance._state.db + return obj return super(ForwardOneToOneDescriptor, self).get_object(instance) diff --git a/django/db/models/fields/related_lookups.py b/django/db/models/fields/related_lookups.py index bb3194ecd78b..25ae73816183 100644 --- a/django/db/models/fields/related_lookups.py +++ b/django/db/models/fields/related_lookups.py @@ -81,9 +81,11 @@ def as_sql(self, compiler, connection): AND) return root_constraint.as_sql(compiler, connection) else: - if getattr(self.rhs, '_forced_pk', False): + if (getattr(self.rhs, '_forced_pk', False) and + not getattr(self.lhs.field.target_field, 'primary_key', False)): self.rhs.clear_select_clause() - if getattr(self.lhs.output_field, 'primary_key', False): + if (getattr(self.lhs.output_field, 'primary_key', False) and + self.lhs.output_field.model == self.rhs.model): # A case like Restaurant.objects.filter(place__in=restaurant_qs), # where place is a OneToOneField and the primary key of # Restaurant. diff --git a/django/db/models/functions/base.py b/django/db/models/functions/base.py index ca73340b85ee..8adba2743c01 100644 --- a/django/db/models/functions/base.py +++ b/django/db/models/functions/base.py @@ -137,7 +137,7 @@ def __init__(self, *expressions, **extra): def as_sqlite(self, compiler, connection): """Use the MAX function on SQLite.""" - return super(Greatest, self).as_sql(compiler, connection, function='MAX') + return super(Greatest, self).as_sqlite(compiler, connection, function='MAX') class Least(Func): @@ -157,7 +157,7 @@ def __init__(self, *expressions, **extra): def as_sqlite(self, compiler, connection): """Use the MIN function on SQLite.""" - return super(Least, self).as_sql(compiler, connection, function='MIN') + return super(Least, self).as_sqlite(compiler, connection, function='MIN') class Length(Transform): diff --git a/django/db/models/indexes.py b/django/db/models/indexes.py index 59221312920e..7cda26508e43 100644 --- a/django/db/models/indexes.py +++ b/django/db/models/indexes.py @@ -2,16 +2,17 @@ import hashlib +from django.db.backends.utils import split_identifier from django.utils.encoding import force_bytes __all__ = [str('Index')] -# The max length of the names of the indexes (restricted to 30 due to Oracle) -MAX_NAME_LENGTH = 30 - class Index(object): suffix = 'idx' + # The max length of the name of the index (restricted to 30 for + # cross-database compatibility with Oracle) + max_name_length = 30 def __init__(self, fields=[], name=None): if not isinstance(fields, list): @@ -27,8 +28,8 @@ def __init__(self, fields=[], name=None): self.name = name or '' if self.name: errors = self.check_name() - if len(self.name) > MAX_NAME_LENGTH: - errors.append('Index names cannot be longer than %s characters.' % MAX_NAME_LENGTH) + if len(self.name) > self.max_name_length: + errors.append('Index names cannot be longer than %s characters.' % self.max_name_length) if errors: raise ValueError(errors) @@ -77,6 +78,11 @@ def deconstruct(self): path = path.replace('django.db.models.indexes', 'django.db.models') return (path, (), {'fields': self.fields, 'name': self.name}) + def clone(self): + """Create a copy of this Index.""" + path, args, kwargs = self.deconstruct() + return self.__class__(*args, **kwargs) + @staticmethod def _hash_generator(*args): """ @@ -96,19 +102,21 @@ def set_name_with_model(self, model): (8 chars) and unique hash + suffix (10 chars). Each part is made to fit its size by truncating the excess length. """ - table_name = model._meta.db_table + _, table_name = split_identifier(model._meta.db_table) column_names = [model._meta.get_field(field_name).column for field_name, order in self.fields_orders] column_names_with_order = [ (('-%s' if order else '%s') % column_name) for column_name, (field_name, order) in zip(column_names, self.fields_orders) ] + # The length of the parts of the name is based on the default max + # length of 30 characters. hash_data = [table_name] + column_names_with_order + [self.suffix] self.name = '%s_%s_%s' % ( table_name[:11], column_names[0][:7], '%s_%s' % (self._hash_generator(*hash_data), self.suffix), ) - assert len(self.name) <= 30, ( + assert len(self.name) <= self.max_name_length, ( 'Index too long for multiple database support. Is self.suffix ' 'longer than 3 characters?' ) diff --git a/django/db/models/options.py b/django/db/models/options.py index 335289beea94..71b80b8abb71 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -13,7 +13,6 @@ from django.db.models import Manager from django.db.models.fields import AutoField from django.db.models.fields.proxy import OrderWrt -from django.db.models.fields.related import OneToOneField from django.db.models.query_utils import PathInfo from django.utils import six from django.utils.datastructures import ImmutableList, OrderedSet @@ -298,11 +297,7 @@ def add_field(self, field, private=False, virtual=NOT_PROVIDED): def setup_pk(self, field): if not self.pk and field.primary_key: self.pk = field - # If the field is a OneToOneField and it's been marked as PK, then - # this is a multi-table inheritance PK. It needs to be serialized - # to relate the subclass instance to the superclass instance. - if not isinstance(field, OneToOneField): - field.serialize = False + field.serialize = False def setup_proxy(self, target): """ @@ -886,11 +881,14 @@ def has_auto_field(self, value): @cached_property def _property_names(self): - """ - Return a set of the names of the properties defined on the model. - Internal helper for model initialization. - """ - return frozenset({ - attr for attr in - dir(self.model) if isinstance(getattr(self.model, attr), property) - }) + """Return a set of the names of the properties defined on the model.""" + names = [] + for name in dir(self.model): + try: + attr = getattr(self.model, name) + except AttributeError: + pass + else: + if isinstance(attr, property): + names.append(name) + return frozenset(names) diff --git a/django/db/models/query.py b/django/db/models/query.py index f9534f370019..cbf35610db18 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -103,7 +103,7 @@ def __iter__(self): # extra(select=...) cols are always at the start of the row. names = extra_names + field_names + annotation_names - for row in compiler.results_iter(): + for row in compiler.results_iter(chunked_fetch=self.chunked_fetch): yield dict(zip(names, row)) @@ -119,7 +119,7 @@ def __iter__(self): compiler = query.get_compiler(queryset.db) if not query.extra_select and not query.annotation_select: - for row in compiler.results_iter(): + for row in compiler.results_iter(chunked_fetch=self.chunked_fetch): yield tuple(row) else: field_names = list(query.values_select) @@ -135,7 +135,7 @@ def __iter__(self): else: fields = names - for row in compiler.results_iter(): + for row in compiler.results_iter(chunked_fetch=self.chunked_fetch): data = dict(zip(names, row)) yield tuple(data[f] for f in fields) @@ -149,7 +149,7 @@ class FlatValuesListIterable(BaseIterable): def __iter__(self): queryset = self.queryset compiler = queryset.query.get_compiler(queryset.db) - for row in compiler.results_iter(): + for row in compiler.results_iter(chunked_fetch=self.chunked_fetch): yield row[0] @@ -319,7 +319,8 @@ def iterator(self): An iterator over the results from applying this QuerySet to the database. """ - return iter(self._iterable_class(self, chunked_fetch=True)) + use_chunked_fetch = not connections[self.db].settings_dict.get('DISABLE_SERVER_SIDE_CURSORS') + return iter(self._iterable_class(self, chunked_fetch=use_chunked_fetch)) def aggregate(self, *args, **kwargs): """ @@ -478,7 +479,9 @@ def update_or_create(self, defaults=None, **kwargs): try: obj = self.select_for_update().get(**lookup) except self.model.DoesNotExist: - obj, created = self._create_object_from_params(lookup, params) + # Lock the row so that a concurrent update is blocked until + # after update_or_create() has performed its save. + obj, created = self._create_object_from_params(lookup, params, lock=True) if created: return obj, created for k, v in six.iteritems(defaults): @@ -486,7 +489,7 @@ def update_or_create(self, defaults=None, **kwargs): obj.save(using=self.db) return obj, False - def _create_object_from_params(self, lookup, params): + def _create_object_from_params(self, lookup, params, lock=False): """ Tries to create an object using passed params. Used by get_or_create and update_or_create @@ -499,7 +502,8 @@ def _create_object_from_params(self, lookup, params): except IntegrityError: exc_info = sys.exc_info() try: - return self.get(**lookup), False + qs = self.select_for_update() if lock else self + return qs.get(**lookup), False except self.model.DoesNotExist: pass six.reraise(*exc_info) @@ -517,12 +521,14 @@ def _extract_model_params(self, defaults, **kwargs): lookup[f.name] = lookup.pop(f.attname) params = {k: v for k, v in kwargs.items() if LOOKUP_SEP not in k} params.update(defaults) + property_names = self.model._meta._property_names invalid_params = [] for param in params: try: self.model._meta.get_field(param) except exceptions.FieldDoesNotExist: - if param != 'pk': # It's okay to use a model's pk property. + # It's okay to use a model's property if it has a setter. + if not (param in property_names and getattr(self.model, param).fset): invalid_params.append(param) if invalid_params: raise exceptions.FieldError( @@ -835,12 +841,25 @@ def union(self, *other_qs, **kwargs): "union() received an unexpected keyword argument '%s'" % (unexpected_kwarg,) ) + # If the query is an EmptyQuerySet, combine all nonempty querysets. + if isinstance(self, EmptyQuerySet): + qs = [q for q in other_qs if not isinstance(q, EmptyQuerySet)] + return qs[0]._combinator_query('union', *qs[1:], **kwargs) if qs else self return self._combinator_query('union', *other_qs, **kwargs) def intersection(self, *other_qs): + # If any query is an EmptyQuerySet, return it. + if isinstance(self, EmptyQuerySet): + return self + for other in other_qs: + if isinstance(other, EmptyQuerySet): + return other return self._combinator_query('intersection', *other_qs) def difference(self, *other_qs): + # If the query is an EmptyQuerySet, return it. + if isinstance(self, EmptyQuerySet): + return self return self._combinator_query('difference', *other_qs) def select_for_update(self, nowait=False, skip_locked=False): @@ -1305,7 +1324,7 @@ def __init__(self, lookup, queryset=None, to_attr=None): self.prefetch_through = lookup # `prefetch_to` is the path to the attribute that stores the result. self.prefetch_to = lookup - if queryset is not None and queryset._iterable_class is not ModelIterable: + if queryset is not None and not issubclass(queryset._iterable_class, ModelIterable): raise ValueError('Prefetch querysets cannot use values().') if to_attr: self.prefetch_to = LOOKUP_SEP.join(lookup.split(LOOKUP_SEP)[:-1] + [to_attr]) @@ -1471,10 +1490,15 @@ def prefetch_related_objects(model_instances, *related_lookups): # that we can continue with nullable or reverse relations. new_obj_list = [] for obj in obj_list: - try: - new_obj = getattr(obj, through_attr) - except exceptions.ObjectDoesNotExist: - continue + if through_attr in getattr(obj, '_prefetched_objects_cache', ()): + # If related objects have been prefetched, use the + # cache rather than the object's through_attr. + new_obj = list(obj._prefetched_objects_cache.get(through_attr)) + else: + try: + new_obj = getattr(obj, through_attr) + except exceptions.ObjectDoesNotExist: + continue if new_obj is None: continue # We special-case `list` rather than something more generic diff --git a/django/db/models/signals.py b/django/db/models/signals.py index 5047f11743db..064428b4a661 100644 --- a/django/db/models/signals.py +++ b/django/db/models/signals.py @@ -6,7 +6,6 @@ from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning - class_prepared = Signal(providing_args=["class"]) diff --git a/django/db/models/sql/__init__.py b/django/db/models/sql/__init__.py index 31f45eb90dc9..762f8a5d624b 100644 --- a/django/db/models/sql/__init__.py +++ b/django/db/models/sql/__init__.py @@ -1,5 +1,6 @@ from django.core.exceptions import EmptyResultSet from django.db.models.sql.query import * # NOQA +from django.db.models.sql.query import Query from django.db.models.sql.subqueries import * # NOQA from django.db.models.sql.where import AND, OR diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 37442c06c436..edfe22e36685 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -379,7 +379,7 @@ def get_combinator_sql(self, combinator, all): features = self.connection.features compilers = [ query.get_compiler(self.using, self.connection) - for query in self.query.combined_queries + for query in self.query.combined_queries if not query.is_empty() ] if not features.supports_slicing_ordering_in_compound: for query, compiler in zip(self.query.combined_queries, compilers): @@ -387,7 +387,23 @@ def get_combinator_sql(self, combinator, all): raise DatabaseError('LIMIT/OFFSET not allowed in subqueries of compound statements.') if compiler.get_order_by(): raise DatabaseError('ORDER BY not allowed in subqueries of compound statements.') - parts = (compiler.as_sql() for compiler in compilers) + parts = () + for compiler in compilers: + try: + # If the columns list is limited, then all combined queries + # must have the same columns list. Set the selects defined on + # the query on all combined queries, if not already set. + if not compiler.query.values_select and self.query.values_select: + compiler.query.set_values(tuple(self.query.values_select) + tuple(self.query.annotation_select)) + parts += (compiler.as_sql(),) + except EmptyResultSet: + # Omit the empty queryset with UNION and with DIFFERENCE if the + # first queryset is nonempty. + if combinator == 'union' or (combinator == 'difference' and parts): + continue + raise + if not parts: + raise EmptyResultSet combinator_sql = self.connection.ops.set_operators[combinator] if all and combinator == 'union': combinator_sql += ' ALL' @@ -410,16 +426,7 @@ def as_sql(self, with_limits=True, with_col_aliases=False): refcounts_before = self.query.alias_refcount.copy() try: extra_select, order_by, group_by = self.pre_sql_setup() - distinct_fields = self.get_distinct() - - # This must come after 'select', 'ordering', and 'distinct' -- see - # docstring of get_from_clause() for details. - from_, f_params = self.get_from_clause() - for_update_part = None - where, w_params = self.compile(self.where) if self.where is not None else ("", []) - having, h_params = self.compile(self.having) if self.having is not None else ("", []) - combinator = self.query.combinator features = self.connection.features if combinator: @@ -427,6 +434,12 @@ def as_sql(self, with_limits=True, with_col_aliases=False): raise DatabaseError('{} not supported on this database backend.'.format(combinator)) result, params = self.get_combinator_sql(combinator, self.query.combinator_all) else: + distinct_fields = self.get_distinct() + # This must come after 'select', 'ordering', and 'distinct' + # (see docstring of get_from_clause() for details). + from_, f_params = self.get_from_clause() + where, w_params = self.compile(self.where) if self.where is not None else ("", []) + having, h_params = self.compile(self.having) if self.having is not None else ("", []) result = ['SELECT'] params = [] @@ -820,13 +833,12 @@ def apply_converters(self, row, converters): row[pos] = value return tuple(row) - def results_iter(self, results=None): + def results_iter(self, results=None, chunked_fetch=False): """ Returns an iterator over the results from executing this query. """ - converters = None if results is None: - results = self.execute_sql(MULTI) + results = self.execute_sql(MULTI, chunked_fetch=chunked_fetch) fields = [s[0] for s in self.select[0:self.col_count]] converters = self.get_converters(fields) for rows in results: @@ -875,7 +887,7 @@ def execute_sql(self, result_type=MULTI, chunked_fetch=False): cursor = self.connection.cursor() try: cursor.execute(sql, params) - except Exception: + except Exception as original_exception: try: # Might fail for server-side cursors (e.g. connection closed) cursor.close() @@ -884,7 +896,7 @@ def execute_sql(self, result_type=MULTI, chunked_fetch=False): # Python 2 doesn't chain exceptions. Remove this error # silencing when dropping Python 2 compatibility. pass - raise + raise original_exception if result_type == CURSOR: # Caller didn't specify a result_type, so just give them back the diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 5f657863737b..e51b1037ca30 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -133,7 +133,7 @@ def __init__(self, model, where=WhereNode): # types they are. The key is the alias of the joined table (possibly # the table name) and the value is a Join-like object (see # sql.datastructures.Join for more information). - self.alias_map = {} + self.alias_map = OrderedDict() # Sometimes the query contains references to aliases in outer queries (as # a result of split_exclude). Correct alias quoting needs to know these # aliases too. @@ -339,6 +339,7 @@ def clone(self, klass=None, memo=None, **kwargs): if hasattr(obj, '_setup_query'): obj._setup_query() obj.context = self.context.copy() + obj._forced_pk = getattr(self, '_forced_pk', False) return obj def add_context(self, key, value): @@ -415,12 +416,12 @@ def get_aggregation(self, using, added_aggregate_names): # aren't smart enough to remove the existing annotations from the # query, so those would force us to use GROUP BY. # - # If the query has limit or distinct, then those operations must be - # done in a subquery so that we are aggregating on the limit and/or - # distinct results instead of applying the distinct and limit after the - # aggregation. + # If the query has limit or distinct, or uses set operations, then + # those operations must be done in a subquery so that the query + # aggregates on the limit and/or distinct results instead of applying + # the distinct and limit after the aggregation. if (isinstance(self.group_by, list) or has_limit or has_existing_annotations or - self.distinct): + self.distinct or self.combinator): from django.db.models.sql.subqueries import AggregateQuery outer_query = AggregateQuery(self.model) inner_query = self.clone() @@ -901,27 +902,16 @@ def count_active_tables(self): def join(self, join, reuse=None): """ - Returns an alias for the join in 'connection', either reusing an - existing alias for that join or creating a new one. 'connection' is a - tuple (lhs, table, join_cols) where 'lhs' is either an existing - table alias or a table name. 'join_cols' is a tuple of tuples containing - columns to join on ((l_id1, r_id1), (l_id2, r_id2)). The join corresponds - to the SQL equivalent of:: + Return an alias for the 'join', either reusing an existing alias for + that join or creating a new one. 'join' is either a + sql.datastructures.BaseTable or Join. - lhs.l_id1 = table.r_id1 AND lhs.l_id2 = table.r_id2 - - The 'reuse' parameter can be either None which means all joins - (matching the connection) are reusable, or it can be a set containing - the aliases that can be reused. + The 'reuse' parameter can be either None which means all joins are + reusable, or it can be a set containing the aliases that can be reused. A join is always created as LOUTER if the lhs alias is LOUTER to make - sure we do not generate chains like t1 LOUTER t2 INNER t3. All new - joins are created as LOUTER if nullable is True. - - If 'nullable' is True, the join can potentially involve NULL values and - is a candidate for promotion (to "left outer") when combining querysets. - - The 'join_field' is the field we are joining along (if any). + sure chains like t1 LOUTER t2 INNER t3 aren't generated. All new + joins are created as LOUTER if the join is nullable. """ reuse = [a for a, j in self.alias_map.items() if (reuse is None or a in reuse) and j == join] @@ -1345,7 +1335,12 @@ def names_to_path(self, names, opts, allow_many=True, fail_on_missing=False): "querying. If it is a GenericForeignKey, consider " "adding a GenericRelation." % name ) - model = field.model._meta.concrete_model + try: + model = field.model._meta.concrete_model + except AttributeError: + # QuerySet.annotate() may introduce fields that aren't + # attached to a model. + model = None else: # We didn't find the current field, so move position back # one step. diff --git a/django/db/transaction.py b/django/db/transaction.py index e392c13b329d..412513b4751d 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -136,7 +136,7 @@ class Atomic(ContextDecorator): connection. None denotes the absence of a savepoint. This allows reentrancy even if the same AtomicWrapper is reused. For - example, it's possible to define `oa = @atomic('other')` and use `@oa` or + example, it's possible to define `oa = atomic('other')` and use `@oa` or `with oa:` multiple times. Since database connections are thread-local, this is thread-safe. diff --git a/django/forms/boundfield.py b/django/forms/boundfield.py index a1063b2b057b..c2c598ca6bbb 100644 --- a/django/forms/boundfield.py +++ b/django/forms/boundfield.py @@ -10,7 +10,7 @@ from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.functional import cached_property from django.utils.html import conditional_escape, format_html, html_safe -from django.utils.inspect import func_supports_parameter +from django.utils.inspect import func_accepts_kwargs, func_supports_parameter from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ @@ -57,6 +57,13 @@ def subwidgets(self): for widget in self.field.widget.subwidgets(self.html_name, self.value(), attrs=attrs) ) + def __bool__(self): + # BoundField evaluates to True even if it doesn't have subwidgets. + return True + + def __nonzero__(self): # Python 2 compatibility + return type(self).__bool__(self) + def __iter__(self): return iter(self.subwidgets) @@ -105,7 +112,7 @@ def as_widget(self, widget=None, attrs=None, only_initial=False): name = self.html_initial_name kwargs = {} - if func_supports_parameter(widget.render, 'renderer'): + if func_supports_parameter(widget.render, 'renderer') or func_accepts_kwargs(widget.render): kwargs['renderer'] = self.form.renderer else: warnings.warn( diff --git a/django/forms/fields.py b/django/forms/fields.py index 74cc3a6552db..734907644a0f 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -233,11 +233,12 @@ def __init__(self, max_length=None, min_length=None, strip=True, empty_value='', def to_python(self, value): "Returns a Unicode object." + if value not in self.empty_values: + value = force_text(value) + if self.strip: + value = value.strip() if value in self.empty_values: return self.empty_value - value = force_text(value) - if self.strip: - value = value.strip() return value def widget_attrs(self, widget): @@ -509,11 +510,9 @@ def to_python(self, value): class RegexField(CharField): - def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs): + def __init__(self, regex, max_length=None, min_length=None, *args, **kwargs): """ regex can be either a string or a compiled regular expression object. - error_message is an optional error message to use, if - 'Enter a valid value' is too generic for you. """ kwargs.setdefault('strip', False) super(RegexField, self).__init__(max_length, min_length, *args, **kwargs) @@ -606,12 +605,15 @@ def bound_data(self, data, initial): return data def has_changed(self, initial, data): + if self.disabled: + return False if data is None: return False return True class ImageField(FileField): + default_validators = [validators.validate_image_file_extension] default_error_messages = { 'invalid_image': _( "Upload a valid image. The file you uploaded was either not an " @@ -725,6 +727,8 @@ def validate(self, value): raise ValidationError(self.error_messages['required'], code='required') def has_changed(self, initial, data): + if self.disabled: + return False # Sometimes data or initial may be a string equivalent of a boolean # so we should run it through to_python first to get a boolean value return self.to_python(initial) != self.to_python(data) @@ -892,6 +896,8 @@ def validate(self, value): ) def has_changed(self, initial, data): + if self.disabled: + return False if initial is None: initial = [] if data is None: @@ -1070,6 +1076,8 @@ def compress(self, data_list): raise NotImplementedError('Subclasses must implement this method.') def has_changed(self, initial, data): + if self.disabled: + return False if initial is None: initial = ['' for x in range(0, len(data))] else: diff --git a/django/forms/formsets.py b/django/forms/formsets.py index 7d9e84113fc2..3b72697c24fa 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -342,7 +342,8 @@ def full_clean(self): return for i in range(0, self.total_form_count()): form = self.forms[i] - if not form.has_changed(): + # Empty forms are unchanged forms beyond those with initial data. + if not form.has_changed() and i >= self.initial_form_count(): empty_forms_count += 1 self._errors.append(form.errors) diff --git a/django/forms/jinja2/django/forms/widgets/attrs.html b/django/forms/jinja2/django/forms/widgets/attrs.html index b45d30c449db..76926d79fe7e 100644 --- a/django/forms/jinja2/django/forms/widgets/attrs.html +++ b/django/forms/jinja2/django/forms/widgets/attrs.html @@ -1 +1 @@ -{% for name, value in widget.attrs.items() %} {{ name }}{% if not value is sameas True %}="{{ value }}"{% endif %}{% endfor %} +{% for name, value in widget.attrs.items() %}{% if value is not sameas False %} {{ name }}{% if value is not sameas True %}="{{ value }}"{% endif %}{% endif %}{% endfor %} diff --git a/django/forms/jinja2/django/forms/widgets/clearable_file_input.html b/django/forms/jinja2/django/forms/widgets/clearable_file_input.html index 05f2c2dbe5d6..7248f32d2a67 100644 --- a/django/forms/jinja2/django/forms/widgets/clearable_file_input.html +++ b/django/forms/jinja2/django/forms/widgets/clearable_file_input.html @@ -1,5 +1,5 @@ -{% if is_initial %}{{ initial_text }}: {{ widget.value }}{% if not widget.required %} - -{% endif %}
-{{ input_text }}:{% endif %} +{% if widget.is_initial %}{{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %} + +{% endif %}
+{{ widget.input_text }}:{% endif %} diff --git a/django/forms/jinja2/django/forms/widgets/input.html b/django/forms/jinja2/django/forms/widgets/input.html index 7e70d1953fb7..abbdf6bd26d8 100644 --- a/django/forms/jinja2/django/forms/widgets/input.html +++ b/django/forms/jinja2/django/forms/widgets/input.html @@ -1 +1 @@ - + diff --git a/django/forms/jinja2/django/forms/widgets/multiple_input.html b/django/forms/jinja2/django/forms/widgets/multiple_input.html index be3d4499266a..21cd9b665dbf 100644 --- a/django/forms/jinja2/django/forms/widgets/multiple_input.html +++ b/django/forms/jinja2/django/forms/widgets/multiple_input.html @@ -1,5 +1,5 @@ -{% set id = widget.attrs.id %}{% for group, options, index in widget.optgroups %}{% if group %} -
  • {{ group }}{% endif %}{% for widget in options %} +{% set id = widget.attrs.id %}{% for group, options, index in widget.optgroups %}{% if group %} +
  • {{ group }}{% endif %}{% for widget in options %}
  • {% include widget.template_name %}
    • {% endfor %}{% if group %} {% endif %}{% endfor %} diff --git a/django/forms/jinja2/django/forms/widgets/multiwidget.html b/django/forms/jinja2/django/forms/widgets/multiwidget.html index 003071118257..ae120e91f558 100644 --- a/django/forms/jinja2/django/forms/widgets/multiwidget.html +++ b/django/forms/jinja2/django/forms/widgets/multiwidget.html @@ -1 +1 @@ -{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %} +{% for widget in widget.subwidgets -%}{% include widget.template_name %}{%- endfor %} diff --git a/django/forms/models.py b/django/forms/models.py index a0f3ff53b318..0e80e19042c3 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -84,6 +84,7 @@ def model_to_dict(instance, fields=None, exclude=None): fields will be excluded from the returned dict, even if they are listed in the ``fields`` argument. """ + from django.db import models opts = instance._meta data = {} for f in chain(opts.concrete_fields, opts.private_fields, opts.many_to_many): @@ -94,13 +95,25 @@ def model_to_dict(instance, fields=None, exclude=None): if exclude and f.name in exclude: continue data[f.name] = f.value_from_object(instance) + # Evaluate ManyToManyField QuerySets to prevent subsequent model + # alteration of that field from being reflected in the data. + if isinstance(f, models.ManyToManyField): + data[f.name] = list(data[f.name]) return data +def apply_limit_choices_to_to_formfield(formfield): + """Apply limit_choices_to to the formfield's queryset if needed.""" + if hasattr(formfield, 'queryset') and hasattr(formfield, 'get_limit_choices_to'): + limit_choices_to = formfield.get_limit_choices_to() + if limit_choices_to is not None: + formfield.queryset = formfield.queryset.complex_filter(limit_choices_to) + + def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield_callback=None, localized_fields=None, labels=None, help_texts=None, error_messages=None, - field_classes=None): + field_classes=None, apply_limit_choices_to=True): """ Returns a ``OrderedDict`` containing form fields for the given model. @@ -127,6 +140,9 @@ def fields_for_model(model, fields=None, exclude=None, widgets=None, ``field_classes`` is a dictionary of model field names mapped to a form field class. + + ``apply_limit_choices_to`` is a boolean indicating if limit_choices_to + should be applied to a field's queryset. """ field_list = [] ignored = [] @@ -170,11 +186,8 @@ def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield = formfield_callback(f, **kwargs) if formfield: - # Apply ``limit_choices_to``. - if hasattr(formfield, 'queryset') and hasattr(formfield, 'get_limit_choices_to'): - limit_choices_to = formfield.get_limit_choices_to() - if limit_choices_to is not None: - formfield.queryset = formfield.queryset.complex_filter(limit_choices_to) + if apply_limit_choices_to: + apply_limit_choices_to_to_formfield(formfield) field_list.append((f.name, formfield)) else: ignored.append(f.name) @@ -245,11 +258,13 @@ def __new__(mcs, name, bases, attrs): # fields from the model" opts.fields = None - fields = fields_for_model(opts.model, opts.fields, opts.exclude, - opts.widgets, formfield_callback, - opts.localized_fields, opts.labels, - opts.help_texts, opts.error_messages, - opts.field_classes) + fields = fields_for_model( + opts.model, opts.fields, opts.exclude, opts.widgets, + formfield_callback, opts.localized_fields, opts.labels, + opts.help_texts, opts.error_messages, opts.field_classes, + # limit_choices_to will be applied during ModelForm.__init__(). + apply_limit_choices_to=False, + ) # make sure opts.fields doesn't specify an invalid field none_model_fields = [k for k, v in six.iteritems(fields) if not v] @@ -296,6 +311,8 @@ def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, data, files, auto_id, prefix, object_data, error_class, label_suffix, empty_permitted, use_required_attribute=use_required_attribute, ) + for formfield in self.fields.values(): + apply_limit_choices_to_to_formfield(formfield) def _get_validation_exclusions(self): """ @@ -894,12 +911,17 @@ def initial_form_count(self): def _construct_form(self, i, **kwargs): form = super(BaseInlineFormSet, self)._construct_form(i, **kwargs) if self.save_as_new: + mutable = getattr(form.data, '_mutable', None) + # Allow modifying an immutable QueryDict. + if mutable is not None: + form.data._mutable = True # Remove the primary key from the form's data, we are only # creating new instances form.data[form.add_prefix(self._pk_field.name)] = None - # Remove the foreign key from the form's data form.data[form.add_prefix(self.fk.name)] = None + if mutable is not None: + form.data._mutable = mutable # Set the fk value here so that the form can do its validation. fk_value = self.instance.pk @@ -1165,7 +1187,8 @@ def get_limit_choices_to(self): def __deepcopy__(self, memo): result = super(ChoiceField, self).__deepcopy__(memo) # Need to force a new ModelChoiceIterator to be created, bug #11183 - result.queryset = result.queryset + if self.queryset is not None: + result.queryset = self.queryset.all() return result def _get_queryset(self): @@ -1226,6 +1249,8 @@ def validate(self, value): return Field.validate(self, value) def has_changed(self, initial, data): + if self.disabled: + return False initial_value = initial if initial is not None else '' data_value = data if data is not None else '' return force_text(self.prepare_value(initial_value)) != force_text(data_value) @@ -1313,6 +1338,8 @@ def prepare_value(self, value): return super(ModelMultipleChoiceField, self).prepare_value(value) def has_changed(self, initial, data): + if self.disabled: + return False if initial is None: initial = [] if data is None: diff --git a/django/forms/templates/django/forms/widgets/attrs.html b/django/forms/templates/django/forms/widgets/attrs.html index caca0cd80c03..7a5592afcb22 100644 --- a/django/forms/templates/django/forms/widgets/attrs.html +++ b/django/forms/templates/django/forms/widgets/attrs.html @@ -1 +1 @@ -{% for name, value in widget.attrs.items %} {{ name }}{% if not value is True %}="{{ value }}"{% endif %}{% endfor %} \ No newline at end of file +{% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %} \ No newline at end of file diff --git a/django/forms/templates/django/forms/widgets/clearable_file_input.html b/django/forms/templates/django/forms/widgets/clearable_file_input.html index 05f2c2dbe5d6..7248f32d2a67 100644 --- a/django/forms/templates/django/forms/widgets/clearable_file_input.html +++ b/django/forms/templates/django/forms/widgets/clearable_file_input.html @@ -1,5 +1,5 @@ -{% if is_initial %}{{ initial_text }}: {{ widget.value }}{% if not widget.required %} - -{% endif %}
    -{{ input_text }}:{% endif %} +{% if widget.is_initial %}{{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %} + +{% endif %}
    +{{ widget.input_text }}:{% endif %} diff --git a/django/forms/templates/django/forms/widgets/input.html b/django/forms/templates/django/forms/widgets/input.html index 7e70d1953fb7..5feef43c553b 100644 --- a/django/forms/templates/django/forms/widgets/input.html +++ b/django/forms/templates/django/forms/widgets/input.html @@ -1 +1 @@ - + diff --git a/django/forms/templates/django/forms/widgets/multiple_input.html b/django/forms/templates/django/forms/widgets/multiple_input.html index 60282ff887c8..0ba994287458 100644 --- a/django/forms/templates/django/forms/widgets/multiple_input.html +++ b/django/forms/templates/django/forms/widgets/multiple_input.html @@ -1,5 +1,5 @@ -{% with id=widget.attrs.id %}{% for group, options, index in widget.optgroups %}{% if group %} -
  • {{ group }}{% endif %}{% for option in options %} +{% with id=widget.attrs.id %}{% for group, options, index in widget.optgroups %}{% if group %} +
  • {{ group }}{% endif %}{% for option in options %}
  • {% include option.template_name with widget=option %}
    • {% endfor %}{% if group %} {% endif %}{% endfor %} {% endwith %} diff --git a/django/forms/templates/django/forms/widgets/multiwidget.html b/django/forms/templates/django/forms/widgets/multiwidget.html index 003071118257..7e687a136bd9 100644 --- a/django/forms/templates/django/forms/widgets/multiwidget.html +++ b/django/forms/templates/django/forms/widgets/multiwidget.html @@ -1 +1 @@ -{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %} +{% spaceless %}{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %}{% endspaceless %} diff --git a/django/forms/templates/django/forms/widgets/select_option.html b/django/forms/templates/django/forms/widgets/select_option.html index c6355f69dd5c..8d31961dd336 100644 --- a/django/forms/templates/django/forms/widgets/select_option.html +++ b/django/forms/templates/django/forms/widgets/select_option.html @@ -1 +1 @@ - + diff --git a/django/forms/widgets.py b/django/forms/widgets.py index a2f674fcdd47..5e82c06213ee 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -7,7 +7,6 @@ import copy import datetime import re -from contextlib import contextmanager from itertools import chain from django.conf import settings @@ -196,13 +195,13 @@ def format_value(self, value): """ Return a value as it should appear when rendered in a template. """ - if value is None: - value = '' + if value == '' or value is None: + return None if self.is_localized: return formats.localize_input(value) return force_text(value) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = {} context['widget'] = { 'name': name, @@ -272,7 +271,7 @@ def __init__(self, attrs=None): self.input_type = attrs.pop('type', self.input_type) super(Input, self).__init__(attrs) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(Input, self).get_context(name, value, attrs) context['widget']['type'] = self.input_type return context @@ -324,7 +323,7 @@ class MultipleHiddenInput(HiddenInput): """ template_name = 'django/forms/widgets/multiple_hidden.html' - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(MultipleHiddenInput, self).get_context(name, value, attrs) final_attrs = context['widget']['attrs'] id_ = context['widget']['attrs'].get('id') @@ -406,11 +405,11 @@ def format_value(self, value): if self.is_initial(value): return value - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ClearableFileInput, self).get_context(name, value, attrs) checkbox_name = self.clear_checkbox_name(name) checkbox_id = self.clear_checkbox_id(checkbox_name) - context.update({ + context['widget'].update({ 'checkbox_name': checkbox_name, 'checkbox_id': checkbox_id, 'is_initial': self.is_initial(value), @@ -437,6 +436,12 @@ def value_from_datadict(self, data, files, name): def use_required_attribute(self, initial): return super(ClearableFileInput, self).use_required_attribute(initial) and not initial + def value_omitted_from_data(self, data, files, name): + return ( + super(ClearableFileInput, self).value_omitted_from_data(data, files, name) and + self.clear_checkbox_name(name) not in data + ) + class Textarea(Widget): template_name = 'django/forms/widgets/textarea.html' @@ -458,7 +463,9 @@ def __init__(self, attrs=None, format=None): self.format = format if format else None def format_value(self, value): - return formats.localize_input(value, self.format or formats.get_format(self.format_key)[0]) + if value is not None: + # localize_input() returns str on Python 2. + return force_text(formats.localize_input(value, self.format or formats.get_format(self.format_key)[0])) class DateInput(DateTimeBaseInput): @@ -497,10 +504,12 @@ def format_value(self, value): return return force_text(value) - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): if self.check_test(value): if attrs is None: attrs = {} + else: + attrs = attrs.copy() attrs['checked'] = True return super(CheckboxInput, self).get_context(name, value, attrs) @@ -554,10 +563,6 @@ def subwidgets(self, name, value, attrs=None): for option in self.options(name, value, attrs): yield option - def render(self, name, value, attrs=None, renderer=None): - context = self.get_context(name, value, attrs) - return self._render(self.template_name, context, renderer) - def options(self, name, value, attrs=None): """Yield a flat list of options for this widgets.""" for group in self.optgroups(name, value, attrs): @@ -566,38 +571,34 @@ def options(self, name, value, attrs=None): def optgroups(self, name, value, attrs=None): """Return a list of optgroups for this widget.""" - default = (None, [], 0) - groups = [default] + groups = [] has_selected = False - for option_value, option_label in chain(self.choices): + for index, (option_value, option_label) in enumerate(chain(self.choices)): if option_value is None: option_value = '' - else: - option_value = force_text(option_value) + subgroup = [] if isinstance(option_label, (list, tuple)): - index = groups[-1][2] + 1 + group_name = option_value subindex = 0 - subgroup = [] - groups.append((option_value, subgroup, index)) choices = option_label else: - index = len(default[1]) - subgroup = default[1] + group_name = None subindex = None choices = [(option_value, option_label)] + groups.append((group_name, subgroup, index)) for subvalue, sublabel in choices: selected = ( - subvalue in value and + force_text(subvalue) in value and (has_selected is False or self.allow_multiple_selected) ) if selected is True and has_selected is False: has_selected = True subgroup.append(self.create_option( - name, subvalue, sublabel, selected, index, subindex, - attrs=attrs, + name, subvalue, sublabel, selected, index, + subindex=subindex, attrs=attrs, )) if subindex is not None: subindex += 1 @@ -612,18 +613,18 @@ def create_option(self, name, value, label, selected, index, subindex=None, attr option_attrs.update(self.checked_attribute) if 'id' in option_attrs: option_attrs['id'] = self.id_for_label(option_attrs['id'], index) - return dict( - name=name, - value=value, - label=label, - selected=selected, - index=index, - attrs=option_attrs, - type=self.input_type, - template_name=self.option_template_name, - ) + return { + 'name': name, + 'value': value, + 'label': label, + 'selected': selected, + 'index': index, + 'attrs': option_attrs, + 'type': self.input_type, + 'template_name': self.option_template_name, + } - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(ChoiceWidget, self).get_context(name, value, attrs) context['widget']['optgroups'] = self.optgroups(name, context['widget']['value'], attrs) context['wrap_label'] = True @@ -647,24 +648,13 @@ def value_from_datadict(self, data, files, name): pass return getter(name) - @contextmanager - def override_choices(self, choices): - old = self.choices - self.choices = choices - yield - self.choices = old - def format_value(self, value): - """Return selected values as a set.""" + """Return selected values as a list.""" + if value is None and self.allow_multiple_selected: + return [] if not isinstance(value, (tuple, list)): value = [value] - values = set() - for v in value: - if v is None: - values.add('') - else: - values.add(force_text(v)) - return values + return [force_text(v) if v is not None else '' for v in value] class Select(ChoiceWidget): @@ -675,7 +665,7 @@ class Select(ChoiceWidget): checked_attribute = {'selected': True} option_inherits_attrs = False - def get_context(self, name, value, attrs=None): + def get_context(self, name, value, attrs): context = super(Select, self).get_context(name, value, attrs) if self.allow_multiple_selected: context['widget']['attrs']['multiple'] = 'multiple' @@ -744,6 +734,11 @@ def value_from_datadict(self, data, files, name): getter = data.get return getter(name) + def value_omitted_from_data(self, data, files, name): + # An unselected - Your website: + Your website: Comment: ``label_suffix`` @@ -409,7 +409,7 @@ For each field, we describe the default widget used if you don't specify The ``invalid_choice`` error message may contain ``%(value)s``, which will be replaced with the selected choice. - Takes one extra required argument: + Takes one extra argument: .. attribute:: choices @@ -419,6 +419,7 @@ For each field, we describe the default widget used if you don't specify model field. See the :ref:`model field reference documentation on choices ` for more details. If the argument is a callable, it is evaluated each time the field's form is initialized. + Defaults to an empty list. ``TypedChoiceField`` -------------------- @@ -988,7 +989,7 @@ Slightly complex built-in ``Field`` classes Once all fields are cleaned, the list of clean values is combined into a single value by :meth:`~MultiValueField.compress`. - Also takes one extra optional argument: + Also takes some optional arguments: .. attribute:: require_all_fields @@ -1123,9 +1124,9 @@ method:: .. attribute:: queryset - A ``QuerySet`` of model objects from which the choices for the - field will be derived, and which will be used to validate the - user's selection. + A ``QuerySet`` of model objects from which the choices for the field + are derived and which is used to validate the user's selection. It's + evaluated when the form is rendered. ``ModelChoiceField`` also takes two optional arguments: diff --git a/docs/ref/forms/renderers.txt b/docs/ref/forms/renderers.txt index c94b5ef2264b..1f2f48d4b943 100644 --- a/docs/ref/forms/renderers.txt +++ b/docs/ref/forms/renderers.txt @@ -90,12 +90,14 @@ templates based on what's configured in the :setting:`TEMPLATES` setting. Using this renderer along with the built-in widget templates requires either: -#. ``'django.forms'`` in :setting:`INSTALLED_APPS` and at least one engine - with :setting:`APP_DIRS=True `. +* ``'django.forms'`` in :setting:`INSTALLED_APPS` and at least one engine + with :setting:`APP_DIRS=True `. -#. Adding the built-in widgets templates directory (``django/forms/templates`` - or ``django/forms/jinja2``) in :setting:`DIRS ` of one of - your template engines. +* Adding the built-in widgets templates directory in :setting:`DIRS + ` of one of your template engines. To generate that path:: + + import django + django.__path__[0] + '/forms/templates' # or '/forms/jinja2' Using this renderer requires you to make sure the form templates your project needs can be located. diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt index b57f44cb6c72..719175e9f1f9 100644 --- a/docs/ref/forms/validation.txt +++ b/docs/ref/forms/validation.txt @@ -69,8 +69,9 @@ overridden: formfield-specific piece of validation and, possibly, cleaning/normalizing the data. - This method should return the cleaned value obtained from ``cleaned_data``, - regardless of whether it changed anything or not. + The return value of this method replaces the existing value in + ``cleaned_data``, so it must be the field's value from ``cleaned_data`` (even + if this method didn't change it) or a new cleaned value. * The form subclass's ``clean()`` method can perform validation that requires access to multiple form fields. This is where you might put in checks such as @@ -315,8 +316,8 @@ write a cleaning method that operates on the ``recipients`` field, like so:: if "fred@example.com" not in data: raise forms.ValidationError("You have forgotten about Fred!") - # Always return the cleaned data, whether you have changed it or - # not. + # Always return a value to use as the new cleaned data, even if + # this method didn't change it. return data .. _validating-fields-with-clean: diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt index f0301c1eeeb3..cad9f173808b 100644 --- a/docs/ref/forms/widgets.txt +++ b/docs/ref/forms/widgets.txt @@ -241,7 +241,7 @@ foundation for custom widgets. In older versions, this method is a private API named ``_format_value()``. The old name will work until Django 2.0. - .. method:: get_context(name, value, attrs=None) + .. method:: get_context(name, value, attrs) .. versionadded:: 1.11 @@ -263,7 +263,7 @@ foundation for custom widgets. ``Widget`` subclasses can provide custom context values by overriding this method. - .. method:: id_for_label(self, id_) + .. method:: id_for_label(id_) Returns the HTML ID attribute of this widget for use by a ``