gnumaniak: release sdiff.1 [JM:00380]

diff --git a/manual/gnumaniak/ChangeLog b/manual/gnumaniak/ChangeLog
index dd432e6..3d61ad6 100644 (file)
--- a/manual/gnumaniak/ChangeLog
+++ b/manual/gnumaniak/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 10 21:41:05 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00380]
+       * draft/man1/sdiff.1: [JM:00380]
+       * release/man1/sdiff.1: [JM:00380]
+
 Fri Oct  7 23:48:24 JST 2005  Akihiro MOTOKI  <amotoki@dd.iij4u.or.jp>
 
        * {draft,release}/man1/diff.1: [JM:11888] ¤Ç»ØŦ¤Î¸íµ­¤ò½¤Àµ¡£

diff --git a/manual/gnumaniak/draft/man1/sdiff.1 b/manual/gnumaniak/draft/man1/sdiff.1
index e00f5e1..d774c68 100644 (file)
--- a/manual/gnumaniak/draft/man1/sdiff.1
+++ b/manual/gnumaniak/draft/man1/sdiff.1
@@ -16,8 +16,10 @@
 .\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
 .\" Updated & Modified Sat Jan 24 17:28:45 JST 2004
 .\"         by Yuichi SATO <ysato444@yahoo.co.jp>
+.\" Updated Wed Aug 10 15:51:58 JST 2011
+.\"         by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
 .\"
-.\"WORD:       gutter          ¹Â
+.\"WORD:       gutter          ¤Î¤É
 .\"
 .TH SDIFF 1 "October 2002" "GNU diff Utilities 2.8.1"
 .\"O .SH NAME
@@ -53,11 +55,11 @@ sdiff \- 2 
 .\"O if \fB\-o\fR is specified, or producing a side-by-side difference if it's
 .\"O not.
 .B sdiff
-¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¡£
+¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¡£
 .B \-o
-¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð·ë²Ì¤Ï
+¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤ÏÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤·¤¿·ë²Ì¤ò
 .I OUTFILE
-¤Ë½ÐÎϤµ¤ì¤ë¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï side-by-side ·Á¼°¤Ç°ã¤¤¤òÀ¸À®¤¹¤ë¡£
+¤Ë½ÐÎϤ¹¤ë¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï side-by-side ·Á¼°¤Ç°ã¤¤¤òɽ¼¨¤¹¤ë¤À¤±¤Ç¤¢¤ë¡£
 
 .\"O If
 .\"O .I FROMFILE
@@ -238,14 +240,20 @@ sdiff \- 2 
 .\"O prompts with 
 .\"O .RB ` % '
 .\"O and pauses, waiting for one of the following commands.
-¶¦Ä̹ԤΥ֥í¥Ã¥¯ (¤È¶õÇò¤Î¹Â) ¤Ï¡¢
+¶¦Ä̹ԤΥ֥í¥Ã¥¯ (¶õÇò¤Î¡Ö¤Î¤É (gutter)¡×¤ò¶´¤ó¤Çº¸±¦¤Ëɽ¼¨¤µ¤ì¤ë) ¤Ï¡¢
 1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é½ÐÎϤ˥³¥Ô¡¼¤µ¤ì¤ë¡£
-°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¥Ö¥í¥Ã¥¯¤Î¤¢¤È¤Ë¤Ï¡¢
+º¹°Û¤Î¤¢¤ë¹Ô¥Ö¥í¥Ã¥¯¤Î¤¢¤È¤Ç¤Ï¡¢
 .B sdiff
 ¤Ï
 .RB ` % '
-¤Ç¥×¥í¥ó¥×¥È¤ò½Ð¤·¤Æ°ì»þÄä»ß¤·¡¢
+¤ò¥×¥í¥ó¥×¥È¤È¤·¤Æ½Ð¤·¤Æ°ì»þÄä»ß¤·¡¢
 °Ê²¼¤Î¥³¥Þ¥ó¥É¤Î¤É¤ì¤« 1 ¤Ä¤¬ÆþÎϤµ¤ì¤ë¤Î¤òÂԤġ£
+.IP "[ÌõÃí]:" 8
+¡Ö¤Î¤É (gutter)¡×¤È¤Ï¡¢°õºþÍѸì¤Çº¸±¦¤Î¥Ú¡¼¥¸¤Î´Ö¤Ë¤¢¤ëÉôʬ (¤¹¤Ê¤ï¤Á¡¢
+ÀÞ¤êÌܤˤʤë¤È¤³¤í) ¤ò»Ø¤¹¡£¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ç¤Ï¡¢Âбþ¤¹¤ë¹Ô¤ÎÃæ´Ö¤Ë¤¢¤ë¡¢
+¶èÀڤ국¹æ¤òÃÖ¤¯¾ì½ê¤ò°ÕÌ£¤·¤Æ¤¤¤ë¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+.BR diff (1)
+¤Î¡Öside-by-side ·Á¼°¡×¤ò»²¾È¤¹¤ë¤³¤È¡£
 .TP
 .B e
 .\"O Discard both versions.  Invoke a text editor on an empty temporary
@@ -286,7 +294,9 @@ sdiff \- 2 
 .\"O Quit.
 ½ªÎ»¤¹¤ë¡£
 .TP
-.B p
+.\":tati:¢­¤Ï p ¤Ç¤Ê¤¯ r
+.\"O .B p
+.B r
 .\"O Copy the right version to the output.
 ±¦Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
 .TP
@@ -307,11 +317,11 @@ sdiff \- 2 
 .B 0
 .\"O \fBsdiff\fR was successful, no differences found.
 .B sdiff
-¤ÏÀ®¸ù¤·¡¢Êѹ¹¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£
+¤ÏÀ®¸ù¤·¡¢º¹°Û¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£
 .TP
 .B 1
 .\"O Some differences were found.
-Êѹ¹¤¬¸«ÉÕ¤«¤Ã¤¿¡£
+º¹°Û¤¬¸«ÉÕ¤«¤Ã¤¿¡£
 .TP
 .B 2
 .\"O Some error occurred.

diff --git a/manual/gnumaniak/release/man1/sdiff.1 b/manual/gnumaniak/release/man1/sdiff.1
index 59842ee..5661278 100644 (file)
--- a/manual/gnumaniak/release/man1/sdiff.1
+++ b/manual/gnumaniak/release/man1/sdiff.1
@@ -16,8 +16,10 @@
 .\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
 .\" Updated & Modified Sat Jan 24 17:28:45 JST 2004
 .\"         by Yuichi SATO <ysato444@yahoo.co.jp>
+.\" Updated Wed Aug 10 15:51:58 JST 2011
+.\"         by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
 .\"
-.\"WORD:       gutter          ¹Â
+.\"WORD:       gutter          ¤Î¤É
 .\"
 .TH SDIFF 1 "October 2002" "GNU diff Utilities 2.8.1"
 .SH ̾Á°
@@ -43,11 +45,11 @@ sdiff \- 2 
 [\fB-v\fR] [\fB\-\-help\fR] [\fB\-\-version\fR]
 .SH ÀâÌÀ
 .B sdiff
-¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¡£
+¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¡£
 .B \-o
-¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð·ë²Ì¤Ï
+¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤ÏÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤·¤¿·ë²Ì¤ò
 .I OUTFILE
-¤Ë½ÐÎϤµ¤ì¤ë¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï side-by-side ·Á¼°¤Ç°ã¤¤¤òÀ¸À®¤¹¤ë¡£
+¤Ë½ÐÎϤ¹¤ë¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï side-by-side ·Á¼°¤Ç°ã¤¤¤òɽ¼¨¤¹¤ë¤À¤±¤Ç¤¢¤ë¡£
 
 .I FROMFILE
 ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç
@@ -160,14 +162,20 @@ sdiff \- 2 
 .B sdiff
 ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ¹¤ë¡£
 .SH ¥Þ¡¼¥¸
-¶¦Ä̹ԤΥ֥í¥Ã¥¯ (¤È¶õÇò¤Î¹Â) ¤Ï¡¢
+¶¦Ä̹ԤΥ֥í¥Ã¥¯ (¶õÇò¤Î¡Ö¤Î¤É (gutter)¡×¤ò¶´¤ó¤Çº¸±¦¤Ëɽ¼¨¤µ¤ì¤ë) ¤Ï¡¢
 1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é½ÐÎϤ˥³¥Ô¡¼¤µ¤ì¤ë¡£
-°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¥Ö¥í¥Ã¥¯¤Î¤¢¤È¤Ë¤Ï¡¢
+º¹°Û¤Î¤¢¤ë¹Ô¥Ö¥í¥Ã¥¯¤Î¤¢¤È¤Ç¤Ï¡¢
 .B sdiff
 ¤Ï
 .RB ` % '
-¤Ç¥×¥í¥ó¥×¥È¤ò½Ð¤·¤Æ°ì»þÄä»ß¤·¡¢
+¤ò¥×¥í¥ó¥×¥È¤È¤·¤Æ½Ð¤·¤Æ°ì»þÄä»ß¤·¡¢
 °Ê²¼¤Î¥³¥Þ¥ó¥É¤Î¤É¤ì¤« 1 ¤Ä¤¬ÆþÎϤµ¤ì¤ë¤Î¤òÂԤġ£
+.IP "[ÌõÃí]:" 8
+¡Ö¤Î¤É (gutter)¡×¤È¤Ï¡¢°õºþÍѸì¤Çº¸±¦¤Î¥Ú¡¼¥¸¤Î´Ö¤Ë¤¢¤ëÉôʬ (¤¹¤Ê¤ï¤Á¡¢
+ÀÞ¤êÌܤˤʤë¤È¤³¤í) ¤ò»Ø¤¹¡£¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ç¤Ï¡¢Âбþ¤¹¤ë¹Ô¤ÎÃæ´Ö¤Ë¤¢¤ë¡¢
+¶èÀڤ국¹æ¤òÃÖ¤¯¾ì½ê¤ò°ÕÌ£¤·¤Æ¤¤¤ë¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+.BR diff (1)
+¤Î¡Öside-by-side ·Á¼°¡×¤ò»²¾È¤¹¤ë¤³¤È¡£
 .TP
 .B e
 ξÊý¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤â¼Î¤Æ¤ë¡£ÆâÍƤ¬¶õ¤Î°ì»þ¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤Ç³«¤­¡¢
@@ -196,7 +204,8 @@ sdiff \- 2 
 .B q
 ½ªÎ»¤¹¤ë¡£
 .TP
-.B p
+.\":tati:¢­¤Ï p ¤Ç¤Ê¤¯ r
+.B r
 ±¦Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
 .TP
 .B s
@@ -210,10 +219,10 @@ sdiff \- 2 
 .TP
 .B 0
 .B sdiff
-¤ÏÀ®¸ù¤·¡¢Êѹ¹¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£
+¤ÏÀ®¸ù¤·¡¢º¹°Û¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£
 .TP
 .B 1
-Êѹ¹¤¬¸«ÉÕ¤«¤Ã¤¿¡£
+º¹°Û¤¬¸«ÉÕ¤«¤Ã¤¿¡£
 .TP
 .B 2
 ²¿¤é¤«¤Î¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¡£

diff --git a/manual/gnumaniak/translation_list b/manual/gnumaniak/translation_list
index 7b3cd27..34f80c4 100644 (file)
--- a/manual/gnumaniak/translation_list
+++ b/manual/gnumaniak/translation_list
@@ -58,7 +58,7 @@
 ○:gnumaniak:1.8:1999/08/18:pwd:1:2000/03/12::nakano@apm.seikei.ac.jp:NAKANO Takeo:for GNU Shell Utilities 2.1
 ○:gnumaniak:1.8:1998/11/17:rm:1:1999/11/03::sato@complex.eng.hokudai.ac.jp:Yuichi SATO:for GNU fileutils 4.1
 ○:gnumaniak:1.8:1998/11/17:rmdir:1:2004/02/07::ysato444@yahoo.co.jp:Yuichi SATO:for GNU fileutils 4.1
-○:gnumaniak:1.8:1998/10/00:sdiff:1:2004/02/07::ysato444@yahoo.co.jp:Yuichi SATO:for GNU diff Utilities 2.8.1
+○:gnumaniak:1.8:1998/10/00:sdiff:1:2011/08/10::tati@kc5.so-net.ne.jp:TACHIBANA Akira:for GNU diff Utilities 2.8.1
 ○:gnumaniak:1.8:0000/00/00:seq:1:2003/04/26::ysato444@yahoo.co.jp:Yuichi SATO:for GNU Shell Utilities 2.1
 ○:gnumaniak:1.8:0000/00/00:sha1sum:1:2003/05/13::ysato444@yahoo.co.jp:Yuichi SATO:for GNU textutils 2.1
 ○:gnumaniak:1.8:0000/00/00:shred:1:2003/05/13::ysato444@yahoo.co.jp:Yuichi SATO:for GNU fileutils 4.1

diff --git a/www/news.m4 b/www/news.m4
index 711693f..39c28c6 100644 (file)
--- a/www/news.m4
+++ b/www/news.m4
@@ -43,6 +43,10 @@ m4_dnl ML2CVS ADD HERE
   <DD>
    _UPD_PAGE(LDP_man-pages, ioctl.2)
   </DD>
+  <DT>gnumaniak</DT>
+  <DD>
+   _UPD_PAGE(gnumaniak, sdiff.1)
+  </DD>
  </DL>
 
  <H2>2011/04/12</H2>