merge lp:mailman/2.1 rev 1740

1 files changed, 31 insertions, 31 deletions

diff --git a/messages/mailman.pot b/messages/mailman.pot
index 9a665968..d4d18735 100644
--- a/messages/mailman.pot
+++ b/messages/mailman.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Tue Jan 30 17:13:37 2018\n"
+"POT-Creation-Date: Tue Jan 30 08:13:26 2018\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -249,7 +249,7 @@ msgstr ""
 #: Mailman/Cgi/confirm.py:62 Mailman/Cgi/edithtml.py:86
 #: Mailman/Cgi/listinfo.py:56 Mailman/Cgi/options.py:98
 #: Mailman/Cgi/private.py:108 Mailman/Cgi/rmlist.py:75
-#: Mailman/Cgi/roster.py:59 Mailman/Cgi/subscribe.py:66
+#: Mailman/Cgi/roster.py:59 Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
 msgstr ""
 
@@ -258,8 +258,8 @@ msgstr ""
 #: Mailman/Cgi/edithtml.py:103 Mailman/Cgi/listinfo.py:68
 #: Mailman/Cgi/options.py:117 Mailman/Cgi/private.py:125
 #: Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72 Mailman/Cgi/roster.py:146
-#: Mailman/Cgi/roster.py:147 Mailman/Cgi/subscribe.py:54
-#: Mailman/Cgi/subscribe.py:65 Mailman/Cgi/subscribe.py:80
+#: Mailman/Cgi/roster.py:147 Mailman/Cgi/subscribe.py:55
+#: Mailman/Cgi/subscribe.py:66 Mailman/Cgi/subscribe.py:81
 msgid "Error"
 msgstr ""
 
@@ -268,7 +268,7 @@ msgstr ""
 #: Mailman/Cgi/edithtml.py:104 Mailman/Cgi/listinfo.py:69
 #: Mailman/Cgi/options.py:81 Mailman/Cgi/options.py:118
 #: Mailman/Cgi/private.py:126 Mailman/Cgi/rmlist.py:49
-#: Mailman/Cgi/roster.py:73 Mailman/Cgi/subscribe.py:81
+#: Mailman/Cgi/roster.py:73 Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
 msgstr ""
 
@@ -2593,7 +2593,7 @@ msgstr ""
 msgid "Delete this list"
 msgstr ""
 
-#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:55
+#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:56
 msgid "Invalid options to CGI script"
 msgstr ""
 
@@ -2601,51 +2601,51 @@ msgstr ""
 msgid "%(realname)s roster authentication failed."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:127
+#: Mailman/Cgi/subscribe.py:128
 msgid "You must supply a valid email address."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:151
-msgid "reCAPTCHA validation failed: %s"
+#: Mailman/Cgi/subscribe.py:153
+msgid "reCAPTCHA validation failed: %(e_codes)s"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:154
-msgid "reCAPTCHA could not be validated: %s"
+#: Mailman/Cgi/subscribe.py:156
+msgid "reCAPTCHA could not be validated: %(e_reason)s"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:179
+#: Mailman/Cgi/subscribe.py:181
 msgid "The form is too old.  Please GET it again."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:182
+#: Mailman/Cgi/subscribe.py:184
 msgid "Please take a few seconds to fill out the form before submitting it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:185
+#: Mailman/Cgi/subscribe.py:187
 msgid "The hidden token didn't match.  Did your IP change?"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:188
+#: Mailman/Cgi/subscribe.py:190
 msgid "There was no hidden token in your submission or it was corrupted."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:189
+#: Mailman/Cgi/subscribe.py:191
 msgid "You must GET the form before submitting it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:193
+#: Mailman/Cgi/subscribe.py:195
 msgid "You may not subscribe a list to itself!"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:201
+#: Mailman/Cgi/subscribe.py:203
 msgid "If you supply a password, you must confirm it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:203
+#: Mailman/Cgi/subscribe.py:205
 msgid "Your passwords did not match."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:237
+#: Mailman/Cgi/subscribe.py:239
 msgid ""
 "Your subscription request has been received, and will soon be acted upon.\n"
 "Depending on the configuration of this mailing list, your subscription request\n"
@@ -2654,26 +2654,26 @@ msgid ""
 "email which contains further instructions."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:251
+#: Mailman/Cgi/subscribe.py:253
 msgid ""
 "The email address you supplied is banned from this\n"
 "        mailing list.  If you think this restriction is erroneous, please\n"
 "        contact the list owners at %(listowner)s."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:255
+#: Mailman/Cgi/subscribe.py:257
 msgid ""
 "The email address you supplied is not valid.  (E.g. it must contain an\n"
 "`@'.)"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:259
+#: Mailman/Cgi/subscribe.py:261
 msgid ""
 "Your subscription is not allowed because the email address you gave is\n"
 "insecure."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:267
+#: Mailman/Cgi/subscribe.py:269
 msgid ""
 "Confirmation from your email address is required, to prevent anyone from\n"
 "subscribing you without permission.  Instructions are being sent to you at\n"
@@ -2681,22 +2681,22 @@ msgid ""
 "your subscription."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:279
+#: Mailman/Cgi/subscribe.py:281
 msgid ""
 "Your subscription request was deferred because %(x)s.  Your request has been\n"
 "forwarded to the list moderator.  You will receive email informing you of the\n"
 "moderator's decision when they get to your request."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:286 Mailman/Commands/cmd_confirm.py:61
+#: Mailman/Cgi/subscribe.py:288 Mailman/Commands/cmd_confirm.py:61
 msgid "You are already subscribed."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:300
+#: Mailman/Cgi/subscribe.py:302
 msgid "Mailman privacy alert"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:301
+#: Mailman/Cgi/subscribe.py:303
 msgid ""
 "An attempt was made to subscribe your address to the mailing list\n"
 "%(listaddr)s.  You are already subscribed to this mailing list.\n"
@@ -2712,15 +2712,15 @@ msgid ""
 "to the list administrator at %(listowner)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:320
+#: Mailman/Cgi/subscribe.py:322
 msgid "This list does not support digest delivery."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:322
+#: Mailman/Cgi/subscribe.py:324
 msgid "This list only supports digest delivery."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:329
+#: Mailman/Cgi/subscribe.py:331
 msgid "You have been successfully subscribed to the %(realname)s mailing list."
 msgstr ""