diff options
5 files changed, 42 insertions, 37 deletions
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 01fa3b1534..a1709b8de4 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 <en@li.org>\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 <code>python manage.py startapp [app_label]</code>." +"Next, start your first app by running <code>python manage.py startapp " +"[app_label]</code>." msgstr "" #: views/debug.py:513 diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 172c8224c3..7ff8058669 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 <en@li.org>\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/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index 444d7b2c94..d4cd33bed6 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 <en@li.org>\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/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po index 997f5f4405..060b2a2ac4 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 <en@li.org>\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/postgres/locale/en/LC_MESSAGES/django.po b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po index 2c0df915d6..0e00e7484b 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 <en@li.org>\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 |