sync (upstream revision 1.6 -> 1.7).

Thanks for improving by Kobayashi Noritada.

CVS version numbers

japanese/legal/licenses/index.wml: 1.1 -> 1.2

1 files changed, 32 insertions, 24 deletions

diff --git a/japanese/legal/licenses/index.wml b/japanese/legal/licenses/index.wml
index 438e9cfbf8f..c6e4a34f1b1 100644
--- a/japanese/legal/licenses/index.wml
+++ b/japanese/legal/licenses/index.wml
@@ -1,46 +1,52 @@
 <define-tag pagetitle>¥é¥¤¥»¥ó¥¹¾ðÊó</define-tag>
 #use wml::debian::template title="<pagetitle>" GEN_TIME="yes"
 #use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::translation-check translation="1.7"
 
-<p>¤³¤Î¥µ¥¤¥È¤Ï¡¢
-<a href="$(HOME)/social_contract#guidelines">Debian ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥¬¥¤¥É¥é¥¤¥ó</a> (DFSG) ¤ÇÄê¤á¤é¤ì¤Æ¤¤¤ë´ð½à¤È¾È¹ç¤·¤¿¤È¤­¤ËÆÃÄê¤Î¥é¥¤¥»¥ó¥¹¤¬Å¬¹ç¤·¤Æ¤¤¤ë¤È¤¤¤¨¤ë¤«Èݤ«¤Ë¤Ä¤¤¤Æ¤Î¡¢
-Debian ¥×¥í¥¸¥§¥¯¥È¤Î°Õ¸«¤òÄ󶡤·¤Þ¤¹¡£
-¤³¤ì¤é¤Î°Õ¸«¤ÎÂçȾ¤Ï <a href="http://lists.debian.org/debian-legal/">debian-legal ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</a>¤Ë¤ª¤±¤ëµÄÏÀ¤Çºî¤é¤ì¤¿¤â¤Î¤Ç¡¢
-¤³¤ì¤é¤Î¥é¥¤¥»¥ó¥¹¥µ¥Þ¥ê¤Ë´Ø¤·¤Æµ¿Ìä¤ä¥³¥á¥ó¥È¤¬¤¢¤ì¤Ð¡¢
-¤¢¤Ê¤¿¤â<a href="mailto:debian-legal@lists.debian.org">¥³¥ó¥¿¥¯¥È</a>¤ò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
+<p>¤³¤Î¥µ¥¤¥È¤Ï¡¢ÆÃÄê¤Î¥é¥¤¥»¥ó¥¹¤¬ <a
+href="$(HOME)/social_contract#guidelines">Debian
+¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥¬¥¤¥É¥é¥¤¥ó</a> (DFSG) ¤Ë¤·¤¿¤¬¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ë¡¢debianl-legal
+¤Ø¤Î¹×¸¥¼Ô¤Î°Õ¸«¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î°Õ¸«¤ÎÂçȾ¤Ï¡¢<a
+href="http://lists.debian.org/debian-legal/">debian-legal
+¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</a>¤Ë¤ª¤¤¤ÆÀøºßŪ¤Ê¥Ñ¥Ã¥±¡¼¥¸¥á¥ó¥Æ¥Ê¤ä¥é¥¤¥»¥ó¥¹ÍøÍѼԤ«¤é¤Î
+¼ÁÌä¤ËÂФ¹¤ëµÄÏÀ¤«¤éºî¤é¤ì¤¿¤â¤Î¤Ç¡¢
+¤³¤ì¤é¤Î¥é¥¤¥»¥ó¥¹¥µ¥Þ¥ê¤Ë´Ø¤·¤Æµ¿Ìä¤ä¥³¥á¥ó¥È¤¬¤¢¤ì¤Ð¡¢<a
+href="mailto:debian-legal@lists.debian.org">debian-legal
+¤Ë¥³¥ó¥¿¥¯¥È¤ò¤È¤ë</a>¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</p>
 
 <p>¤³¤Î¥µ¥¤¥È¤Ï 2004 ǯ 5 ·î¤Ë»Ï¤á¤é¤ì¤¿¤Î¤Ç¸Å¤¤¥µ¥Þ¥ê¤Ï½ù¡¹¤Ë¤Þ¤È¤á¤é¤ì¤Ä¤Ä¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
 ºÇ½é¤Î¿ô½µ´Ö¤Ï¿©¤¤°ã¤¤¤ä¥®¥ã¥Ã¥×¤¬À¸¤¸¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬µö¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
 
-<p>¥é¥¤¥»¥ó¥¹¤ÏÄ̾ï 3 ¤Ä¤Î¥«¥Æ¥´¥ê¤ËʬÎव¤ì¤Þ¤¹¡£
-<em>¥Õ¥ê¡¼¤Ê (free)</em> ¥é¥¤¥»¥ó¥¹¡¢
-<em>¥Õ¥ê¡¼¤Ç¤Ê¤¤ (non-free)</em> ¥é¥¤¥»¥ó¥¹¡¢
-¤ª¤è¤Ó<em>ºÆÇÛÉÛ¤òµö²Ä¤·¤Ê¤¤ (non-redistributable)</em> ¥é¥¤¥»¥ó¥¹¤Ç¤¹¡£</p>
+<p>Debian ¤Î¤¿¤á¤Ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤µ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢Ä̾ï 3 ¤Ä¤Î¥«¥Æ¥´¥ê¤ËʬÎव¤ì¤Þ¤¹¡£
+<em>¥Õ¥ê¡¼¤Ê (free)</em> ¥½¥Õ¥È¥¦¥§¥¢¡¢
+<em>¥Õ¥ê¡¼¤Ç¤Ê¤¤ (non-free)</em> ¥½¥Õ¥È¥¦¥§¥¢¡¢
+¤ª¤è¤Ó<em>ºÆÇÛÉÛ¤òµö²Ä¤·¤Ê¤¤ (non-redistributable)</em> ¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
+ºÇ½ªÅª¤Ê·èÃÇ¤Ï ftpmasters ¤ËÀÕǤ¤¬¤¢¤ê¤Þ¤¹¤¬¡¢Èà¤é¤Ï¾¤Ë¤â¿¤¯¤ÎÀÕǤ¤òÉé¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢
+Ä̾ï¤Ï debian-legal ¤Ë¤ª¤±¤ë¹ç°Õ¤ò¹Íθ¤ËÆþ¤ì¤Æ·è¤á¤é¤ì¤Þ¤¹¡£</p>
 
-<p><em>¥Õ¥ê¡¼¤Ê</em>¥é¥¤¥»¥ó¥¹¤È¤Ï¡¢
-DFSG ¤ÇÄê¤á¤é¤ì¤Æ¤¤¤ëÁ´¤Æ¤ÎɬÍ×¾ò·ï¤ËŬ¹ç¤·¤Æ¤¤¤ë¤â¤Î¤Ç¤¹¡£
+<p><em>¥Õ¥ê¡¼¤Ê</em>¥½¥Õ¥È¥¦¥§¥¢¤È¤Ï¡¢
+DFSG ¤Ë¤·¤¿¤¬¤Ã¤Æ¤¤¤ë¤â¤Î¤Ç¤¹¡£
 DFSG ¤Î²ò¼á¤ËǺ¤ó¤À¤é <a href="http://people.debian.org/~bap/dfsg-faq.html">DFSG FAQ</a> ¤òÄ´¤Ù¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-¤³¤³¤Ë¤Ï¡¢¥é¥¤¥»¥ó¥¹¤ª¤è¤Ó¤½¤ì¤é¤ÎʬÎà¤Ë¤Ä¤¤¤Æ¤è¤¯¤Ê¤µ¤ì¤ë¼ÁÌä¤ËÂФ¹¤ë²óÅú¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
+¤³¤³¤Ë¤Ï¡¢DFSG ¤ª¤è¤Ó¥½¥Õ¥È¥¦¥§¥¢¤ÎʬÀÏÊýË¡¤Ë¤Ä¤¤¤Æ¤è¤¯¤Ê¤µ¤ì¤ë¼ÁÌä¤ËÂФ¹¤ë²óÅú¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
 ¥Õ¥ê¡¼¤Ê¥é¥¤¥»¥ó¥¹¤ò¤â¤Ä¤³¤È¤Ï¡¢
 ¥½¥Õ¥È¥¦¥§¥¢¤Î°ìÉô¤¬ Debian ¤Ë´Þ¤á¤é¤ì¤ë¤È¤­¤ËɬÍפȤʤë (¤·¤«¤·½½Ê¬¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£<a href="$(DOC)/debian-policy/ch-archive.html#s-main">Debian ¥Ý¥ê¥·¡¼¤Î &sect;2.2.1</a> ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£) ¾ò·ï¤Ç¤¹¡£
-¥Õ¥ê¡¼¤Ê¥é¥¤¥»¥ó¥¹¤ÎÎã¤È¤·¤Æ¤Ï¡¢
+Ŭ¹ç¤¹¤ë¥é¥¤¥»¥ó¥¹¤ÎÎã¤È¤·¤Æ¤Ï¡¢
 <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> (GPL)¡¢
 <a href="http://www.opensource.org/licenses/artistic-license.php">Artistic license</a> (·Ý½Ñ²ÈŪ¥é¥¤¥»¥ó¥¹)¡¢
 ¤ª¤è¤Ó <a href="$(HOME)/misc/bsd.license">BSD ¥¹¥¿¥¤¥ë¥é¥¤¥»¥ó¥¹</a>¤¬¤¢¤ê¤Þ¤¹¡£
 
-<p><em>¥Õ¥ê¡¼¤Ç¤Ê¤¤</em>¥é¥¤¥»¥ó¥¹¤È¤Ï¡¢
-DFSG ¤ÇÄê¤á¤é¤ì¤Æ¤¤¤ëɬÍ×¾ò·ï¤Î¤¦¤Á¤Î°ì¤Ä¤Þ¤¿¤Ï¤½¤ì°Ê¾å¤ËŬ¹ç¤·¤Ê¤¤¤â¤Î¤Ç¤¹¡£
+<p><em>non-free</em> ¤Ë¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
+DFSG ¤ÇÄê¤á¤é¤ì¤Æ¤¤¤ëɬÍ×¾ò·ï¤Î¤¦¤Á¤Î°ì¤Ä¤Þ¤¿¤Ï¤½¤ì°Ê¾å¤Ë¤·¤¿¤¬¤Ã¤Æ¤¤¤Ê¤¤¤â¤Î¤Ç¤¹¡£
 ¤¿¤À¤·¤½¤ì¤é¤Ï¡¢¥é¥¤¥»¥ó¥¹¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ë´Ø¤·¤Æ̵¾ò·ï¤ËÈó¾¦ÍѤκÆÇÛÉÛ¤ò¤¹¤ë¤³¤È¤ò¾¯¤Ê¤¯¤È¤âµö²Ä¤·¤Þ¤¹¡£
-Debian ¤Ï¡¢¥Õ¥ê¡¼¤Ç¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÉô¤Î¤¿¤á¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+Debian ¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¥Õ¥ê¡¼¤Ç¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î¤¿¤á¤Ë¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
 ¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï Debian ¥·¥¹¥Æ¥à¤Î°ìÉô¤Ç¤Ï¤Ê¤¤¤Ç¤¹¤¬¡¢
 Ìò¤ËΩ¤Ä¤â¤Î¤È¤·¤Æ»ä¤¿¤Á¤Î¥æ¡¼¥¶¤ËÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹ (»ä¤¿¤Á¤Î<a href="$(HOME)/social_contract">¼Ò²ñ·ÀÌó</a>¤Î &sect;5 ¤òÆɤó¤Ç¤¯¤À¤µ¤¤) ¡£
 Îã¤È¤·¤Æ¤Ï¡¢¥½¥Õ¥È¥¦¥§¥¢¤ò¾¦ÍÑÌÜŪ¤Ç»ÈÍѤ¹¤ë¤³¤È¤òÀ©¸Â¤¹¤ë¥é¥¤¥»¥ó¥¹¤ä¡¢
-Êѹ¹¤ò²Ã¤¨¤ë¤³¤È¤òÀ©¸Â¤¹¤ë¥é¥¤¥»¥ó¥¹¤¬¤¢¤ê¤Þ¤¹¡£</p>
+Êѹ¹¤ò²Ã¤¨¤ë¤³¤È¤òÀ©¸Â¤¹¤ë¥é¥¤¥»¥ó¥¹¤¬Å¬ÍѤµ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤Ê¤É¤Ç¤¹¡£</p>
 
-<p>¥Õ¥ê¡¼¤Ç¤Ê¤¤¾å¤Ë<em>ºÆÇÛÉÛ¤òµö²Ä¤·¤Ê¤¤ (non-redistributable)</em> ¥é¥¤¥»¥ó¥¹¤È¤Ï¡¢
-̵¾ò·ï¤ËÈó¾¦ÍѤκÆÇÛÉÛ¤ò¤¹¤ë¤³¤È¤ò¤âµö²Ä¤·¤Ê¤¤¤â¤Î¤Ç¤¹¡£
-¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ºÆÇÛÉۤθ¢Íø¤Ë´Ø¤¹¤ëµ­½Ò¤¬¤Ê¤¤¥é¥¤¥»¥ó¥¹¤â´Þ¤Þ¤ì¤Þ¤¹¡£
+<p><em>ºÆÇÛÉÛ¤òµö²Ä¤·¤Ê¤¤</em>¥½¥Õ¥È¥¦¥§¥¢¤È¤Ï¡¢non-free
+¤Ê¾å¤Ë̵¾ò·ï¤ËÈó¾¦ÍѤκÆÇÛÉÛ¤ò¤¹¤ë¤³¤È¤ò¤âµö²Ä¤·¤Ê¤¤¤â¤Î¤Ç¤¹¡£¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï¡¢
+ºÆÇÛÉۤθ¢Íø¤Ë´Ø¤¹¤ëµ­½Ò¤¬¤Ê¤¤¥é¥¤¥»¥ó¥¹¤¬Å¬ÍѤµ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤â´Þ¤Þ¤ì¤Þ¤¹¡£
 ¸À¤¤´¹¤¨¤ì¤Ð¡¢¥é¥¤¥»¥ó¥¹¤Ë¤è¤Ã¤ÆºÆÇÛÉۤθ¢Íø¤¬ÌÀ³Î¤Ëµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
 Á´¤Æ¤Î¸¢Íø¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¸«¤Ê¤»¤Þ¤¹¡£
 ºÆÇÛÉۤǤ­¤Ê¤¤¥½¥Õ¥È¥¦¥§¥¢¤ò Debian ¤Ï¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó¤·¡¢
@@ -49,8 +55,10 @@ Debian ¤Î¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤ÆɬÍפȤʤëÇÛÉÛ¤ò¤³¤Î¥é¥¤¥»¥ó¥¹¤Ïµö²Ä¤·¤Þ¤»¤ó¡
 <p>ƱÍͤΥꥹ¥È¤Ï¡¢
 <a href="http://www.gnu.org/licenses/license-list.html">Free Software Foundation</a> (FSF) ¤ä
 <a href="http://www.opensource.org/licenses/index.html">Open Source Initiative</a> (OSI) ¤Ë¤è¤Ã¤Æ¤âÀ°È÷¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¤·¤«¤·¤Ê¤¬¤é¡¢°Ê²¼¤Î¥ê¥¹¥È¤Ë¸«¤é¤ì¤ë¤è¤¦¤Ë¡¢
-Debian ¤Ï¥é¥¤¥»¥ó¥¹¤ÎʬÎà¤ËºÝ¤·¤Æ°Û¤Ê¤ëȽÃÇ´ð½à¤òÍѤ¤¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+¤·¤«¤·¡¢Debian ¥×¥í¥¸¥§¥¯¥È¤Ï¥é¥¤¥»¥ó¥¹¤ÎÍ×Ìó¤è¤ê¤â¸Ä¡¹¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ø¤·¤ÆȽÃǤ·¤Þ¤¹¡£
+°Ê²¼¤Î¤â¤Î¤Ï²Äǽ¤Ê¸Â¤ê°ìÈÌŪ¤ÊÀâÌÀ¤ò¤·¤¿¤Ë²á¤®¤Ê¤¤ÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+°Û¤Ê¤ë²ò¼á¤ò»ý¤Ã¤¿¥é¥¤¥»¥ó¥¹¤òŬÍѤ·¤¿¥½¥Õ¥È¥¦¥§¥¢¤ò¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤á
+¤ë¤È¡¢non-free ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
 
 <p>»ä¤¿¤Á¤Ï¡¢¥½¡¼¥ÈÊýË¡¤Î°Û¤Ê¤ë3¼ïÎà¤Î¥ê¥¹¥È¤òÄ󶡤·¤Æ¤¤¤Þ¤¹:</p>