Merge authors:
  Yasuhito FUTATSUKI at POEM (futatuki)
Related merge proposals:
  https://code.launchpad.net/~futatuki/mailman/2.1-ja-translation/+merge/377482
  proposed by: Yasuhito FUTATSUKI at POEM (futatuki)
  review: Approve - Mark Sapiro (msapiro)
------------------------------------------------------------
revno: 1833 [merge]
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Sun 2020-01-12 18:53:36 -0800
message:
  Japanese i18n updates from Yasuhito FUTATSUKI.
modified:
  messages/ja/LC_MESSAGES/mailman.po
  messages/ja/doc/Defaults.py.in


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== 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 00:53:12 +0000
@@ -1,14 +1,14 @@
 # Mailman Japanese Translation
-# Copyright (C) 2002-2018
+# Copyright (C) 2002-2020
 # SATOH Fumiyasu <[email protected]>, 2013
 # Tokio Kikuchi <[email protected]>, 2002-2011
 # Yukihiro Yasuda <[email protected]>, 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 <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\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 00:53:12 +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
 
 
 

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to