Merge authors:
Yasuhito FUTATSUKI at POEM (futatuki)
Yasuhito FUTATSUKI at POEM (futatuki)
Related merge proposals:
https://code.launchpad.net/~futatuki/mailman/2.1-ja-translation/+merge/333362
proposed by: Yasuhito FUTATSUKI at POEM (futatuki)
review: Approve - Mark Sapiro (msapiro)
------------------------------------------------------------
revno: 1728 [merge]
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Wed 2017-11-08 12:46:23 -0800
message:
Update to Japanese Defaults.py.in.
modified:
NEWS
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 'NEWS'
--- NEWS 2017-11-03 03:39:50 +0000
+++ NEWS 2017-11-08 20:46:23 +0000
@@ -7,6 +7,11 @@
2.1.26 (xx-xxx-xxxx)
+ i18n
+
+ - The Japanese translation of Defaults.py.in has been updated by
+ Yasuhito FUTATSUKI.
+
Bug fixes and other patches
- The DELIVERY_RETRY_WAIT setting is now effective. (LP: #1729472)
=== modified file 'messages/ja/doc/Defaults.py.in'
--- messages/ja/doc/Defaults.py.in 2017-03-07 21:22:38 +0000
+++ messages/ja/doc/Defaults.py.in 2017-11-06 11:23:01 +0000
@@ -18,9 +18,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA.
-# [����] ���Υե�����ϡ�Mailman 2.1.23 ����ʪ�˴ޤޤ��
+# [����] ���Υե�����ϡ�Mailman 2.1.25 ����ʪ�˴ޤޤ��
# Mailman/Defaults.py.in (launchpad.net �Ǥ� Bazaar ��ӥ�����
-# 1696) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
+# 1727) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
# �������ξ��ϸ�ʸ��Ʊ�͡�GNU ���̸������ѵ�������� (GNU
# General Public License) �˽����ޤ� (�嵭�⻲�Ȥ�������)�����Ƥ�
# ���Τ�����Τ���ˤϡ�����ʪ�˴ޤޤ�븶ʸ�Ȥ���뤳�Ȥ�
@@ -713,6 +713,17 @@
# ��¸���ޤ���
REMOVE_DKIM_HEADERS = No
+# ���Ǥʤ�ʸ�����ʲ������ꤹ��ȡ��Ŀ��������� VERP ����Ѥ�������(����:
+# VERP�ˤĤ��Ƥϸ������������ޤ�)��Ԥ����ˡ�����ʸ�����̾���Υإå���
+# �����ԤΥ�륢�ɥ쥹�� base64 �����ɤ�����ΤåȤ��ޤ���
+# ����ϡ����ǥ�����ץե����ɥХå��롼�פΥ�å�����������Ф��ΤȤ�
+# �̤���ˡ�Ǽ����Ԥ����ꤹ�뤳�Ȥ��ǽ�ˤ��뤿��Τ�ΤǤ�����Ȥ���
+# RCPT_BASE64_HEADER_NAME = 'X-Mailman-R-Data'
+# �Ȥ����Ȥ���[email protected] ���������å������ˤ�
+# X-Mailman-R-Data: dXNlckBleGFtcGxlLmNvbQo=
+# �Τ褦�ʥإå����ޤ���ޤ���
+RCPT_BASE64_HEADER_NAME = ''
+
# �ꥹ�ȥ��С����Τ������������̾�Ρץ�å������Ϥ��٤Ƥ��Υϥ�ɥ�
# �⥸�塼��Υѥ��ץ饤����̤äƹԤ��ޤ����ƥꥹ�ȤϤ��줾���pipeline��
# °����������뤳�ȤǤ��Υ������Х�ѥ��ץ饤������뤳�Ȥ��Ǥ��ޤ���
@@ -1207,7 +1218,7 @@
DEFAULT_SUBJECT_PREFIX = "[%(real_name)s] "
# DEFAULT_SUBJECT_PREFIX = "[%(real_name)s %%d]" # ���֤�����
DEFAULT_MSG_HEADER = ""
-DEFAULT_MSG_FOOTER = """_______________________________________________
+DEFAULT_MSG_FOOTER = """--
%(real_name)s mailing list
%(real_name)s@%(host_name)s
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
@@ -1462,7 +1473,7 @@
# ���Ѥ��ʤ��ꥹ�ȤǤ�(�ط�����إå���)�ߤ���ޤ�)
ALLOW_RFC2369_OVERRIDES = Yes
-# RFC 2822 �Ǥ� Mailman ���ºݤ����ؤ���Ǥ����ĥ���������ȤǤ���Ȥ���
+# RFC 2822 �Ǥ� Mailman ���ºݤ�ž������Ǥ����ĥ���������ȤǤ���Ȥ���
# Sender �إå�����Ϳ���ʤ��Τ� RFC �˰�ȿ���뤳�Ȥ����Ƥ��ޤ���
# ��������MUA ����ˤ� From �إå��ξܺ٤������ Sender �إå���ɽ��
# ���褦�Ȥ����Τ�����(ͭ̾�ʤ�Τ� Outlook�Ǥ�)�����줬�桼�����𤵤���
@@ -1532,7 +1543,10 @@
# �ꥹ�Ȥ�ޤȤ��ɤߤ����ѤǤ���褦�ˤ��ޤ���?
DEFAULT_DIGESTABLE = Yes
DEFAULT_DIGEST_HEADER = ""
-DEFAULT_DIGEST_FOOTER = DEFAULT_MSG_FOOTER
+DEFAULT_DIGEST_FOOTER = """%(real_name)s mailing list
+%(real_name)s@%(host_name)s
+%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
+"""
DEFAULT_DIGEST_IS_DEFAULT = No
DEFAULT_MIME_IS_DEFAULT_DIGEST = No
@@ -1652,6 +1666,8 @@
DELIVERY_RETRY_PERIOD = days(5)
# ���Ū���������Ԥκݤ˺������ߤ�ޤǤˤɤ�����λ����Ԥ��ޤ���?
+# RetryRunner �ϥ��塼�ν����Ƚ����δ֤�15ʬ����פ��ޤ��Τǡ�������
+# ���ꤷ���ͤϼºݤˤ�15ʬ���ܿ����ڤ�夲���ޤ���
DELIVERY_RETRY_WAIT = hours(1)
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
