From 1cd2584c980ca547ba34d7b0f9d2dc89569803fb Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Wed, 18 Mar 2015 09:18:50 +0100
Subject: [PATCH] [1.8.x] Updated translation catalogs

Strings are frozen in anticipation of the Django 1.8 release.
---
 django/conf/locale/en/LC_MESSAGES/django.po   |   8 +-
 .../auth/locale/en/LC_MESSAGES/django.po      | 127 +++++++++---------
 .../flatpages/locale/en/LC_MESSAGES/django.po |   8 +-
 .../gis/locale/en/LC_MESSAGES/django.po       |  37 +++--
 .../postgres/locale/en/LC_MESSAGES/django.po  |  30 ++++-
 5 files changed, 121 insertions(+), 89 deletions(-)

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 29219941db..ad4ab8b066 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-01-18 20:56+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -349,7 +349,11 @@ msgstr ""
 msgid "Traditional Chinese"
 msgstr ""
 
-#: contrib/sitemaps/apps.py:8
+#: contrib/messages/apps.py:7
+msgid "Messages"
+msgstr ""
+
+#: contrib/sitemaps/apps.py:7
 msgid "Site Maps"
 msgstr ""
 
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
index 03447e81b7..3812af0831 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-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,23 +13,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/auth/admin.py:45
+#: contrib/auth/admin.py:46
 msgid "Personal info"
 msgstr ""
 
-#: contrib/auth/admin.py:46
+#: contrib/auth/admin.py:47
 msgid "Permissions"
 msgstr ""
 
-#: contrib/auth/admin.py:48
+#: contrib/auth/admin.py:49
 msgid "Important dates"
 msgstr ""
 
-#: contrib/auth/admin.py:133
+#: contrib/auth/admin.py:129
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: contrib/auth/admin.py:139
 msgid "Password changed successfully."
 msgstr ""
 
-#: contrib/auth/admin.py:144
+#: contrib/auth/admin.py:150
 #, python-format
 msgid "Change password: %s"
 msgstr ""
@@ -38,73 +43,71 @@ msgstr ""
 msgid "Authentication and Authorization"
 msgstr ""
 
-#: contrib/auth/forms.py:38 contrib/auth/tests/test_forms.py:315
-#: contrib/auth/tests/test_forms.py:320 contrib/auth/tests/test_forms.py:530
+#: contrib/auth/forms.py:30
 msgid "No password set."
 msgstr ""
 
-#: contrib/auth/forms.py:44 contrib/auth/tests/test_forms.py:325
-#: contrib/auth/tests/test_forms.py:331
+#: contrib/auth/forms.py:36
 msgid "Invalid password format or unknown hashing algorithm."
 msgstr ""
 
-#: contrib/auth/forms.py:77 contrib/auth/forms.py:273
-#: contrib/auth/forms.py:337
+#: contrib/auth/forms.py:69 contrib/auth/forms.py:265
+#: contrib/auth/forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: contrib/auth/forms.py:79 contrib/auth/forms.py:108
-#: contrib/auth/forms.py:136 contrib/auth/forms.py:341
+#: contrib/auth/forms.py:71 contrib/auth/forms.py:100
+#: contrib/auth/forms.py:128 contrib/auth/forms.py:333
 msgid "Password"
 msgstr ""
 
-#: contrib/auth/forms.py:81
+#: contrib/auth/forms.py:73
 msgid "Password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:83 contrib/auth/forms.py:347
+#: contrib/auth/forms.py:75 contrib/auth/forms.py:339
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: contrib/auth/forms.py:109
+#: contrib/auth/forms.py:101
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: contrib/auth/forms.py:139
+#: contrib/auth/forms.py:131
 #, python-format
 msgid ""
 "Please enter a correct %(username)s and password. Note that both fields may "
 "be case-sensitive."
 msgstr ""
 
-#: contrib/auth/forms.py:141
+#: contrib/auth/forms.py:133
 msgid "This account is inactive."
 msgstr ""
 
-#: contrib/auth/forms.py:204
+#: contrib/auth/forms.py:196
 msgid "Email"
 msgstr ""
 
-#: contrib/auth/forms.py:275
+#: contrib/auth/forms.py:267
 msgid "New password"
 msgstr ""
 
-#: contrib/auth/forms.py:277
+#: contrib/auth/forms.py:269
 msgid "New password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:308
+#: contrib/auth/forms.py:300
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: contrib/auth/forms.py:311
+#: contrib/auth/forms.py:303
 msgid "Old password"
 msgstr ""
 
-#: contrib/auth/forms.py:345
+#: contrib/auth/forms.py:337
 msgid "Password (again)"
 msgstr ""
 
@@ -139,119 +142,119 @@ msgstr ""
 msgid "checksum"
 msgstr ""
 
-#: contrib/auth/models.py:65 contrib/auth/models.py:116
+#: contrib/auth/models.py:64 contrib/auth/models.py:115
 msgid "name"
 msgstr ""
 
-#: contrib/auth/models.py:67
+#: contrib/auth/models.py:66
 msgid "codename"
 msgstr ""
 
-#: contrib/auth/models.py:71
+#: contrib/auth/models.py:70
 msgid "permission"
 msgstr ""
 
-#: contrib/auth/models.py:72 contrib/auth/models.py:118
+#: contrib/auth/models.py:71 contrib/auth/models.py:117
 msgid "permissions"
 msgstr ""
 
-#: contrib/auth/models.py:123
+#: contrib/auth/models.py:122
 msgid "group"
 msgstr ""
 
-#: contrib/auth/models.py:124 contrib/auth/models.py:312
+#: contrib/auth/models.py:123 contrib/auth/models.py:311
 msgid "groups"
 msgstr ""
 
-#: contrib/auth/models.py:197
+#: contrib/auth/models.py:196
 msgid "password"
 msgstr ""
 
-#: contrib/auth/models.py:198
+#: contrib/auth/models.py:197
 msgid "last login"
 msgstr ""
 
-#: contrib/auth/models.py:309
+#: contrib/auth/models.py:308
 msgid "superuser status"
 msgstr ""
 
-#: contrib/auth/models.py:310
+#: contrib/auth/models.py:309
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: contrib/auth/models.py:313
+#: contrib/auth/models.py:312
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of their groups."
 msgstr ""
 
-#: contrib/auth/models.py:318
+#: contrib/auth/models.py:317
 msgid "user permissions"
 msgstr ""
 
-#: contrib/auth/models.py:319
+#: contrib/auth/models.py:318
 msgid "Specific permissions for this user."
 msgstr ""
 
-#: contrib/auth/models.py:386
+#: contrib/auth/models.py:385
 msgid "username"
 msgstr ""
 
-#: contrib/auth/models.py:387
+#: contrib/auth/models.py:386
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: contrib/auth/models.py:391
+#: contrib/auth/models.py:390
 msgid ""
 "Enter a valid username. This value may contain only letters, numbers and @/./"
 "+/-/_ characters."
 msgstr ""
 
-#: contrib/auth/models.py:396
+#: contrib/auth/models.py:395
 msgid "A user with that username already exists."
 msgstr ""
 
-#: contrib/auth/models.py:398
+#: contrib/auth/models.py:397
 msgid "first name"
 msgstr ""
 
-#: contrib/auth/models.py:399
+#: contrib/auth/models.py:398
 msgid "last name"
 msgstr ""
 
-#: contrib/auth/models.py:400
+#: contrib/auth/models.py:399
 msgid "email address"
 msgstr ""
 
-#: contrib/auth/models.py:401
+#: contrib/auth/models.py:400
 msgid "staff status"
 msgstr ""
 
-#: contrib/auth/models.py:402
+#: contrib/auth/models.py:401
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: contrib/auth/models.py:404
+#: contrib/auth/models.py:403
 msgid "active"
 msgstr ""
 
-#: contrib/auth/models.py:405
+#: contrib/auth/models.py:404
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: contrib/auth/models.py:407
+#: contrib/auth/models.py:406
 msgid "date joined"
 msgstr ""
 
-#: contrib/auth/models.py:415
+#: contrib/auth/models.py:414
 msgid "user"
 msgstr ""
 
-#: contrib/auth/models.py:416
+#: contrib/auth/models.py:415
 msgid "users"
 msgstr ""
 
@@ -260,38 +263,34 @@ msgstr ""
 msgid "Password reset on %(site_name)s"
 msgstr ""
 
-#: contrib/auth/tests/test_forms.py:383
-msgid "Enter a valid email address."
-msgstr ""
-
-#: contrib/auth/views.py:98
+#: contrib/auth/views.py:102
 msgid "Logged out"
 msgstr ""
 
-#: contrib/auth/views.py:184
+#: contrib/auth/views.py:188
 msgid "Password reset"
 msgstr ""
 
-#: contrib/auth/views.py:199
+#: contrib/auth/views.py:203
 msgid "Password reset sent"
 msgstr ""
 
-#: contrib/auth/views.py:237
+#: contrib/auth/views.py:242
 msgid "Enter new password"
 msgstr ""
 
-#: contrib/auth/views.py:248
+#: contrib/auth/views.py:253
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: contrib/auth/views.py:268
+#: contrib/auth/views.py:273
 msgid "Password reset complete"
 msgstr ""
 
-#: contrib/auth/views.py:305
+#: contrib/auth/views.py:310
 msgid "Password change"
 msgstr ""
 
-#: contrib/auth/views.py:321
+#: contrib/auth/views.py:326
 msgid "Password change successful"
 msgstr ""
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
index 10fa09aa9d..bab242cb9e 100644
--- a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/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-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Advanced options"
 msgstr ""
 
-#: contrib/flatpages/apps.py:8
+#: contrib/flatpages/apps.py:7
 msgid "Flat Pages"
 msgstr ""
 
@@ -86,7 +86,3 @@ msgstr ""
 #: contrib/flatpages/models.py:30
 msgid "flat pages"
 msgstr ""
-
-#: contrib/flatpages/tests/test_forms.py:98
-msgid "This field is required."
-msgstr ""
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
index 6dec22a1f9..d1048f72f8 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-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gis/apps.py:9
+#: contrib/gis/apps.py:8
 msgid "GIS"
 msgstr ""
 
@@ -21,35 +21,35 @@ msgstr ""
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:324
+#: contrib/gis/db/models/fields.py:325
 msgid "Point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:330
+#: contrib/gis/db/models/fields.py:331
 msgid "Line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:336
+#: contrib/gis/db/models/fields.py:337
 msgid "Polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:342
+#: contrib/gis/db/models/fields.py:343
 msgid "Multi-point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:348
+#: contrib/gis/db/models/fields.py:349
 msgid "Multi-line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:354
+#: contrib/gis/db/models/fields.py:355
 msgid "Multi polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:360
+#: contrib/gis/db/models/fields.py:361
 msgid "Geometry collection"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:366
+#: contrib/gis/db/models/fields.py:367
 msgid "Extent Aggregate Field"
 msgstr ""
 
@@ -71,6 +71,23 @@ msgid ""
 "form field."
 msgstr ""
 
+#: contrib/gis/templates/gis/admin/openlayers.html:35
+#: contrib/gis/templates/gis/openlayers.html:18
+msgid "Delete all Features"
+msgstr ""
+
+#: contrib/gis/templates/gis/admin/openlayers.html:37
+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
+msgid "Debugging window (serialized value)"
+msgstr ""
+
 #: contrib/gis/views.py:10
 msgid "No feeds are registered."
 msgstr ""
diff --git a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po
index b53d02a493..724a5b955e 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: 2015-01-18 20:56+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
 "PO-Revision-Date: 2015-01-18 20:56+0100\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,26 +18,26 @@ msgstr ""
 msgid "PostgreSQL extensions"
 msgstr ""
 
-#: contrib/postgres/fields/array.py:23 contrib/postgres/forms/array.py:13
-#: contrib/postgres/forms/array.py:143
+#: contrib/postgres/fields/array.py:22 contrib/postgres/forms/array.py:15
+#: contrib/postgres/forms/array.py:145
 #, python-format
 msgid "Item %(nth)s in the array did not validate: "
 msgstr ""
 
-#: contrib/postgres/fields/array.py:24
+#: contrib/postgres/fields/array.py:23
 msgid "Nested arrays must have the same length."
 msgstr ""
 
-#: contrib/postgres/fields/hstore.py:16
+#: contrib/postgres/fields/hstore.py:15
 msgid "Map of strings to strings"
 msgstr ""
 
-#: contrib/postgres/fields/hstore.py:18
+#: contrib/postgres/fields/hstore.py:17
 #, python-format
 msgid "The value of \"%(key)s\" is not a string."
 msgstr ""
 
-#: contrib/postgres/forms/hstore.py:16
+#: contrib/postgres/forms/hstore.py:15
 msgid "Could not load JSON data."
 msgstr ""
 
@@ -49,6 +49,22 @@ msgstr ""
 msgid "The start of the range must not exceed the end of the range."
 msgstr ""
 
+#: contrib/postgres/forms/ranges.py:52
+msgid "Enter two whole numbers."
+msgstr ""
+
+#: contrib/postgres/forms/ranges.py:58
+msgid "Enter two numbers."
+msgstr ""
+
+#: contrib/postgres/forms/ranges.py:64
+msgid "Enter two valid date/times."
+msgstr ""
+
+#: contrib/postgres/forms/ranges.py:70
+msgid "Enter two valid dates."
+msgstr ""
+
 #: contrib/postgres/validators.py:14
 #, python-format
 msgid ""