GNU Mailman

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

  1. 2.1-ja-translation
  2. Merge into 2.1
Proposed by Yasuhito FUTATSUKI at POEM
Status: Merged
Merged at revision: 1767
Proposed branch: lp:~futatuki/mailman/2.1-ja-translation
Merge into: lp:mailman/2.1
Diff against target: 68 lines (+15/-6)
2 files modified
messages/ja/LC_MESSAGES/mailman.po (+2/-2)
messages/ja/doc/Defaults.py.in (+13/-4)
To merge this branch: bzr merge lp:~futatuki/mailman/2.1-ja-translation
Reviewer Review Type Date Requested Status
Mark Sapiro Approve
Review via email: mp+347572@code.launchpad.net

Commit message

Update ja translation up to lp:mailman/2.1 rev 1766

Description of the change

* add translation word for 'Esperanto'
* fix some inconsistent translation word for 'subscribe'
* Update translation for Default.py.in up to rev 1762, with expected change of description for IPv6 support feature added in rev 1766

To post a comment you must log in.
Revision history for this message
Mark Sapiro (msapiro) wrote :

Thank you for your continuing work on this translation.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'messages/ja/LC_MESSAGES/mailman.po'
2--- messages/ja/LC_MESSAGES/mailman.po 2018-06-04 01:12:09 +0000
3+++ messages/ja/LC_MESSAGES/mailman.po 2018-06-07 06:58:47 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: Mailman 2.1.26\n"
7 "POT-Creation-Date: Sun Jun 3 17:52:55 2018\n"
8-"PO-Revision-Date: 2018-05-27 02:02+09:00\n"
9+"PO-Revision-Date: 2018-06-06 03:29+09:00\n"
10 "Last-Translator: Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>\n"
11 "Language-Team: Japanese <mailman-users-jp@googlegroups.com>\n"
12 "Language: ja\n"
13@@ -3862,7 +3862,7 @@
14
15 #: Mailman/Defaults.py:1749
16 msgid "Esperanto"
17-msgstr ""
18+msgstr "¥¨¥¹¥Ú¥é¥ó¥È"
19
20 #: Mailman/Defaults.py:1750
21 msgid "Spanish (Spain)"
22
23=== modified file 'messages/ja/doc/Defaults.py.in'
24--- messages/ja/doc/Defaults.py.in 2018-02-04 20:53:50 +0000
25+++ messages/ja/doc/Defaults.py.in 2018-06-07 06:58:47 +0000
26@@ -20,7 +20,7 @@
27
28 # [ÌõÃð] ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Mailman 2.1.26 ÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤ë
29 # Mailman/Defaults.py.in (launchpad.net ¤Ç¤Î Bazaar ¥ê¥Ó¥¸¥ç¥ó¤Ï
30-# 1738) ¤Î¥³¥á¥ó¥ÈÉôʬ¤òÆüËܸì (¶¦Ä̸ì) ¤ËËÝÌõ¤·¤¿¤â¤Î¤Ç¤¹¡£
31+# 1763) ¤Î¥³¥á¥ó¥ÈÉôʬ¤òÆüËܸì (¶¦Ä̸ì) ¤ËËÝÌõ¤·¤¿¤â¤Î¤Ç¤¹¡£
32 # ÇÛÉÛÅù¤Î¾ò·ï¤Ï¸¶Ê¸¤ÈƱÍÍ¡¢GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ (GNU
33 # General Public License) ¤Ë½¾¤¤¤Þ¤¹ (¾åµ­¤â»²¾È¤¯¤À¤µ¤¤)¡£ÆâÍƤÎ
34 # Àµ³Î¤ÊÍý²ò¤Î¤¿¤á¤Ë¤Ï¡¢ÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤ë¸¶Ê¸¤ò»²¾È¤µ¤ì¤ë¤³¤È¤ò
35@@ -166,14 +166,22 @@
36 RECAPTCHA_SECRET_KEY = None
37
38 # ¥¤¥ó¥¹¥È¡¼¥ë´Ä¶­Á´ÂΤǤÎBAN¥ê¥¹¥È¡£¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë´Ä¶­Á´ÂΤΤ¹¤Ù¤Æ¤Î
39-# ¥ê¥¹¥È¤Ç¹ØÆɤò¶Ø»ß¤¹¤ëÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ª¤è¤ÓÀµµ¬É½¸½¥Ñ¥¿¡¼¥ó(ÀèƬʸ»ú
40+# ¥ê¥¹¥È¤ÇÆþ²ñ¤ò¶Ø»ß¤¹¤ëÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ª¤è¤ÓÀµµ¬É½¸½¥Ñ¥¿¡¼¥ó(ÀèƬʸ»ú
41 # ¤¬¡Ö^¡×)¤Î¥ê¥¹¥È¤Ç¤¹¡£¤³¤ì¤Ï¥ê¥¹¥È¸ÄÊ̤Πban_list ¤òÊä´°¤·¤Þ¤¹¡£
42 # Îã¤È¤·¤Æ¡¢ xxx@example.net ¤È @example.com ¤Î yyy ¤«¤é»Ï¤Þ¤ëǤ°Õ¤Î
43-# ¥¢¥É¥ì¥¹¤ò¹ØÆɶػߤˤ¹¤ë¤Ë¤Ï
44-# GLOBAL_BAN_LIST = ['xxx@example.net', '^yyy.*@example\.com$']
45+# ¥¢¥É¥ì¥¹¤òÆþ²ñ¶Ø»ß¤Ë¤¹¤ë¤Ë¤Ï
46+# GLOBAL_BAN_LIST = ['xxx@example\.net', '^yyy.*@example\.com$']
47 # ¤Î¤è¤¦¤ËÀßÄꤷ¤Þ¤¹¡£
48 GLOBAL_BAN_LIST = []
49
50+# °Ê²¼¤ò Yes ¤Ë¥»¥Ã¥È¤¹¤ë¤È¡¢Web ¤«¤é¤ÎÆþ²ñ°ÍÍê¤Ç Spamhaus ¤Î SBL, CSS,
51+# XBL ¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë IP ¥¢¥É¥ì¥¹¤«¤é¤Î¤â¤Î¤ò¥Ö¥í¥Ã¥¯¤·¤Þ¤¹¡£
52+# py2-ipaddress ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï IPv6 ¥¢¥É¥ì¥¹¤Ë¤â
53+# Âбþ¤·¤Þ¤¹¤¬¡¢¤Ê¤±¤ì¤Ð IPv4 ¥¢¥É¥ì¥¹¤Ë¤Î¤ßÂбþ¤·¤Þ¤¹¡£
54+# py2-ipaddress ¥â¥¸¥å¡¼¥ë¤¬ Python ´Ä¶­¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð
55+# pip ¤ò»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
56+BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
57+
58 # text/html ¥Ñ¡¼¥È¤ò¥×¥ì¡¼¥ó¥Æ¥­¥¹¥È¤ËÊÑ´¹¤¹¤ë¥³¥Þ¥ó¥É¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï
59 # ·ë²Ì¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ %(filename)s ¤Ï¥×¥í¥°¥é¥à¤¬
60 # ½èÍý¤¹¤ë°ì»þ¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£
61@@ -1897,6 +1905,7 @@
62 add_language('da', _('Danish'), 'iso-8859-1', 'ltr')
63 add_language('de', _('German'), 'iso-8859-1', 'ltr')
64 add_language('en', _('English (USA)'), 'us-ascii', 'ltr')
65+add_language('eo', _('Esperanto'), 'utf-8', 'ltr')
66 add_language('es', _('Spanish (Spain)'), 'iso-8859-1', 'ltr')
67 add_language('et', _('Estonian'), 'iso-8859-15', 'ltr')
68 add_language('eu', _('Euskara'), 'iso-8859-15', 'ltr') # Basque