Merge lp:~futatuki/mailman/2.1-ja-translation into lp:mailman/2.1

[Yasuhito FUTATSUKI at POEM]

Update Japanese translation

* Add msgstr for msgid added in rev 1829, in Japansese po file
* also, add translated comment for new setting in Japanse translation of Defaults.py.in

[Mark Sapiro (msapiro)]

Thank you. I really appreciate your diligence in keeping this translation up to date.

review: Approve (code)

=== modified file 'messages/ja/LC_MESSAGES/mailman.po'
--- messages/ja/LC_MESSAGES/mailman.po	2020-01-10 01:04:58 +0000
+++ messages/ja/LC_MESSAGES/mailman.po	2020-01-13 01:18:22 +0000
@@ -1,14 +1,14 @@
 # Mailman Japanese Translation
-# Copyright (C) 2002-2018
+# Copyright (C) 2002-2020
 # SATOH Fumiyasu <[e-mail]>, 2013
 # Tokio Kikuchi <[e-mail]>, 2002-2011
 # Yukihiro Yasuda <[e-mail]>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mailman 2.1.28\n"
+"Project-Id-Version: Mailman 2.1.30rc1\n"
 "POT-Creation-Date: Thu Jan  9 17:03:36 2020\n"
-"PO-Revision-Date: 2019-11-11 21:49+09:00\n"
+"PO-Revision-Date: 2020-01-13 09:16+09:00\n"
 "Last-Translator: Yasuhito FUTATSUKI at POEM <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
 "Language: ja\n"
@@ -3118,9 +3118,8 @@
 "¿½ÀÁ¤Ë´Ø¤¹¤ë·èÄê¤ò¥á¡¼¥ë¤ÇÄÌÃΤ·¤Þ¤¹¡£"
 
 #: Mailman/Cgi/subscribe.py:296 Mailman/Commands/cmd_subscribe.py:133
-#, fuzzy
 msgid "You already have a subscription pending confirmation"
-msgstr "%(realname)s Æþ²ñÄÌÃÎ"
+msgstr "¤¢¤Ê¤¿¤Ë¤ÏÆþ²ñ³Îǧ¥á¡¼¥ë¤òÁ÷ÉպѤߤÇÆþ²ñ¤Î³ÎǧÂÔ¤Á¾õÂ֤Ǥ¹"
 
 #: Mailman/Cgi/subscribe.py:300 Mailman/Commands/cmd_confirm.py:61
 msgid "You are already subscribed."

=== modified file 'messages/ja/doc/Defaults.py.in'
--- messages/ja/doc/Defaults.py.in	2019-11-11 13:02:24 +0000
+++ messages/ja/doc/Defaults.py.in	2020-01-13 01:18:22 +0000
@@ -1,7 +1,7 @@
 # -*- python -*-
 # -*- coding: euc-jp -*-
 
-# Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2020 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,9 +18,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
-# [ÌõÃð] ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Mailman 2.1.29 ÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤ë
+# [ÌõÃð] ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Mailman 2.1.30 ÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤ë
 #   Mailman/Defaults.py.in (launchpad.net ¤Ç¤Î¥Õ¥¡¥¤¥ë¤Î Bazaar
-#  ¥ê¥Ó¥¸¥ç¥ó¤Ï 1825) ¤Î¥³¥á¥ó¥ÈÉôʬ¤òÆüËܸì (¶¦Ä̸ì) ¤ËËÝÌõ¤·¤¿¤â¤Î¤Ç¤¹¡£
+#   ¥ê¥Ó¥¸¥ç¥ó¤Ï 1829) ¤Î¥³¥á¥ó¥ÈÉôʬ¤òÆüËܸì (¶¦Ä̸ì) ¤ËËÝÌõ¤·¤¿¤â¤Î¤Ç¤¹¡£
 #   ÇÛÉÛÅù¤Î¾ò·ï¤Ï¸¶Ê¸¤ÈƱÍÍ¡¢GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ (GNU
 #   General Public License) ¤Ë½¾¤¤¤Þ¤¹ (¾åµ­¤â»²¾È¤¯¤À¤µ¤¤)¡£ÆâÍƤÎ
 #   Àµ³Î¤ÊÍý²ò¤Î¤¿¤á¤Ë¤Ï¡¢ÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤ë¸¶Ê¸¤ò»²¾È¤µ¤ì¤ë¤³¤È¤ò
@@ -1248,6 +1248,17 @@
                                '^x-ack:', '^x-beenthere:',
                                '^x-list-administrivia:', '^x-spam-',
                               ]
+#
+# Âè»°¼Ô¤¬·«¤êÊÖ¤·Æþ²ñ¥Õ¥©¡¼¥à¤«¤éÆþ²ñ¤ò¿½¤·¹þ¤à¤³¤È¤Ç¥á¡¼¥ë¥Ü¥à¹Ô°Ù
+# (ÌõÃð: ¥á¡¼¥ë¥Ü¥à¤Ë¤Ä¤¤¤Æ¤Ï
+#   https://ja.wikipedia.org/wiki/%E3%83%A1%E3%83%BC%E3%83%AB%E3%83%9C%E3%83%A0
+# Åù¤ò»²¾È¤Î¤³¤È)¤¬²Äǽ¤Ç¤¹¡£°Ê²¼¤ò Yes ¤ËÀßÄꤹ¤ë¤³¤È¤Ç¡¢¤¹¤Ç¤ËÆþ²ñ³Îǧ¤ò
+# ȯ¹ÔºÑ¤ß¤ÎÁê¼ê¤«¤é¤ÎÆþ²ñ¿½ÀÁ¤òµñÈݤ·¡¢¥á¡¼¥ë¥Ü¥à¹Ô°Ù¤òËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+# ¤³¤ì¤òÀßÄꤹ¤ë¤³¤È¤Î·çÅÀ¤Ï¡¢Æþ²ñ¿½ÀÁ¤ò¹Ô¤Ã¤¿¿Í¤¬Æþ²ñ³Îǧ¼ê³¤­¤Î
+# ¥á¡¼¥ë¤ò¤Ê¤¯¤·¤Æ¤·¤Þ¤Ã¤¿¤ê¡¢¤¢¤ë¤¤¤ÏÆþ²ñ³Îǧ¼ê³¤­¤Î¥á¡¼¥ë¤¬ÆϤ«¤Ê¤«¤Ã¤¿
+# ¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¿Í¤¬ºÆÅÙÆþ²ñ¿½ÀÁ¤ò¹Ô¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Þ¤Ç¤Ë PENDING_REQUEST_LIFE 
+# (½é´üÃͤǤÏ3Æü)¤À¤±ÂÔ¤¿¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¯¤Ê¤ë¤³¤È¤Ç¤¹¡£
+REFUSE_SECOND_PENDING = No