Update Japanese translation (with msgid fix)

3 files changed, 187 insertions, 171 deletions

diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 301d1733..f2ed8149 100755
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -148,10 +148,10 @@ def process_form(mlist, doc, cgidata, lang):
             captcha_response = json.load(httpresp)
             httpresp.close()
             if not captcha_response['success']:
-                results.append(_('reCAPTCHA validation failed: %s' %
-                    ', '.join(captcha_response['error-codes'])))
+                results.append(_('reCAPTCHA validation failed: %s') %
+                    ', '.join(captcha_response['error-codes']))
         except urllib2.URLError as e:
-            results.append(_('reCAPTCHA could not be validated: %s' % e.reason))
+            results.append(_('reCAPTCHA could not be validated: %s') % e.reason)
 
     # Are we checking the hidden data?
     if mm_cfg.SUBSCRIBE_FORM_SECRET:
diff --git a/messages/ja/LC_MESSAGES/mailman.po b/messages/ja/LC_MESSAGES/mailman.po
index 265c02cb..4800c98e 100755
--- a/messages/ja/LC_MESSAGES/mailman.po
+++ b/messages/ja/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1.23\n"
-"POT-Creation-Date: Sun Jan 21 09:23:53 2018\n"
+"POT-Creation-Date: Tue Jan 30 17:13:37 2018\n"
 "PO-Revision-Date: 2016-08-28 01:26+09:00\n"
 "Last-Translator: Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>\n"
 "Language-Team: Japanese <mailman-users-jp@googlegroups.com>\n"
@@ -245,29 +245,29 @@ msgid "Administrator"
 msgstr "管理者"
 
 #: Mailman/Cgi/admin.py:80 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
-#: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
+#: 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:63
+#: Mailman/Cgi/subscribe.py:66
 msgid "No such list <em>%(safelistname)s</em>"
 msgstr "<em>%(safelistname)s</em>というリストはありません"
 
 #: Mailman/Cgi/admin.py:95 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:117
+#: 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:51 Mailman/Cgi/subscribe.py:62
-#: Mailman/Cgi/subscribe.py:77
+#: Mailman/Cgi/subscribe.py:54 Mailman/Cgi/subscribe.py:65
+#: Mailman/Cgi/subscribe.py:80
 msgid "Error"
 msgstr "エラー"
 
 #: Mailman/Cgi/admin.py:96 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:81
+#: 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:78
+#: Mailman/Cgi/subscribe.py:81
 msgid "Invalid options to CGI script."
 msgstr "CGI のオプションが無効です."
 
@@ -322,11 +322,11 @@ msgstr ""
 msgid "%(hostname)s mailing lists - Admin Links"
 msgstr "%(hostname)s メーリングリスト - 管理リンク"
 
-#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:121
+#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:122
 msgid "Welcome!"
 msgstr "ようこそ!"
 
-#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:124
+#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:125
 msgid "Mailman"
 msgstr "Mailman"
 
@@ -378,16 +378,16 @@ msgstr "メーリングリスト一覧ページ"
 msgid "<p>(Send questions and comments to "
 msgstr "<p>(質問・コメントの宛先は: "
 
-#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:156 cron/mailpasswds:216
+#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:157 cron/mailpasswds:216
 msgid "List"
 msgstr "リスト"
 
 #: Mailman/Cgi/admin.py:336 Mailman/Cgi/admin.py:604
-#: Mailman/Cgi/listinfo.py:157
+#: Mailman/Cgi/listinfo.py:158
 msgid "Description"
 msgstr "説明"
 
-#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:163 bin/list_lists:130
+#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:164 bin/list_lists:130
 msgid "[no description available]"
 msgstr "[説明無し]"
 
@@ -853,7 +853,7 @@ msgstr "これらのアドレスをすぐに登録しますか? それとも招待しますか?"
 msgid "Invite"
 msgstr "招待"
 
-#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:199
+#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:200
 msgid "Subscribe"
 msgstr "入会を申し込む"
 
@@ -2360,11 +2360,11 @@ msgstr "ページは変更されませんでした."
 msgid "HTML successfully updated."
 msgstr "HTML の変更が完了しました."
 
-#: Mailman/Cgi/listinfo.py:89
+#: Mailman/Cgi/listinfo.py:90
 msgid "%(hostname)s Mailing Lists"
 msgstr "%(hostname)s メーリングリスト"
 
-#: Mailman/Cgi/listinfo.py:127
+#: Mailman/Cgi/listinfo.py:128
 msgid ""
 "<p>There currently are no publicly-advertised\n"
 "            %(mailmanlink)s mailing lists on %(hostname)s."
@@ -2372,7 +2372,7 @@ msgstr ""
 "<p>現在 %(hostname)s で外部に公開されている %(mailmanlink)s \n"
 "メーリングリストはありません. "
 
-#: Mailman/Cgi/listinfo.py:131
+#: Mailman/Cgi/listinfo.py:132
 msgid ""
 "<p>Below is a listing of all the public mailing lists on\n"
 "            %(hostname)s.  Click on a list name to get more information "
@@ -2385,11 +2385,11 @@ msgstr ""
 "リスト名をクリックすると, 詳しい説明や入会・退会の方法, \n"
 "会員オプションの変更方法などが記載された案内ページに移動します. "
 
-#: Mailman/Cgi/listinfo.py:137
+#: Mailman/Cgi/listinfo.py:138
 msgid "right"
 msgstr "正しい"
 
-#: Mailman/Cgi/listinfo.py:140
+#: Mailman/Cgi/listinfo.py:141
 msgid ""
 " To visit the general information page for an unadvertised list,\n"
 "        open a URL similar to this one, but with a '/' and the %(adj)s\n"
@@ -2400,11 +2400,11 @@ msgstr ""
 "'/' とリストの名前 %(adj)s を付けたURLを開いてください.\n"
 "<p>リスト管理者は"
 
-#: Mailman/Cgi/listinfo.py:145
+#: Mailman/Cgi/listinfo.py:146
 msgid "the list admin overview page"
 msgstr "リスト管理一覧ページ"
 
-#: Mailman/Cgi/listinfo.py:146
+#: Mailman/Cgi/listinfo.py:147
 msgid ""
 " to find the management interface for your list.\n"
 "         <p>If you are having trouble using the lists, please contact "
@@ -2412,11 +2412,11 @@ msgstr ""
 " で自分の管理ページを探してください.\n"
 "<p>リストの利用に関するトラブルは, 次の宛先に連絡してください: "
 
-#: Mailman/Cgi/listinfo.py:235
+#: Mailman/Cgi/listinfo.py:236
 msgid "Edit Options"
 msgstr "オプションを編集"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:961
+#: Mailman/Cgi/listinfo.py:243 Mailman/Cgi/options.py:961
 #: Mailman/Cgi/roster.py:130
 msgid "View this page in"
 msgstr "表示言語"
@@ -2947,7 +2947,7 @@ msgstr "<b>取り消し</b>てリスト管理へ戻る"
 msgid "Delete this list"
 msgstr "このリストを削除"
 
-#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:52
+#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:55
 msgid "Invalid options to CGI script"
 msgstr "CGIスクリプトのオプションが無効です"
 
@@ -2955,43 +2955,51 @@ msgstr "CGIスクリプトのオプションが無効です"
 msgid "%(realname)s roster authentication failed."
 msgstr "%(realname)s 会員名簿 認証に失敗"
 
-#: Mailman/Cgi/subscribe.py:124
+#: Mailman/Cgi/subscribe.py:127
 msgid "You must supply a valid email address."
 msgstr "有効なメールアドレスを入力してください."
 
-#: Mailman/Cgi/subscribe.py:157
+#: Mailman/Cgi/subscribe.py:151
+msgid "reCAPTCHA validation failed: %s"
+msgstr "reCAPTCHA による検証に失敗しました: %s"
+
+#: Mailman/Cgi/subscribe.py:154
+msgid "reCAPTCHA could not be validated: %s"
+msgstr "reCAPTCHAによる検証動作を行えませんでした: %s"
+
+#: Mailman/Cgi/subscribe.py:179
 msgid "The form is too old.  Please GET it again."
 msgstr "フォームが古すぎます。再取得してください。"
 
-#: Mailman/Cgi/subscribe.py:160
+#: Mailman/Cgi/subscribe.py:182
 msgid "Please take a few seconds to fill out the form before submitting it."
 msgstr "もう少し時間をかけてフォームを入力してから送信してください。"
 
-#: Mailman/Cgi/subscribe.py:163
+#: Mailman/Cgi/subscribe.py:185
 msgid "The hidden token didn't match.  Did your IP change?"
 msgstr "隠しトークンが一致しません。IPアドレスが変わっていませんか?"
 
-#: Mailman/Cgi/subscribe.py:166
+#: Mailman/Cgi/subscribe.py:188
 msgid "There was no hidden token in your submission or it was corrupted."
 msgstr "フォーム入力に隠しトークンがないかあるいは壊れています。"
 
-#: Mailman/Cgi/subscribe.py:167
+#: Mailman/Cgi/subscribe.py:189
 msgid "You must GET the form before submitting it."
 msgstr "フォームを送信する前にページを取得する必要があります。"
 
-#: Mailman/Cgi/subscribe.py:171
+#: Mailman/Cgi/subscribe.py:193
 msgid "You may not subscribe a list to itself!"
 msgstr "リストの投稿アドレスをそのリストに入会させてはいけません!"
 
-#: Mailman/Cgi/subscribe.py:179
+#: Mailman/Cgi/subscribe.py:201
 msgid "If you supply a password, you must confirm it."
 msgstr "パスワードを入力する場合は, 確認入力が必要です."
 
-#: Mailman/Cgi/subscribe.py:181
+#: Mailman/Cgi/subscribe.py:203
 msgid "Your passwords did not match."
 msgstr "パスワードが一致しません."
 
-#: Mailman/Cgi/subscribe.py:215
+#: Mailman/Cgi/subscribe.py:237
 msgid ""
 "Your subscription request has been received, and will soon be acted upon.\n"
 "Depending on the configuration of this mailing list, your subscription "
@@ -3005,7 +3013,7 @@ msgstr ""
 "申請内容確認のメールをお送りするか, あるいはリスト司会者が申請を承認します.\n"
 "確認が必要なときは, 操作方法を書いた確認メールをお送りします."
 
-#: Mailman/Cgi/subscribe.py:229
+#: Mailman/Cgi/subscribe.py:251
 msgid ""
 "The email address you supplied is banned from this\n"
 "        mailing list.  If you think this restriction is erroneous, please\n"
@@ -3015,14 +3023,14 @@ msgstr ""
 "この入会制限が誤登録によるものと思われる場合は\n"
 "次のリスト管理者宛にご連絡ください: %(listowner)s"
 
-#: Mailman/Cgi/subscribe.py:233
+#: Mailman/Cgi/subscribe.py:255
 msgid ""
 "The email address you supplied is not valid.  (E.g. it must contain an\n"
 "`@'.)"
 msgstr ""
 "入力されたメールアドレスの形式が正しくありません. (たとえば `@' がないなど.)"
 
-#: Mailman/Cgi/subscribe.py:237
+#: Mailman/Cgi/subscribe.py:259
 msgid ""
 "Your subscription is not allowed because the email address you gave is\n"
 "insecure."
@@ -3030,7 +3038,7 @@ msgstr ""
 "入力されたメールアドレスにはセキュリティ上の問題があるため, \n"
 "入会申請は受け付けられませんでした."
 
-#: Mailman/Cgi/subscribe.py:245
+#: Mailman/Cgi/subscribe.py:267
 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"
@@ -3042,7 +3050,7 @@ msgstr ""
 "%(email)s 宛に送信するメールの指示に従ってください.\n"
 "本人による入会申請の確認がなければ入会できませんのでご注意ください."
 
-#: Mailman/Cgi/subscribe.py:257
+#: Mailman/Cgi/subscribe.py:279
 msgid ""
 "Your subscription request was deferred because %(x)s.  Your request has "
 "been\n"
@@ -3054,15 +3062,15 @@ msgstr ""
 "申請をリスト司会者に転送しましたので, 司会者がメールを受け取った後, \n"
 "申請に関する決定をメールで通知します."
 
-#: Mailman/Cgi/subscribe.py:264 Mailman/Commands/cmd_confirm.py:61
+#: Mailman/Cgi/subscribe.py:286 Mailman/Commands/cmd_confirm.py:61
 msgid "You are already subscribed."
 msgstr "既に会員になっています."
 
-#: Mailman/Cgi/subscribe.py:278
+#: Mailman/Cgi/subscribe.py:300
 msgid "Mailman privacy alert"
 msgstr "Mailmanからのプライバシー警告"
 
-#: Mailman/Cgi/subscribe.py:279
+#: Mailman/Cgi/subscribe.py:301
 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"
@@ -3093,15 +3101,15 @@ msgstr ""
 "シーについての懸念があれば\n"
 "%(listowner)s 宛のメールでリスト管理者にご相談ください.\n"
 
-#: Mailman/Cgi/subscribe.py:298
+#: Mailman/Cgi/subscribe.py:320
 msgid "This list does not support digest delivery."
 msgstr "このリストでは「まとめ読み」はできません."
 
-#: Mailman/Cgi/subscribe.py:300
+#: Mailman/Cgi/subscribe.py:322
 msgid "This list only supports digest delivery."
 msgstr "まとめ読み専用リストです."
 
-#: Mailman/Cgi/subscribe.py:307
+#: Mailman/Cgi/subscribe.py:329
 msgid "You have been successfully subscribed to the %(realname)s mailing list."
 msgstr "%(realname)s への入会手続きが完了しました."
 
@@ -3819,160 +3827,160 @@ msgstr "普通配送会員:"
 msgid "Digest members:"
 msgstr "まとめ読み会員:"
 
-#: Mailman/Defaults.py:1736
+#: Mailman/Defaults.py:1742
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: Mailman/Defaults.py:1737
+#: Mailman/Defaults.py:1743
 msgid "Asturian"
 msgstr "アストゥリアス語"
 
-#: Mailman/Defaults.py:1738
+#: Mailman/Defaults.py:1744
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: Mailman/Defaults.py:1739
+#: Mailman/Defaults.py:1745
 msgid "Czech"
 msgstr "チェコ語"
 
-#: Mailman/Defaults.py:1740
+#: Mailman/Defaults.py:1746
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: Mailman/Defaults.py:1741
+#: Mailman/Defaults.py:1747
 msgid "German"
 msgstr "ドイツ語"
 
 # mm_cfg.py
-#: Mailman/Defaults.py:1742
+#: Mailman/Defaults.py:1748
 msgid "English (USA)"
 msgstr "英語 (米国)"
 
-#: Mailman/Defaults.py:1743
+#: Mailman/Defaults.py:1749
 msgid "Spanish (Spain)"
 msgstr "スペイン語 (スペイン)"
 
-#: Mailman/Defaults.py:1744
+#: Mailman/Defaults.py:1750
 msgid "Estonian"
 msgstr "エストニア語"
 
-#: Mailman/Defaults.py:1745
+#: Mailman/Defaults.py:1751
 msgid "Euskara"
 msgstr "バスク語"
 
-#: Mailman/Defaults.py:1746
+#: Mailman/Defaults.py:1752
 msgid "Persian"
 msgstr "ペルシャ語"
 
-#: Mailman/Defaults.py:1747
+#: Mailman/Defaults.py:1753
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: Mailman/Defaults.py:1748
+#: Mailman/Defaults.py:1754
 msgid "French"
 msgstr "フランス語"
 
-#: Mailman/Defaults.py:1749
+#: Mailman/Defaults.py:1755
 msgid "Galician"
 msgstr "ガリシア語"
 
-#: Mailman/Defaults.py:1750
+#: Mailman/Defaults.py:1756
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: Mailman/Defaults.py:1751
+#: Mailman/Defaults.py:1757
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: Mailman/Defaults.py:1752
+#: Mailman/Defaults.py:1758
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: Mailman/Defaults.py:1753
+#: Mailman/Defaults.py:1759
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: Mailman/Defaults.py:1754
+#: Mailman/Defaults.py:1760
 msgid "Interlingua"
 msgstr "インターリンガ(国際語)"
 
-#: Mailman/Defaults.py:1755
+#: Mailman/Defaults.py:1761
 msgid "Italian"
 msgstr "イタリア語"
 
-#: Mailman/Defaults.py:1756
+#: Mailman/Defaults.py:1762
 msgid "Japanese"
 msgstr "日本語"
 
-#: Mailman/Defaults.py:1757
+#: Mailman/Defaults.py:1763
 msgid "Korean"
 msgstr "韓国語"
 
-#: Mailman/Defaults.py:1758
+#: Mailman/Defaults.py:1764
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: Mailman/Defaults.py:1759
+#: Mailman/Defaults.py:1765
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: Mailman/Defaults.py:1760
+#: Mailman/Defaults.py:1766
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: Mailman/Defaults.py:1761
+#: Mailman/Defaults.py:1767
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: Mailman/Defaults.py:1762
+#: Mailman/Defaults.py:1768
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: Mailman/Defaults.py:1763
+#: Mailman/Defaults.py:1769
 msgid "Portuguese (Brazil)"
 msgstr "ポルトガル語(ブラジル)"
 
-#: Mailman/Defaults.py:1764
+#: Mailman/Defaults.py:1770
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: Mailman/Defaults.py:1765
+#: Mailman/Defaults.py:1771
 msgid "Russian"
 msgstr "ロシア語"
 
-#: Mailman/Defaults.py:1766
+#: Mailman/Defaults.py:1772
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: Mailman/Defaults.py:1767
+#: Mailman/Defaults.py:1773
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: Mailman/Defaults.py:1768
+#: Mailman/Defaults.py:1774
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: Mailman/Defaults.py:1769
+#: Mailman/Defaults.py:1775
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: Mailman/Defaults.py:1770
+#: Mailman/Defaults.py:1776
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: Mailman/Defaults.py:1771
+#: Mailman/Defaults.py:1777
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: Mailman/Defaults.py:1772
+#: Mailman/Defaults.py:1778
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: Mailman/Defaults.py:1773
+#: Mailman/Defaults.py:1779
 msgid "Chinese (China)"
 msgstr "中国語(中国)"
 
-#: Mailman/Defaults.py:1774
+#: Mailman/Defaults.py:1780
 msgid "Chinese (Taiwan)"
 msgstr "中国語(台湾)"
 
diff --git a/messages/mailman.pot b/messages/mailman.pot
index 9d171db1..9a665968 100644
--- a/messages/mailman.pot
+++ b/messages/mailman.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sun Jan 21 09:23:53 2018\n"
+"POT-Creation-Date: Tue Jan 30 17:13:37 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"
@@ -247,28 +247,28 @@ msgstr ""
 
 #: Mailman/Cgi/admin.py:80 Mailman/Cgi/admindb.py:121
 #: Mailman/Cgi/confirm.py:62 Mailman/Cgi/edithtml.py:86
-#: Mailman/Cgi/listinfo.py:55 Mailman/Cgi/options.py:98
+#: 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:63
+#: Mailman/Cgi/roster.py:59 Mailman/Cgi/subscribe.py:66
 msgid "No such list <em>%(safelistname)s</em>"
 msgstr ""
 
 #: Mailman/Cgi/admin.py:95 Mailman/Cgi/admindb.py:136
 #: Mailman/Cgi/confirm.py:80 Mailman/Cgi/create.py:50
-#: Mailman/Cgi/edithtml.py:103 Mailman/Cgi/listinfo.py:67
+#: 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:51
-#: Mailman/Cgi/subscribe.py:62 Mailman/Cgi/subscribe.py:77
+#: Mailman/Cgi/roster.py:147 Mailman/Cgi/subscribe.py:54
+#: Mailman/Cgi/subscribe.py:65 Mailman/Cgi/subscribe.py:80
 msgid "Error"
 msgstr ""
 
 #: Mailman/Cgi/admin.py:96 Mailman/Cgi/admindb.py:137
 #: Mailman/Cgi/confirm.py:81 Mailman/Cgi/create.py:51
-#: Mailman/Cgi/edithtml.py:104 Mailman/Cgi/listinfo.py:68
+#: 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:78
+#: Mailman/Cgi/roster.py:73 Mailman/Cgi/subscribe.py:81
 msgid "Invalid options to CGI script."
 msgstr ""
 
@@ -314,11 +314,11 @@ msgstr ""
 msgid "%(hostname)s mailing lists - Admin Links"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:121
+#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:122
 msgid "Welcome!"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:124
+#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:125
 msgid "Mailman"
 msgstr ""
 
@@ -357,16 +357,16 @@ msgstr ""
 msgid "<p>(Send questions and comments to "
 msgstr ""
 
-#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:156 cron/mailpasswds:216
+#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:157 cron/mailpasswds:216
 msgid "List"
 msgstr ""
 
 #: Mailman/Cgi/admin.py:336 Mailman/Cgi/admin.py:604
-#: Mailman/Cgi/listinfo.py:157
+#: Mailman/Cgi/listinfo.py:158
 msgid "Description"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:163 bin/list_lists:130
+#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:164 bin/list_lists:130
 msgid "[no description available]"
 msgstr ""
 
@@ -793,7 +793,7 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:199
+#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:200
 msgid "Subscribe"
 msgstr ""
 
@@ -2095,17 +2095,17 @@ msgstr ""
 msgid "HTML successfully updated."
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:89
+#: Mailman/Cgi/listinfo.py:90
 msgid "%(hostname)s Mailing Lists"
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:127
+#: Mailman/Cgi/listinfo.py:128
 msgid ""
 "<p>There currently are no publicly-advertised\n"
 "            %(mailmanlink)s mailing lists on %(hostname)s."
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:131
+#: Mailman/Cgi/listinfo.py:132
 msgid ""
 "<p>Below is a listing of all the public mailing lists on\n"
 "            %(hostname)s.  Click on a list name to get more information about\n"
@@ -2113,11 +2113,11 @@ msgid ""
 "            on your subscription."
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:137
+#: Mailman/Cgi/listinfo.py:138
 msgid "right"
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:140
+#: Mailman/Cgi/listinfo.py:141
 msgid ""
 " To visit the general information page for an unadvertised list,\n"
 "        open a URL similar to this one, but with a '/' and the %(adj)s\n"
@@ -2125,21 +2125,21 @@ msgid ""
 "        <p>List administrators, you can visit "
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:145
+#: Mailman/Cgi/listinfo.py:146
 msgid "the list admin overview page"
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:146
+#: Mailman/Cgi/listinfo.py:147
 msgid ""
 " to find the management interface for your list.\n"
 "         <p>If you are having trouble using the lists, please contact "
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:235
+#: Mailman/Cgi/listinfo.py:236
 msgid "Edit Options"
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:961
+#: Mailman/Cgi/listinfo.py:243 Mailman/Cgi/options.py:961
 #: Mailman/Cgi/roster.py:130
 msgid "View this page in"
 msgstr ""
@@ -2593,7 +2593,7 @@ msgstr ""
 msgid "Delete this list"
 msgstr ""
 
-#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:52
+#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:55
 msgid "Invalid options to CGI script"
 msgstr ""
 
@@ -2601,43 +2601,51 @@ msgstr ""
 msgid "%(realname)s roster authentication failed."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:124
+#: Mailman/Cgi/subscribe.py:127
 msgid "You must supply a valid email address."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:157
+#: Mailman/Cgi/subscribe.py:151
+msgid "reCAPTCHA validation failed: %s"
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:154
+msgid "reCAPTCHA could not be validated: %s"
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:179
 msgid "The form is too old.  Please GET it again."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:160
+#: Mailman/Cgi/subscribe.py:182
 msgid "Please take a few seconds to fill out the form before submitting it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:163
+#: Mailman/Cgi/subscribe.py:185
 msgid "The hidden token didn't match.  Did your IP change?"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:166
+#: Mailman/Cgi/subscribe.py:188
 msgid "There was no hidden token in your submission or it was corrupted."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:167
+#: Mailman/Cgi/subscribe.py:189
 msgid "You must GET the form before submitting it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:171
+#: Mailman/Cgi/subscribe.py:193
 msgid "You may not subscribe a list to itself!"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:179
+#: Mailman/Cgi/subscribe.py:201
 msgid "If you supply a password, you must confirm it."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:181
+#: Mailman/Cgi/subscribe.py:203
 msgid "Your passwords did not match."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:215
+#: Mailman/Cgi/subscribe.py:237
 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"
@@ -2646,26 +2654,26 @@ msgid ""
 "email which contains further instructions."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:229
+#: Mailman/Cgi/subscribe.py:251
 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:233
+#: Mailman/Cgi/subscribe.py:255
 msgid ""
 "The email address you supplied is not valid.  (E.g. it must contain an\n"
 "`@'.)"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:237
+#: Mailman/Cgi/subscribe.py:259
 msgid ""
 "Your subscription is not allowed because the email address you gave is\n"
 "insecure."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:245
+#: Mailman/Cgi/subscribe.py:267
 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"
@@ -2673,22 +2681,22 @@ msgid ""
 "your subscription."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:257
+#: Mailman/Cgi/subscribe.py:279
 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:264 Mailman/Commands/cmd_confirm.py:61
+#: Mailman/Cgi/subscribe.py:286 Mailman/Commands/cmd_confirm.py:61
 msgid "You are already subscribed."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:278
+#: Mailman/Cgi/subscribe.py:300
 msgid "Mailman privacy alert"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:279
+#: Mailman/Cgi/subscribe.py:301
 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"
@@ -2704,15 +2712,15 @@ msgid ""
 "to the list administrator at %(listowner)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:298
+#: Mailman/Cgi/subscribe.py:320
 msgid "This list does not support digest delivery."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:300
+#: Mailman/Cgi/subscribe.py:322
 msgid "This list only supports digest delivery."
 msgstr ""
 
-#: Mailman/Cgi/subscribe.py:307
+#: Mailman/Cgi/subscribe.py:329
 msgid "You have been successfully subscribed to the %(realname)s mailing list."
 msgstr ""
 
@@ -3263,159 +3271,159 @@ msgstr ""
 msgid "Digest members:"
 msgstr ""
 
-#: Mailman/Defaults.py:1736
+#: Mailman/Defaults.py:1742
 msgid "Arabic"
 msgstr ""
 
-#: Mailman/Defaults.py:1737
+#: Mailman/Defaults.py:1743
 msgid "Asturian"
 msgstr ""
 
-#: Mailman/Defaults.py:1738
+#: Mailman/Defaults.py:1744
 msgid "Catalan"
 msgstr ""
 
-#: Mailman/Defaults.py:1739
+#: Mailman/Defaults.py:1745
 msgid "Czech"
 msgstr ""
 
-#: Mailman/Defaults.py:1740
+#: Mailman/Defaults.py:1746
 msgid "Danish"
 msgstr ""
 
-#: Mailman/Defaults.py:1741
+#: Mailman/Defaults.py:1747
 msgid "German"
 msgstr ""
 
-#: Mailman/Defaults.py:1742
+#: Mailman/Defaults.py:1748
 msgid "English (USA)"
 msgstr ""
 
-#: Mailman/Defaults.py:1743
+#: Mailman/Defaults.py:1749
 msgid "Spanish (Spain)"
 msgstr ""
 
-#: Mailman/Defaults.py:1744
+#: Mailman/Defaults.py:1750
 msgid "Estonian"
 msgstr ""
 
-#: Mailman/Defaults.py:1745
+#: Mailman/Defaults.py:1751
 msgid "Euskara"
 msgstr ""
 
-#: Mailman/Defaults.py:1746
+#: Mailman/Defaults.py:1752
 msgid "Persian"
 msgstr ""
 
-#: Mailman/Defaults.py:1747
+#: Mailman/Defaults.py:1753
 msgid "Finnish"
 msgstr ""
 
-#: Mailman/Defaults.py:1748
+#: Mailman/Defaults.py:1754
 msgid "French"
 msgstr ""
 
-#: Mailman/Defaults.py:1749
+#: Mailman/Defaults.py:1755
 msgid "Galician"
 msgstr ""
 
-#: Mailman/Defaults.py:1750
+#: Mailman/Defaults.py:1756
 msgid "Greek"
 msgstr ""
 
-#: Mailman/Defaults.py:1751
+#: Mailman/Defaults.py:1757
 msgid "Hebrew"
 msgstr ""
 
-#: Mailman/Defaults.py:1752
+#: Mailman/Defaults.py:1758
 msgid "Croatian"
 msgstr ""
 
-#: Mailman/Defaults.py:1753
+#: Mailman/Defaults.py:1759
 msgid "Hungarian"
 msgstr ""
 
-#: Mailman/Defaults.py:1754
+#: Mailman/Defaults.py:1760
 msgid "Interlingua"
 msgstr ""
 
-#: Mailman/Defaults.py:1755
+#: Mailman/Defaults.py:1761
 msgid "Italian"
 msgstr ""
 
-#: Mailman/Defaults.py:1756
+#: Mailman/Defaults.py:1762
 msgid "Japanese"
 msgstr ""
 
-#: Mailman/Defaults.py:1757
+#: Mailman/Defaults.py:1763
 msgid "Korean"
 msgstr ""
 
-#: Mailman/Defaults.py:1758
+#: Mailman/Defaults.py:1764
 msgid "Lithuanian"
 msgstr ""
 
-#: Mailman/Defaults.py:1759
+#: Mailman/Defaults.py:1765
 msgid "Dutch"
 msgstr ""
 
-#: Mailman/Defaults.py:1760
+#: Mailman/Defaults.py:1766
 msgid "Norwegian"
 msgstr ""
 
-#: Mailman/Defaults.py:1761
+#: Mailman/Defaults.py:1767
 msgid "Polish"
 msgstr ""
 
-#: Mailman/Defaults.py:1762
+#: Mailman/Defaults.py:1768
 msgid "Portuguese"
 msgstr ""
 
-#: Mailman/Defaults.py:1763
+#: Mailman/Defaults.py:1769
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: Mailman/Defaults.py:1764
+#: Mailman/Defaults.py:1770
 msgid "Romanian"
 msgstr ""
 
-#: Mailman/Defaults.py:1765
+#: Mailman/Defaults.py:1771
 msgid "Russian"
 msgstr ""
 
-#: Mailman/Defaults.py:1766
+#: Mailman/Defaults.py:1772
 msgid "Slovak"
 msgstr ""
 
-#: Mailman/Defaults.py:1767
+#: Mailman/Defaults.py:1773
 msgid "Slovenian"
 msgstr ""
 
-#: Mailman/Defaults.py:1768
+#: Mailman/Defaults.py:1774
 msgid "Serbian"
 msgstr ""
 
-#: Mailman/Defaults.py:1769
+#: Mailman/Defaults.py:1775
 msgid "Swedish"
 msgstr ""
 
-#: Mailman/Defaults.py:1770
+#: Mailman/Defaults.py:1776
 msgid "Turkish"
 msgstr ""
 
-#: Mailman/Defaults.py:1771
+#: Mailman/Defaults.py:1777
 msgid "Ukrainian"
 msgstr ""
 
-#: Mailman/Defaults.py:1772
+#: Mailman/Defaults.py:1778
 msgid "Vietnamese"
 msgstr ""
 
-#: Mailman/Defaults.py:1773
+#: Mailman/Defaults.py:1779
 msgid "Chinese (China)"
 msgstr ""
 
-#: Mailman/Defaults.py:1774
+#: Mailman/Defaults.py:1780
 msgid "Chinese (Taiwan)"
 msgstr ""