From MAILER-DAEMON Fri Nov 01 01:12:22 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vc71y-0001R0-0w
	for mharc-bug-diffutils@gnu.org; Fri, 01 Nov 2013 01:12:22 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52720)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1Vc3ar-0008MI-2R
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:32:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1Vc3al-0003aL-5D
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:32:08 -0400
Received: from debbugs.gnu.org ([140.186.70.43]:41961)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1Vc3al-0003aH-24
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:32:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1Vc3ak-0002vN-GK
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:32:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: "Dr. David Alan Gilbert" <dave@treblig.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 01 Nov 2013 01:32:02 +0000
Resent-Message-ID: <handler.15774.B.138326946911154@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 15774
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 15774@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.138326946911154
	(code B ref -1); Fri, 01 Nov 2013 01:32:02 +0000
Received: (at submit) by debbugs.gnu.org; 1 Nov 2013 01:31:09 +0000
Received: from localhost ([127.0.0.1]:55980 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1Vc3Zs-0002tq-PY
	for submit@debbugs.gnu.org; Thu, 31 Oct 2013 21:31:09 -0400
Received: from eggs.gnu.org ([208.118.235.92]:47562)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <dg@treblig.org>) id 1Vc37u-0002Bu-Tj
	for submit@debbugs.gnu.org; Thu, 31 Oct 2013 21:02:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dg@treblig.org>) id 1Vc37k-0004Oc-0u
	for submit@debbugs.gnu.org; Thu, 31 Oct 2013 21:02:09 -0400
Received: from lists.gnu.org ([2001:4830:134:3::11]:52183)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dg@treblig.org>) id 1Vc37j-0004OY-UM
	for submit@debbugs.gnu.org; Thu, 31 Oct 2013 21:02:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49257)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dg@treblig.org>) id 1Vc37e-0003sj-W3
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:02:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dg@treblig.org>) id 1Vc37U-0004Lc-P7
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:01:58 -0400
Received: from mx.treblig.org ([80.68.94.177]:57921)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dg@treblig.org>) id 1Vc37U-0004LX-JG
	for bug-diffutils@gnu.org; Thu, 31 Oct 2013 21:01:48 -0400
Received: from dg by mx.treblig.org with local (Exim 4.80)
	(envelope-from <dg@treblig.org>) id 1Vc2tA-0001I5-Tq
	for bug-diffutils@gnu.org; Fri, 01 Nov 2013 00:47:00 +0000
Date: Fri, 1 Nov 2013 00:47:00 +0000
From: "Dr. David Alan Gilbert" <dave@treblig.org>
Message-ID: <20131101004700.GD24298@gallifrey>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Chocolate: 70 percent or better cocoa solids preferably
X-Operating-System: Linux/3.2.2-kvm-i386-20120306 (i686)
X-Uptime: 00:28:38 up 4 days, 9:21, 2 users, load average: 0.00, 0.01, 0.05
User-Agent: Mutt/1.5.21 (2010-09-15)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic]
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Mailman-Approved-At: Thu, 31 Oct 2013 21:31:06 -0400
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 140.186.70.43
X-Mailman-Approved-At: Fri, 01 Nov 2013 01:12:20 -0400
Subject: [bug-diffutils] bug#15774: rfc/pre-patch: automatic diff width from
	the terminal
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 01:32:14 -0000

Hi,
  The patch below is a rough 1st cut of an attempt to make diff use the
terminal width as the default width.

It pinches the code from coreutils ls.c that does the same thing, and so
uses the terminal width, failing that reads the COLUMNS env variable,
and failing that falls back to the default (all of which can still be
over ridden with -w/-W).

  Other than glue, all the actual code comes straight out of ls.c

Now given that this is a first cut, is this basically the right approach,
and are people happy to change the default behaviour?

I know that there are some things I need to do:
  - figure out the autoconf magic so it works when termios isn't available
    and the 'WINSIZE_IN_PTEM' def that coreutils picks up
  - Probably more docs fixing
  - some tests
  - (Copyright assignment? Or is the code so close to coreutils it isn't
an issue?)

It's the side by side diff that I'm most interested in this for,
having nice wide cheap 1920 monitors is great for side by side diffs
and I normally want to fill whatever terminal I have.

Thanks in advance for all comments,

Dave

-----------------------
diff --git a/bootstrap.conf b/bootstrap.conf
index ac85adf..10be643 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -56,6 +56,7 @@ mkstemp
 mktime
 progname
 propername
+quotearg
 rawmemchr
 readme-release
 regex
@@ -82,6 +83,7 @@ wcwidth
 xalloc
 xfreopen
 xreadlink
+xstrtol
 xstrtoumax
 xvasprintf
 '
diff --git a/doc/diffutils.texi b/doc/diffutils.texi
index 2d238dc..09dae68 100644
--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -3967,8 +3967,10 @@ Ignore white space when comparing lines.  @xref{White Space}.
 
 @item -W @var{columns}
 @itemx --width=@var{columns}
-Output at most @var{columns} (default 130) print columns per line in
-side by side format.  @xref{Side by Side Format}.
+Output at most @var{columns} print columns per line in side by side format.
+The default is taken from the terminal settings if possible; otherwise the
+environment variable @env{COLUMNS} is used if it is set; otherwise the default
+is 130 columns.  @xref{Side by Side Format}.
 
 @item -x @var{pattern}
 @itemx --exclude=@var{pattern}
diff --git a/src/diff.c b/src/diff.c
index 50d0365..8d283d3 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -34,13 +34,23 @@
 #include <hard-locale.h>
 #include <prepargs.h>
 #include <progname.h>
+#include <quotearg.h>
 #include <sh-quote.h>
 #include <stat-time.h>
+#include <xstrtol.h>
 #include <timespec.h>
 #include <version-etc.h>
 #include <xalloc.h>
 #include <xreadlink.h>
 #include <binary-io.h>
+#include <termios.h>
+
+#include <sys/ioctl.h>
+#ifdef WINSIZE_IN_PTEM
+# include <sys/stream.h>
+# include <sys/ptem.h>
+#endif
+
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "diff"
@@ -255,6 +265,51 @@ exclude_options (void)
 {
   return EXCLUDE_WILDCARDS | (ignore_file_name_case ? FNM_CASEFOLD : 0);
 }
+
+/* Return the number of columns to use, based on:
+ *   a default (130)
+ *   the COLUMNS env variable
+ *   the terminal width
+ * The code is based on coreutils/ls.c - except diff has always defaulted
+ * to 130 rather than ls's 80.   I'd probably say it's better to allow
+ * overriding terminal width by COLUMNS but decided to keep it consistent
+ * with coreutils.
+ */
+static size_t
+get_default_width (void)
+{
+  size_t line_length = 130;
+
+  char const *p = getenv ("COLUMNS");
+  if (p && *p)
+    {
+      unsigned long int tmp_ulong;
+      if (xstrtoul (p, NULL, 0, &tmp_ulong, NULL) == LONGINT_OK
+          && 0 < tmp_ulong && tmp_ulong <= SIZE_MAX)
+        {
+          line_length = tmp_ulong;
+        }
+      else
+        {
+          error (0, 0,
+             _("ignoring invalid width in environment variable COLUMNS: %s"),
+                 quotearg (p));
+        }
+   }
+
+#ifdef TIOCGWINSZ
+  {
+    struct winsize ws;
+
+    if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1
+        && 0 < ws.ws_col && ws.ws_col == (size_t) ws.ws_col)
+      line_length = ws.ws_col;
+  }
+#endif
+
+  return line_length;
+}
+
 
 int
 main (int argc, char **argv)
@@ -668,7 +723,7 @@ main (int argc, char **argv)
   if (! tabsize)
     tabsize = 8;
   if (! width)
-    width = 130;
+    width = get_default_width ();
 
   {
     /* Maximize first the half line width, and then the gutter width,

-----------------------
-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\ gro.gilbert @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/




From MAILER-DAEMON Mon Nov 18 13:48:21 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ViTrx-0002M0-T8
	for mharc-bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:48:21 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45588)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTrn-0002Kn-I5
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:48:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTre-0008AR-6F
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:48:11 -0500
Received: from debbugs.gnu.org ([140.186.70.43]:46355)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTre-0008AM-2j
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:48:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTrd-0000eh-RB
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:48:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 18 Nov 2013 18:48:01 +0000
Resent-Message-ID: <handler.15921.B.13848004792508@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 15921
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: mpatocka@redhat.com, 15921@debbugs.gnu.org
X-Debbugs-Original-To: Mikulas Patocka <mpatocka@redhat.com>,
	bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.13848004792508
	(code B ref -1); Mon, 18 Nov 2013 18:48:01 +0000
Received: (at submit) by debbugs.gnu.org; 18 Nov 2013 18:47:59 +0000
Received: from localhost ([127.0.0.1]:60374 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1ViTra-0000eN-Ru
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:47:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:43729)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTrX-0000e3-Sk
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:47:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTrJ-00081c-8C
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:47:50 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:53216)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTrJ-00081X-5W
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:47:41 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45400)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTrB-00028x-Rj
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:47:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTr4-0007zJ-IS
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:47:33 -0500
Received: from smtp.cs.ucla.edu ([131.179.128.62]:51496)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1ViTr4-0007zE-CI
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:47:26 -0500
Received: from localhost (localhost.localdomain [127.0.0.1])
	by smtp.cs.ucla.edu (Postfix) with ESMTP id E3AE539E8100;
	Mon, 18 Nov 2013 10:47:25 -0800 (PST)
X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu
Received: from smtp.cs.ucla.edu ([127.0.0.1])
	by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id xWjsINfoxvYz; Mon, 18 Nov 2013 10:47:25 -0800 (PST)
Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200])
	by smtp.cs.ucla.edu (Postfix) with ESMTPSA id A327539E80F8;
	Mon, 18 Nov 2013 10:47:25 -0800 (PST)
Message-ID: <528A60BD.8010304@cs.ucla.edu>
Date: Mon, 18 Nov 2013 10:47:25 -0800
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
References: <alpine.LRH.2.02.1311181254001.20758@file01.intranet.prod.int.rdu2.redhat.com>
In-Reply-To: <alpine.LRH.2.02.1311181254001.20758@file01.intranet.prod.int.rdu2.redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 140.186.70.43
Subject: [bug-diffutils] bug#15921: [PATCH] fix incorrect Czech translation
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 18:48:21 -0000

Thanks, can you please forward that to the Czech translator?
You can find the email addresses in cs.po.




From MAILER-DAEMON Mon Nov 18 17:07:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ViWyS-0007el-Pp
	for mharc-bug-diffutils@gnu.org; Mon, 18 Nov 2013 17:07:16 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45818)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTsl-0002jq-MQ
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:49:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTsc-0008VG-QZ
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:49:11 -0500
Received: from debbugs.gnu.org ([140.186.70.43]:46359)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTsc-0008UR-H0
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:49:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViTsc-0000gm-C1
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:49:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Mikulas Patocka <mpatocka@redhat.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 18 Nov 2013 18:49:02 +0000
Resent-Message-ID: <handler.15922.B.13848004912571@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 15922
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 15922@debbugs.gnu.org, eggert@cs.ucla.edu
X-Debbugs-Original-To: bug-diffutils@gnu.org, Paul Eggert <eggert@cs.ucla.edu>
Received: via spool by submit@debbugs.gnu.org id=B.13848004912571
	(code B ref -1); Mon, 18 Nov 2013 18:49:02 +0000
Received: (at submit) by debbugs.gnu.org; 18 Nov 2013 18:48:11 +0000
Received: from localhost ([127.0.0.1]:60378 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1ViTrm-0000fO-4s
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:48:11 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35144)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <mpatocka@redhat.com>) id 1ViTIT-00087X-JZ
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:11:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViTIG-00056J-4B
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:11:36 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:51900)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViTIG-00056F-0w
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 13:11:28 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36822)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViTI9-00071I-TN
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:11:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViTI3-00053I-Ky
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:11:21 -0500
Received: from mx1.redhat.com ([209.132.183.28]:22049)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViTI3-00052o-CS
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 13:11:15 -0500
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAIIB5Wo028385
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 18 Nov 2013 13:11:06 -0500
Received: from file01.intranet.prod.int.rdu2.redhat.com
	(file01.intranet.prod.int.rdu2.redhat.com [10.11.5.7])
	by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id rAIIB5oY003248
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 18 Nov 2013 13:11:05 -0500
Received: from file01.intranet.prod.int.rdu2.redhat.com (localhost [127.0.0.1])
	by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4) with ESMTP
	id rAIIB4ur023355; Mon, 18 Nov 2013 13:11:04 -0500
Received: from localhost (mpatocka@localhost)
	by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4/Submit) with
	ESMTP id rAIIB4ic023351; Mon, 18 Nov 2013 13:11:04 -0500
X-Authentication-Warning: file01.intranet.prod.int.rdu2.redhat.com: mpatocka
	owned process doing -bs
Date: Mon, 18 Nov 2013 13:11:04 -0500 (EST)
From: Mikulas Patocka <mpatocka@redhat.com>
X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com
Message-ID: <alpine.LRH.2.02.1311181254001.20758@file01.intranet.prod.int.rdu2.redhat.com>
User-Agent: Alpine 2.02 (LRH 1266 2009-07-14)
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED;
	BOUNDARY="185206533-2045286527-1384798264=:20758"
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Mailman-Approved-At: Mon, 18 Nov 2013 13:48:08 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 140.186.70.43
X-Mailman-Approved-At: Mon, 18 Nov 2013 17:07:16 -0500
Subject: [bug-diffutils] bug#15922: [PATCH] fix incorrect Czech translation
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 18:49:20 -0000

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--185206533-2045286527-1384798264=:20758
Content-Type: TEXT/PLAIN; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id rAIIB5Wo028385

Hi

This patch fixes an incorrect Czech translation in diffutils.

Mikulas

---
 po/cs.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: diffutils-3.3/po/cs.po
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- diffutils-3.3.orig/po/cs.po	2013-03-24 19:05:09.000000000 +0100
+++ diffutils-3.3/po/cs.po	2013-11-18 18:49:56.000000000 +0100
@@ -1104,7 +1104,7 @@ msgstr "Spole=C4=8Dn=C3=A9 podadres=C3=A1=C5=99e: %=
s a %
 #: src/diff.c:1278 src/diff.c:1328
 #, c-format
 msgid "File %s is a %s while file %s is a %s\n"
-msgstr "Soubor %s je %s pokud soubor %s je %s\n"
+msgstr "Soubor %s je %s zat=C3=ADmco soubor %s je %s\n"
=20
 #: src/diff.c:1314
 #, fuzzy, c-format
--185206533-2045286527-1384798264=:20758--




From MAILER-DAEMON Mon Nov 18 17:07:17 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ViWyT-0007f5-0s
	for mharc-bug-diffutils@gnu.org; Mon, 18 Nov 2013 17:07:17 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41986)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViVg3-0007gx-T6
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:44:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViVfv-0001j8-3N
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:44:11 -0500
Received: from debbugs.gnu.org ([140.186.70.43]:46438)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViVfu-0001id-Us
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:44:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ViVfu-0004pB-Iq
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:44:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Mikulas Patocka <mpatocka@redhat.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 18 Nov 2013 20:44:02 +0000
Resent-Message-ID: <handler.15921.B.138480738818461@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 15921
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Paul Eggert <eggert@cs.ucla.edu>
X-Debbugs-Original-Cc: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.138480738818461
	(code B ref -1); Mon, 18 Nov 2013 20:44:02 +0000
Received: (at submit) by debbugs.gnu.org; 18 Nov 2013 20:43:08 +0000
Received: from localhost ([127.0.0.1]:60457 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1ViVf2-0004nh-Bo
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 15:43:08 -0500
Received: from eggs.gnu.org ([208.118.235.92]:40038)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <mpatocka@redhat.com>) id 1ViVez-0004nC-8i
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 15:43:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViVel-0001Rg-GG
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 15:42:59 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:55292)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViVel-0001Rc-DT
	for submit@debbugs.gnu.org; Mon, 18 Nov 2013 15:42:51 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41734)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViVef-0006R3-Cw
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:42:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViVeZ-0001QO-EN
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:42:45 -0500
Received: from mx1.redhat.com ([209.132.183.28]:49645)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mpatocka@redhat.com>) id 1ViVeZ-0001QE-6K
	for bug-diffutils@gnu.org; Mon, 18 Nov 2013 15:42:39 -0500
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAIKgZH3011233
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 18 Nov 2013 15:42:36 -0500
Received: from file01.intranet.prod.int.rdu2.redhat.com
	(file01.intranet.prod.int.rdu2.redhat.com [10.11.5.7])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id rAIKgZZq000482
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 18 Nov 2013 15:42:35 -0500
Received: from file01.intranet.prod.int.rdu2.redhat.com (localhost [127.0.0.1])
	by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4) with ESMTP
	id rAIKgZeS011048; Mon, 18 Nov 2013 15:42:35 -0500
Received: from localhost (mpatocka@localhost)
	by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4/Submit) with
	ESMTP id rAIKgZS4011044; Mon, 18 Nov 2013 15:42:35 -0500
X-Authentication-Warning: file01.intranet.prod.int.rdu2.redhat.com: mpatocka
	owned process doing -bs
Date: Mon, 18 Nov 2013 15:42:35 -0500 (EST)
From: Mikulas Patocka <mpatocka@redhat.com>
X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com
In-Reply-To: <528A60BD.8010304@cs.ucla.edu>
Message-ID: <alpine.LRH.2.02.1311181542170.10552@file01.intranet.prod.int.rdu2.redhat.com>
References: <alpine.LRH.2.02.1311181254001.20758@file01.intranet.prod.int.rdu2.redhat.com>
	<528A60BD.8010304@cs.ucla.edu>
User-Agent: Alpine 2.02 (LRH 1266 2009-07-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 140.186.70.43
X-Mailman-Approved-At: Mon, 18 Nov 2013 17:07:16 -0500
Cc: 15921@debbugs.gnu.org
Subject: [bug-diffutils] bug#15921: [PATCH] fix incorrect Czech translation
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 20:44:20 -0000



On Mon, 18 Nov 2013, Paul Eggert wrote:

> Thanks, can you please forward that to the Czech translator?
> You can find the email addresses in cs.po.

OK, I sent it to him.

Mikulas




