From 0b765a46d908b4a47329952e0aeaf3d4e6e647c6 Mon Sep 17 00:00:00 2001
From: Akihiro MOTOKI <amotoki@users.sourceforge.jp>
Date: Sat, 10 Sep 2011 21:42:55 +0900
Subject: [PATCH] gnumaniak: release diff.1 [JM:00381]

---
 manual/gnumaniak/ChangeLog           |  6 ++++++
 manual/gnumaniak/draft/man1/diff.1   | 13 +++++++++----
 manual/gnumaniak/release/man1/diff.1 | 13 +++++++++----
 manual/gnumaniak/translation_list    |  2 +-
 www/news.m4                          |  1 +
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/manual/gnumaniak/ChangeLog b/manual/gnumaniak/ChangeLog
index 3d61ad68..4a69cfae 100644
--- a/manual/gnumaniak/ChangeLog
+++ b/manual/gnumaniak/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 10 21:42:30 JST 2011  JM ML to Git Gateway
+
+	* translation_list: [JM:00381]
+	* draft/man1/diff.1: [JM:00381]
+	* release/man1/diff.1: [JM:00381]
+
 Sat Sep 10 21:41:05 JST 2011  JM ML to Git Gateway
 
 	* translation_list: [JM:00380]
diff --git a/manual/gnumaniak/draft/man1/diff.1 b/manual/gnumaniak/draft/man1/diff.1
index c040fcf2..df609d8c 100644
--- a/manual/gnumaniak/draft/man1/diff.1
+++ b/manual/gnumaniak/draft/man1/diff.1
@@ -16,6 +16,8 @@
 .\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
 .\" Updated & Modified Sat Jan 24 10:40:25 JST 2004
 .\"         by Yuichi SATO <ysato444@yahoo.co.jp>
+.\" Updated Sat Aug 13 18:45:46 JST 2011
+.\"         by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
 .\"
 .\"WORD:	context		¥³¥ó¥Æ¥¯¥¹¥È
 .\"WORD:	format		·Á¼°¡¢[ʸ̮¤Ë¤è¤Ã¤Æ] À°·Á (¤¹¤ë)
@@ -23,7 +25,7 @@
 .\"WORD:	basename	¥Õ¥¡¥¤¥ë̾¤Î base Éô [¶ì¤·¤¤...]
 .\"WORD:	heuristics	¥Ò¥å¡¼¥ê¥¹¥Æ¥£¥Ã¥¯¤Ê¼êË¡
 .\"WORD:	header		¥Ø¥Ã¥À
-.\"WORD:	gutter		¹Â
+.\"WORD:	gutter		¤Î¤É
 .\"WORD:	(in)complete	¹ÔËö¤Ë²þ¹Ô¤¬¤¢¤ë (¤Ê¤¤)
 .\"WORD:	null character	¥Ê¥ëʸ»ú
 .\"
@@ -759,8 +761,11 @@ LINE-FROM-EITHER-FILE...
 .SS side-by-side ·Á¼°
 .\"O The files are listed in two columns with a gutter between them.  The
 .\"O gutter contains one of the following markers:
-¥Õ¥¡¥¤¥ë¤Ï 2 Îó¤Ëɽ¼¨¤µ¤ì¡¢´Ö¤Ë¹Â (gutter) ¤¬ÃÖ¤«¤ì¤ë¡£
-¹Â¤Ë¤Ï°Ê²¼¤Î¥Þ¡¼¥«¡¼¤Î¤¤¤º¤ì¤« 1 ¤Ä¤¬´Þ¤Þ¤ì¤ë¡£
+¥Õ¥¡¥¤¥ë¤Ï 2 Îó¤Ëɽ¼¨¤µ¤ì¡¢´Ö¤Ë¤Î¤É (gutter) ¤¬ÃÖ¤«¤ì¤ë¡£
+¤Î¤É¤Ë¤Ï°Ê²¼¤Î¥Þ¡¼¥«¡¼¤Î¤¤¤º¤ì¤« 1 ¤Ä¤¬´Þ¤Þ¤ì¤ë¡£
+.IP "[ÌõÃí]:" 8
+¡Ö¤Î¤É (gutter)¡×¤È¤Ï¡¢°õºþÍѸì¤Çº¸±¦¤Î¥Ú¡¼¥¸¤Î´Ö¤Ë¤¢¤ëÉôʬ (¤¹¤Ê¤ï¤Á¡¢
+ÀÞ¤êÌܤˤʤë¤È¤³¤í) ¤ò»Ø¤¹¡£
 .TP
 .B ` '
 .\"O The corresponding lines are in common.  That is, either the lines
@@ -811,7 +816,7 @@ LINE-FROM-EITHER-FILE...
 Ä̾ï½ÐÎϹԤϡ¢¤½¤³¤Ë´Þ¤Þ¤ì¤ë¹Ô¤ÎËöÈø¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¸Â¤Ã¤Æ²þ¹Ô¤µ¤ì¤Ê¤¤¡£
 ¤·¤«¤·¡¢½ÐÎϹԤ¬ 2 ¹Ô¤Îº¹°Û¤òɽ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 ÊÒÊý¤À¤±¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤â¤¢¤êÆÀ¤ë¡£¤³¤Î¾ì¹ç½ÐÎϹԤˤϲþ¹Ô¤¬½ÐÎϤµ¤ì¤ë¤¬¡¢
-¹Â¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
+¤Î¤É¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
 .RB ` \e '
 ¤Ë¡¢2 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
 .RB ` / '
diff --git a/manual/gnumaniak/release/man1/diff.1 b/manual/gnumaniak/release/man1/diff.1
index 734b8e33..3d80ee28 100644
--- a/manual/gnumaniak/release/man1/diff.1
+++ b/manual/gnumaniak/release/man1/diff.1
@@ -16,6 +16,8 @@
 .\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
 .\" Updated & Modified Sat Jan 24 10:40:25 JST 2004
 .\"         by Yuichi SATO <ysato444@yahoo.co.jp>
+.\" Updated Sat Aug 13 18:45:46 JST 2011
+.\"         by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
 .\"
 .\"WORD:	context		¥³¥ó¥Æ¥¯¥¹¥È
 .\"WORD:	format		·Á¼°¡¢[ʸ̮¤Ë¤è¤Ã¤Æ] À°·Á (¤¹¤ë)
@@ -23,7 +25,7 @@
 .\"WORD:	basename	¥Õ¥¡¥¤¥ë̾¤Î base Éô [¶ì¤·¤¤...]
 .\"WORD:	heuristics	¥Ò¥å¡¼¥ê¥¹¥Æ¥£¥Ã¥¯¤Ê¼êË¡
 .\"WORD:	header		¥Ø¥Ã¥À
-.\"WORD:	gutter		¹Â
+.\"WORD:	gutter		¤Î¤É
 .\"WORD:	(in)complete	¹ÔËö¤Ë²þ¹Ô¤¬¤¢¤ë (¤Ê¤¤)
 .\"WORD:	null character	¥Ê¥ëʸ»ú
 .\"
@@ -510,8 +512,11 @@ LINE-FROM-EITHER-FILE...
 .B -
 ¤³¤³¤Ç 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤«¤é¹Ô¤Îºï½ü¤¬¹Ô¤ï¤ì¤¿¡£
 .SS side-by-side ·Á¼°
-¥Õ¥¡¥¤¥ë¤Ï 2 Îó¤Ëɽ¼¨¤µ¤ì¡¢´Ö¤Ë¹Â (gutter) ¤¬ÃÖ¤«¤ì¤ë¡£
-¹Â¤Ë¤Ï°Ê²¼¤Î¥Þ¡¼¥«¡¼¤Î¤¤¤º¤ì¤« 1 ¤Ä¤¬´Þ¤Þ¤ì¤ë¡£
+¥Õ¥¡¥¤¥ë¤Ï 2 Îó¤Ëɽ¼¨¤µ¤ì¡¢´Ö¤Ë¤Î¤É (gutter) ¤¬ÃÖ¤«¤ì¤ë¡£
+¤Î¤É¤Ë¤Ï°Ê²¼¤Î¥Þ¡¼¥«¡¼¤Î¤¤¤º¤ì¤« 1 ¤Ä¤¬´Þ¤Þ¤ì¤ë¡£
+.IP "[ÌõÃí]:" 8
+¡Ö¤Î¤É (gutter)¡×¤È¤Ï¡¢°õºþÍѸì¤Çº¸±¦¤Î¥Ú¡¼¥¸¤Î´Ö¤Ë¤¢¤ëÉôʬ (¤¹¤Ê¤ï¤Á¡¢
+ÀÞ¤êÌܤˤʤë¤È¤³¤í) ¤ò»Ø¤¹¡£
 .TP
 .B ` '
 Âбþ¤¹¤ë¹Ô¤¬¶¦Ä̤Ǥ¢¤ë¡£¤Ä¤Þ¤ê¡¢Î¾Êý¤Î¹Ô¤¬Æ±°ì¤Ç¤¢¤ë¤«¡¢
@@ -542,7 +547,7 @@ LINE-FROM-EITHER-FILE...
 Ä̾ï½ÐÎϹԤϡ¢¤½¤³¤Ë´Þ¤Þ¤ì¤ë¹Ô¤ÎËöÈø¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¸Â¤Ã¤Æ²þ¹Ô¤µ¤ì¤Ê¤¤¡£
 ¤·¤«¤·¡¢½ÐÎϹԤ¬ 2 ¹Ô¤Îº¹°Û¤òɽ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 ÊÒÊý¤À¤±¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤â¤¢¤êÆÀ¤ë¡£¤³¤Î¾ì¹ç½ÐÎϹԤˤϲþ¹Ô¤¬½ÐÎϤµ¤ì¤ë¤¬¡¢
-¹Â¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
+¤Î¤É¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
 .RB ` \e '
 ¤Ë¡¢2 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð
 .RB ` / '
diff --git a/manual/gnumaniak/translation_list b/manual/gnumaniak/translation_list
index 34f80c43..265d473d 100644
--- a/manual/gnumaniak/translation_list
+++ b/manual/gnumaniak/translation_list
@@ -13,7 +13,7 @@
 ○:gnumaniak:1.8:1999/08/18:date:1:2004/02/07::ysato444@yahoo.co.jp:Yuichi SATO:for GNU Shell Utilities 2.1
 ○:gnumaniak:1.8:1998/11/17:dd:1:2003/03/14::ysato444@yahoo.co.jp:Yuichi SATO:for GNU fileutils 4.1
 ○:gnumaniak:1.8:1998/11/17:df:1:2003/03/14::ysato444@yahoo.co.jp:Yuichi SATO:for GNU fileutils 4.1
-○:gnumaniak:1.8:1998/10/00:diff:1:2004/02/07::ysato444@yahoo.co.jp:Yuichi SATO:for GNU diff Utilities 2.8.1
+○:gnumaniak:1.8:1998/10/00:diff:1:2011/08/13::tati@kc5.so-net.ne.jp:TACHIBANA Akira:for GNU diff Utilities 2.8.1
 ○:gnumaniak:1.8:1998/10/00:diff3:1:2000/03/12::nakano@apm.seikei.ac.jp:NAKANO Takeo:for GNU diff Utilities 2.8.1
 ○:gnumaniak:1.8:1998/11/17:dircolors:1:1999/08/22::tanisako@osa.dec.com:Kazuyuki Tanisako:for GNU fileutils 4.1
 ○:gnumaniak:1.8:1999/08/18:dirname:1:2000/03/12::nakano@apm.seikei.ac.jp:NAKANO Takeo:for GNU Shell Utilities 2.1
diff --git a/www/news.m4 b/www/news.m4
index 39c28c6a..0a3b96ab 100644
--- a/www/news.m4
+++ b/www/news.m4
@@ -46,6 +46,7 @@ m4_dnl ML2CVS ADD HERE
   <DT>gnumaniak</DT>
   <DD>
    _UPD_PAGE(gnumaniak, sdiff.1)
+   _UPD_PAGE(gnumaniak, diff.1)
   </DD>
  </DL>
 
-- 
2.11.0