diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 606884eb1f..2a8c5b7c76 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: 2015-10-09 17:42+0200\n" +"POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -241,8 +241,8 @@ msgstr "" msgid "Burmese" msgstr "" -#: conf/global_settings.py:106 -msgid "Norwegian Bokmal" +#: conf/global_settings.py:113 +msgid "Norwegian Bokmål" msgstr "" #: conf/global_settings.py:107 @@ -373,10 +373,6 @@ msgstr "" msgid "Syndication" msgstr "" -#: contrib/webdesign/apps.py:7 -msgid "Web Design" -msgstr "" - #: core/validators.py:33 msgid "Enter a valid value." msgstr "" @@ -529,7 +525,11 @@ msgstr "" msgid "'%(value)s' value must be an integer." msgstr "" -#: db/models/fields/__init__.py:1009 +#: db/models/fields/__init__.py:960 db/models/fields/__init__.py:1849 +msgid "Big (8 byte) integer" +msgstr "" + +#: db/models/fields/__init__.py:972 #, python-format msgid "'%(value)s' value must be either True or False." msgstr "" @@ -620,11 +620,7 @@ msgstr "" msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:1901 -msgid "Big (8 byte) integer" -msgstr "" - -#: db/models/fields/__init__.py:1916 +#: db/models/fields/__init__.py:1864 msgid "IPv4 address" msgstr "" @@ -714,7 +710,17 @@ msgstr "" msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1100 +#: db/models/fields/related.py:1049 +#, python-format +msgid "%(from)s-%(to)s relationship" +msgstr "" + +#: db/models/fields/related.py:1050 +#, python-format +msgid "%(from)s-%(to)s relationships" +msgstr "" + +#: db/models/fields/related.py:1092 msgid "Many-to-many relationship" msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 9cb7bee3c5..ff15889413 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: 2015-12-26 19:52+0100\n" +"POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -74,7 +74,15 @@ msgstr "" msgid "This year" msgstr "" -#: contrib/admin/forms.py:13 +#: contrib/admin/filters.py:359 +msgid "No date" +msgstr "" + +#: contrib/admin/filters.py:360 +msgid "Has date" +msgstr "" + +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -450,9 +458,9 @@ msgid "Log out" msgstr "" #: contrib/admin/templates/admin/change_form.html:21 -#: contrib/admin/templates/admin/index.html:31 -#: contrib/admin/templates/admin/related_widget_wrapper.html:16 -msgid "Add" +#: contrib/admin/templates/admin/change_list.html:49 +#, python-format +msgid "Add %(name)s" msgstr "" #: contrib/admin/templates/admin/change_form.html:33 @@ -466,11 +474,6 @@ msgstr "" msgid "View on site" msgstr "" -#: contrib/admin/templates/admin/change_list.html:49 -#, python-format -msgid "Add %(name)s" -msgstr "" - #: contrib/admin/templates/admin/change_list.html:69 msgid "Filter" msgstr "" @@ -582,16 +585,21 @@ msgstr "" msgid "Models in the %(name)s application" msgstr "" +#: contrib/admin/templates/admin/index.html:31 +#: contrib/admin/templates/admin/related_widget_wrapper.html:16 +msgid "Add" +msgstr "" + #: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" #: contrib/admin/templates/admin/index.html:55 -msgid "Recent Actions" +msgid "Recent actions" msgstr "" #: contrib/admin/templates/admin/index.html:56 -msgid "My Actions" +msgid "My actions" msgstr "" #: contrib/admin/templates/admin/index.html:60 diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po index a5d3b3b71b..0e51c84022 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" +"POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -167,14 +167,87 @@ msgstr "" msgid "Tomorrow" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:11 -msgid "" -"January February March April May June July August September October November " -"December" +#: contrib/admin/static/admin/js/calendar.js:12 +msgid "January" msgstr "" -#: contrib/admin/static/admin/js/calendar.js:12 -msgid "S M T W T F S" +#: contrib/admin/static/admin/js/calendar.js:13 +msgid "February" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:14 +msgid "March" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:15 +msgid "April" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:16 +msgid "May" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:17 +msgid "June" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:18 +msgid "July" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:19 +msgid "August" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:20 +msgid "September" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:21 +msgid "October" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:22 +msgid "November" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:23 +msgid "December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:26 +msgctxt "one letter Sunday" +msgid "S" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:27 +msgctxt "one letter Monday" +msgid "M" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:28 +msgctxt "one letter Tuesday" +msgid "T" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:29 +msgctxt "one letter Wednesday" +msgid "W" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:30 +msgctxt "one letter Thursday" +msgid "T" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:31 +msgctxt "one letter Friday" +msgid "F" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:32 +msgctxt "one letter Saturday" +msgid "S" msgstr "" #: contrib/admin/static/admin/js/collapse.js:10 diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index f1f9cb77d9..444d7b2c94 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: 2015-10-10 14:49+0200\n" +"POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -176,7 +176,7 @@ msgid "Arguments" msgstr "" #: contrib/admindocs/templates/admin_doc/model_detail.html:76 -msgid "Back to Model Documentation" +msgid "Back to Model documentation" msgstr "" #: contrib/admindocs/templates/admin_doc/model_index.html:18 @@ -201,7 +201,8 @@ msgstr "" msgid "Template: \"%(name)s\"" msgstr "" -#: contrib/admindocs/templates/admin_doc/template_detail.html:18 +#. Translators: Search is not a verb here, it qualifies path (a search path) +#: contrib/admindocs/templates/admin_doc/template_detail.html:19 #, python-format msgid "Search path for template \"%(name)s\":" msgstr "" @@ -268,7 +269,7 @@ msgid "Templates:" msgstr "" #: contrib/admindocs/templates/admin_doc/view_detail.html:32 -msgid "Back to Views Documentation" +msgid "Back to View documentation" msgstr "" #: contrib/admindocs/templates/admin_doc/view_index.html:16 diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index aa69218cc2..147b244e37 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/auth/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-10 15:10+0200\n" +"POT-Creation-Date: 2016-05-17 23:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -142,7 +142,27 @@ msgstr "" msgid "hash" msgstr "" -#: contrib/auth/hashers.py:335 +#: contrib/auth/hashers.py:347 +msgid "variety" +msgstr "" + +#: contrib/auth/hashers.py:348 +msgid "version" +msgstr "" + +#: contrib/auth/hashers.py:349 +msgid "memory cost" +msgstr "" + +#: contrib/auth/hashers.py:350 +msgid "time cost" +msgstr "" + +#: contrib/auth/hashers.py:351 +msgid "parallelism" +msgstr "" + +#: contrib/auth/hashers.py:445 msgid "work factor" msgstr "" @@ -206,17 +226,11 @@ msgstr "" msgid "username" msgstr "" -#: contrib/auth/models.py:308 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +#: contrib/auth/models.py:313 +msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: contrib/auth/models.py:312 -msgid "" -"Enter a valid username. This value may contain only letters, numbers and @/./" -"+/-/_ characters." -msgstr "" - -#: contrib/auth/models.py:317 +#: contrib/auth/models.py:316 msgid "A user with that username already exists." msgstr "" @@ -310,7 +324,19 @@ msgstr "" msgid "Password reset on %(site_name)s" msgstr "" -#: contrib/auth/views.py:125 +#: contrib/auth/validators.py:13 +msgid "" +"Enter a valid username. This value may contain only English letters, " +"numbers, and @/./+/-/_ characters." +msgstr "" + +#: contrib/auth/validators.py:23 +msgid "" +"Enter a valid username. This value may contain only letters, numbers, and " +"@/./+/-/_ characters." +msgstr "" + +#: contrib/auth/views.py:133 msgid "Logged out" msgstr ""